Commit d04769a7 authored by Simon McVittie's avatar Simon McVittie Committed by Holger Levsen

reproducible Debian: perform build2 in merged /usr environment for >= buster

parent 641cfb29
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment