Source: pcp Severity: normal Tags: patch User: [email protected] Usertags: usrmerge X-Debbugs-Cc: [email protected]
The paths to various binaries are embedded with different paths when built on a usrmerge system vs. a non-usrmerge system: https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/pcp.html ./usr/include/pcp/builddefs SED» =·/bin/sed vs. SED» =·/usr/bin/sed The attached patch fixes this by passing configuration options and variables to specify the paths to various binaries, using their non-usrmerge locations, as compatibility symlinks generally exist for one way, but not for the other. This patch does not address all reproducibility issues, but should reduce the size of the diff, making it easier to identify remaining issues. Thanks for maintaining pcp! live well, vagrant
From 59b60433afc99f39a272732def01e36bd8251173 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian <[email protected]> Date: Sun, 6 Mar 2022 18:52:55 +0000 Subject: [PATCH 2/3] debian/rules: Pass binary paths to configure to make the package build reproducibly regardless of usrmerge. The binary paths for gzip, tar, sed, echo, qmake, true and bzip2 should all point to their non-usrmerge locations. https://tests.reproducible-builds.org/debian/issues/paths_vary_due_to_usrmerge_issue.html --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 587e11c..2f99e21 100755 --- a/debian/rules +++ b/debian/rules @@ -141,7 +141,7 @@ configure_tools = export DEBUG=-DNDEBUG QT_SELECT=5; # ... Makepkgs uses the latter mechanism to refine the configure # options # -configure_paths = --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var --with-rcdir=/etc/init.d --with-sysconfigdir=/etc/default +configure_paths = --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var --with-rcdir=/etc/init.d --with-sysconfigdir=/etc/default --with-zip=/bin/gzip --with-tar=/bin/tar SED=/bin/sed ECHO=/bin/echo QMAKE=/usr/bin/qmake MAKEDEPEND=/bin/true BZIP2=/bin/bzip2 checkdir = test -f debian/rules uninstall = cat debian/*.install | sed -e "s,^,$(dirpcp)/," | xargs rm -f -- 2.30.2
signature.asc
Description: PGP signature
