[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: Disable merged /usr for base tarball

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
dd78d2cd by Simon McVittie at 2018-11-20T16:27:46Z
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 <smcv at debian.org>

- - - - -


1 changed file:

- bin/reproducible_setup_pbuilder.sh


Changes:

=====================================
bin/reproducible_setup_pbuilder.sh
=====================================
@@ -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}



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/dd78d2cd4862ebe554f5df0d21bdcee0f1c984a5

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/dd78d2cd4862ebe554f5df0d21bdcee0f1c984a5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20181120/3a526260/attachment-0001.html>