Web lists-archives.com

Re: Our build system may be broken: /bin vs /usr/bin

On Tue, 20 Nov 2018 at 12:16:06 +0000, Holger Levsen wrote:
> from irc:
> < mapreri> I haven't checked, but I think the merged-usr variation is now
> broken already.  Now that debootstrap in stretch-backports (which is the
> version we use) defaults to merged-usr installing that special package won't
> change anything.

Please use debootstrap --no-merged-usr explicitly if you want to be able
to exercise the "not merged /usr" code path. I attach an untested patch.

>From 21590db3ec9feafce9cab4248315573b5ddfb29b Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@xxxxxxxxxx>
Date: Tue, 20 Nov 2018 16:10:38 +0000
Subject: [PATCH] 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@xxxxxxxxxx>
 bin/reproducible_setup_pbuilder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh
index eba16337..370adb89 100755
--- a/bin/reproducible_setup_pbuilder.sh
+++ b/bin/reproducible_setup_pbuilder.sh
@@ -130,7 +130,7 @@ setup_pbuilder() {
 		pbuilder_http_proxy="--http-proxy $http_proxy"
 	# 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}