Package: rpm
Version: 4.14.2+dfsg1-1
Severity: normal
Tags: unreproducible patch
User: m...@linux.it
Usertags: usrmerge
Dear maintainer.
The package rpm currently fails to build reproducibly on merged-usr
vs non-merged systems.
Please see attached patch fixing this issue.
Regards, Andreas Henriksson
diff -Nru rpm-4.14.2+dfsg1/debian/changelog rpm-4.14.2+dfsg1/debian/changelog
--- rpm-4.14.2+dfsg1/debian/changelog 2018-10-18 10:15:39.000000000 +0200
+++ rpm-4.14.2+dfsg1/debian/changelog 2018-12-06 21:23:42.000000000 +0100
@@ -1,3 +1,11 @@
+rpm (4.14.2+dfsg1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Explicitly pass paths instead of looking up tools
+ - fixes reproducible build on merged-usr vs non-merged systems
+
+ -- Andreas Henriksson <andr...@fatal.se> Thu, 06 Dec 2018 21:23:42 +0100
+
rpm (4.14.2+dfsg1-1) unstable; urgency=medium
* New upstream release.
diff -Nru rpm-4.14.2+dfsg1/debian/rules rpm-4.14.2+dfsg1/debian/rules
--- rpm-4.14.2+dfsg1/debian/rules 2017-11-08 10:35:49.000000000 +0100
+++ rpm-4.14.2+dfsg1/debian/rules 2018-12-06 21:23:39.000000000 +0100
@@ -22,8 +22,55 @@
LDFLAGS="$(LDFLAGS) -Wl,--as-needed" \
CPPFLAGS="$(CPPFLAGS)"
+configure_paths += \
+ AWK=/usr/bin/awk \
+ __BZIP2=/bin/bzip2 \
+ __CAT=/bin/cat \
+ __CHGRP=/bin/chgrp \
+ __CHMOD=/bin/chmod \
+ __CHOWN=/bin/chown \
+ __CP=/bin/cp \
+ __CPIO=/bin/cpio \
+ __CURL=/usr/bin/curl \
+ __FILE=/usr/bin/file \
+ __GPG=/usr/bin/gpg2 \
+ __GREP=/bin/grep \
+ __GZIP=/bin/gzip \
+ __UNZIP=/usr/bin/unzip \
+ __ID=/usr/bin/id \
+ __INSTALL=/usr/bin/install \
+ __LRZIP=/usr/bin/lrzip \
+ __LZIP=/usr/bin/lzip \
+ __XZ=/usr/bin/xz \
+ __GEM=/usr/bin/gem \
+ __MAKE=/usr/bin/make \
+ __MKDIR=/bin/mkdir \
+ __MV=/bin/mv \
+ __PATCH=/usr/bin/patch \
+ __RESTORECON=/sbin/restorecon \
+ __PERL=/usr/bin/perl \
+ __PGP=/usr/bin/pgp \
+ __PYTHON=/usr/bin/python \
+ __RM=/bin/rm \
+ __RSH=/usr/bin/rsh \
+ __SED=/bin/sed \
+ __SEMODULE=/usr/bin/semodule \
+ __SSH=/usr/bin/ssh \
+ __TAR=/bin/tar \
+ __ZSTD=/usr/bin/zstd \
+ __LD=/usr/bin/ld \
+ __NM=/usr/bin/nm \
+ __OBJCOPY=/usr/bin/objcopy \
+ __OBJDUMP=/usr/bin/objdump \
+ __STRIP=/usr/bin/strip \
+ __GIT=/usr/bin/git \
+ __HG=/usr/bin/hg \
+ __BZR=/usr/bin/bzr \
+ __QUILT=/usr/bin/quilt
+
+
override_dh_auto_configure:
- dh_auto_configure -- $(configure_flags)
+ dh_auto_configure -- $(configure_paths) $(configure_flags)
cd python && ln -s ../debian
override_dh_auto_build:
