Source: blitz++ Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: uname hostname X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The file /usr/include/blitz/gnu/bzconfig.h contains the running kernel version and hostname of the system: https://tests.reproducible-builds.org/debian/issues/captures_kernel_version_issue.html 425 #define·BZ__os_name·"Linux·ionos1-amd64·4.19.0-13-amd64·#1·SMP·Debian·4.19.160-2·(2020-11-28)·x86_64·GNU/Linux"· 425 #define·BZ__os_name·"Linux·i-capture-the-hostname·5.9.0-0.bpo.2-amd64·#1·SMP·Debian·5.9.6-1~bpo10+1·(2020-11-19)·x86_64·GNU/Linux"· The attached patch fixes this by using dpkg-architecture's multiarch value instead of using "uname -a". It looks like this is just data embedded in the built bzconfig.h file, but I do not know if this results in other issues, so someone more familiar with blitz++ should test that the change is valid. This also depends on the previously submitted patch for timestamps, although would be easy to refactor it independently if for some reason the timestamp patch could not be applied. With both patches applied blitz++ should build reproducibly once it reaches bullseye where the build path is not varied between builds, although unstable also varies the build path which results in additional issues. Thanks for maintaining blitz++ live well, vagrant
From 4d577dd6b8f56f6c9f55e0a494809eff99ba2362 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian <vagr...@reproducible-builds.org> Date: Wed, 9 Dec 2020 21:37:47 +0000 Subject: [PATCH 2/2] debian/patches: Set OS using dpkg-architectue multiarch value to avoid embedding running kernel version. https://tests.reproducible-builds.org/debian/issues/captures_kernel_version_issue.html --- ...g-architectue-multiarch-value-to-avo.patch | 27 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 28 insertions(+) create mode 100644 debian/patches/Set-OS-using-dpkg-architectue-multiarch-value-to-avo.patch diff --git a/debian/patches/Set-OS-using-dpkg-architectue-multiarch-value-to-avo.patch b/debian/patches/Set-OS-using-dpkg-architectue-multiarch-value-to-avo.patch new file mode 100644 index 0000000..b17d20e --- /dev/null +++ b/debian/patches/Set-OS-using-dpkg-architectue-multiarch-value-to-avo.patch @@ -0,0 +1,27 @@ +From b2f583f708e2bcbd12a8c1cfae659e9af4c0d211 Mon Sep 17 00:00:00 2001 +From: Vagrant Cascadian <vagr...@reproducible-builds.org> +Date: Wed, 9 Dec 2020 21:27:23 +0000 +Subject: [PATCH 2/2] Set OS using dpkg-architectue multiarch value to avoid + embedding running kernel version. + +https://tests.reproducible-builds.org/debian/issues/captures_kernel_version_issue.html +--- + m4/ac_check_cxx_features.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/ac_check_cxx_features.m4 b/m4/ac_check_cxx_features.m4 +index 3a8a274..be80516 100644 +--- a/m4/ac_check_cxx_features.m4 ++++ b/m4/ac_check_cxx_features.m4 +@@ -7,7 +7,7 @@ C++ compiler ($CXX $CXXFLAGS $LDFLAGS) characteristics + + ]) + +-OS=`uname -a` ++OS=`dpkg-architecture -qDEB_HOST_MULTIARCH` + AC_SUBST(OS) + DATE=`LC_ALL=C date --utc --date=@$SOURCE_DATE_EPOCH` + AC_SUBST(DATE) +-- +2.29.2 + diff --git a/debian/patches/series b/debian/patches/series index b37ff35..12606e2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ debianization-python.patch debianization-examples.patch debianization-examples-neutralization.patch Specify-DATE-using-SOURCE_DATE_EPOCH-in-m4-ac_check_.patch +Set-OS-using-dpkg-architectue-multiarch-value-to-avo.patch -- 2.29.2
signature.asc
Description: PGP signature
