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

reproducible Debian: Disable merged /usr for base tarball

Merged /usr is irreversible, so if we let debootstrap create a
merged-/usr base tarball, we won't be able to use both merged and
unmerged versions in builds.
Signed-off-by: Simon McVittie's avatarSimon McVittie <smcv@debian.org>
parent 1eaad5b0
......@@ -130,7 +130,7 @@ setup_pbuilder() {
pbuilder_http_proxy="--http-proxy $http_proxy"
fi
# setup base.tgz
sudo pbuilder --create $pbuilder_http_proxy --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE --extrapackages "$EXTRA_PACKAGES" --loglevel D
sudo pbuilder --create $pbuilder_http_proxy --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE --debootstrapopts --no-merged-usr --extrapackages "$EXTRA_PACKAGES" --loglevel D
# customize pbuilder
create_customized_tmpfile ${TMPFILE}
......
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