diff options
Diffstat (limited to 'meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch')
| -rw-r--r-- | meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch | 68 |
1 files changed, 9 insertions, 59 deletions
diff --git a/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch b/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch index 87c0e1458e..a6b03db72f 100644 --- a/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch +++ b/meta-oe/recipes-extended/smartmontools/files/0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch @@ -1,4 +1,4 @@ -From b621a313e0bc67803abfba18e1ae15e7a8b9b59f Mon Sep 17 00:00:00 2001 +From 898fd4115be5cdd848db99fe85e1d0d7f1b3fa02 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy <oobitots@cisco.com> Date: Mon, 22 Feb 2021 17:21:33 +0200 Subject: [PATCH] smartmontools: Improve reproducibility @@ -6,20 +6,20 @@ Subject: [PATCH] smartmontools: Improve reproducibility Backport changes added to master smartmontools. https://github.com/smartmontools/smartmontools/commit/24838916b4c0e91f5c897d44fcdeedb22848f684 -Upstream-Status: Backported +Upstream-Status: Backport Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> + --- - ChangeLog | 8 ++++++++ - configure.ac | 12 ++++++++++++ - utility.cpp | 10 ++++++++++ - 3 files changed, 30 insertions(+) + ChangeLog | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog -index 39eac2d..6a3b4ee 100644 +index 5f0930a..4c5a91e 100644 --- a/ChangeLog +++ b/ChangeLog -@@ -1,5 +1,13 @@ - $Id: ChangeLog 5155 2020-12-30 16:49:18Z chrfranke $ +@@ -705,6 +705,14 @@ $Id: ChangeLog 5338 2022-02-28 16:34:26Z chrfranke $ + + Happy New Year! Update copyright year in version info. +2021-02-07 Christian Franke <franke@computer.org> + @@ -32,53 +32,3 @@ index 39eac2d..6a3b4ee 100644 2020-12-30 Christian Franke <franke@computer.org> smartmontools 7.2 -diff --git a/configure.ac b/configure.ac -index ee6f0e5..c37c9bc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -61,6 +61,18 @@ case "${host}" in - ;; - esac - -+AC_MSG_CHECKING([whether reproducible build is selected (SOURCE_DATE_EPOCH)]) -+res=no -+if test -n "$SOURCE_DATE_EPOCH"; then -+ res=yes -+ test -z "`echo "$SOURCE_DATE_EPOCH" | sed 's,[[0-9]]*,,'`" || res=error -+fi -+AC_MSG_RESULT([$res]) -+case $res in -+ error) AC_MSG_ERROR([Malformed SOURCE_DATE_EPOCH]) ;; -+ yes) CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-DSOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH" ;; -+esac -+ - # Check for SVN. - AC_MSG_CHECKING([whether this is a build from SVN]) - is_svn_build=no -diff --git a/utility.cpp b/utility.cpp -index 0483c6f..8ab38c9 100644 ---- a/utility.cpp -+++ b/utility.cpp -@@ -134,9 +134,19 @@ std::string format_version_info(const char * prog_name, bool full /*= false*/) - #endif - "\n" - "smartmontools configure arguments:" -+#ifdef SOURCE_DATE_EPOCH -+ " [hidden in reproducible builds]\n" -+ "reproducible build SOURCE_DATE_EPOCH: " -+#endif - ; -+#ifdef SOURCE_DATE_EPOCH -+ char ts[32]; struct tm tmbuf; -+ strftime(ts, sizeof(ts), "%Y-%m-%d %H:%M:%S", time_to_tm_local(&tmbuf, SOURCE_DATE_EPOCH)); -+ info += strprintf("%u (%s)", (unsigned)SOURCE_DATE_EPOCH, ts); -+#else - info += (sizeof(SMARTMONTOOLS_CONFIGURE_ARGS) > 1 ? - SMARTMONTOOLS_CONFIGURE_ARGS : " [no arguments given]"); -+#endif - info += '\n'; - - return info; --- -2.25.1 - |