On Sat, 14 Jul 2018 at 11:59:37 +0200, Michael Biebl wrote:
> If we could auto-detect any problems resulting from that via the
> reproducible builds effort, this would be great.
The attached patch is entirely untested, but hopefully works.
smcv
>From d5412972e90a57c0bdf9126101ecfa1ecdfe09c2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 8 Nov 2018 18:06:55 +0000
Subject: [PATCH] reproducible: perform build2 in merged /usr environment for
>= buster
---
bin/reproducible_build.sh | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index d127ea73..8b177d57 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -648,6 +648,14 @@ EOF
else
echo "BUILDDIR=/build" >> "$TMPCFG"
fi
+
+ local pbuilder_options=()
+ case "${SUITE}" in
+ (unstable|experimental|buster)
+ pbuilder_options+=(--extrapackages usrmerge)
+ ;;
+ esac
+
set +e
# remember to change the sudoers setting if you change the following command
# (the 2nd build gets a longer timeout trying to make sure the first build
@@ -661,6 +669,7 @@ EOF
--basetgz /var/cache/pbuilder/$SUITE-reproducible-base.tgz \
--buildresult $TMPDIR/b2 \
--logfile b2/build.log \
+ "${pbuilder_options[@]}" \
${SRCPACKAGE}_${EVERSION}.dsc
local PRESULT=$?
set -e
--
2.19.1
