[Git][qa/jenkins.debian.net][master] Explicitly pass --merged-usr until debootstrap is updated to know

[Holger Levsen (@holger)]

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


Commits:
9c9c4bc7 by Helmut Grohne at 2023-10-28T13:55:08+02:00
Explicitly pass --merged-usr until debootstrap is updated to know

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_setup_pbuilder.sh


Changes:

=====================================
bin/reproducible_setup_pbuilder.sh
=====================================
@@ -155,7 +155,7 @@ setup_pbuilder() {
 	case $SUITE in
 		buster|bookworm|bullseye)	sudo pbuilder --create $pbuilder_http_proxy --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE --debootstrapopts --no-merged-usr --extrapackages "$EXTRA_PACKAGES" --loglevel D	# no-usrmerge is called no-merged-usr here, else things would be too simple
 			;;
-		*)				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 --merged-usr --extrapackages "$EXTRA_PACKAGES" --loglevel D		# explicitly merge until debootstrap knows that unstable chroots must be merged
 			;;
 	esac
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/9c9c4bc7c37fa74bac02af527568d600006dc20c

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/9c9c4bc7c37fa74bac02af527568d600006dc20c
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/20231028/5fd42638/attachment-0001.htm>