The CTTE has ruled that from trixie onward, maintainers may rely on
systems being merged-/usr. This includes the build environment.
---
modules/schroot/files/setup-dchroot | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
Hi DSA,
would you consider applying the patch to dsa-puppet.git? It is meant to
convert trixie and newer chroots to merged-/usr. We also meant to
implement this change by updating debootstrap in bullseye and bookworm
via -pu, but the presence of --no-merged-usr spoiled this plan. As such
I propose moving forward with this.
d-devel Cced to let people know what's happening and to keep a public
record of this patch.
Helmut
diff --git a/modules/schroot/files/setup-dchroot
b/modules/schroot/files/setup-dchroot
index d6e61f5a8..0f2330506 100755
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -342,6 +342,16 @@ case "$suite" in
;;
esac
+mergedusr=--merged-usr
+case "$suite" in
+ jessie|stretch|buster|bullseye|bookworm)
+ mergedusr=--no-merged-usr
+ ;;
+ trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic)
+ mergedusr=--no-merged-usr
+ ;;
+esac
+
bindir=$(mktemp -d)
cleanup+=("rm -r $bindir")
cat > "$bindir/wget" << 'EOF'
@@ -357,7 +367,7 @@ PATH="$bindir:$PATH" \
--include="$include" \
--variant=buildd \
--arch="$arch" \
- --no-merged-usr \
+ "$mergedusr" \
"$suite" "$rootdir" "$mirror" "$script"
echo "$tuple" > "$rootdir/etc/debian_chroot"
echo "force-unsafe-io" > "$rootdir/etc/dpkg/dpkg.cfg.d/force-unsafe-io"
--
2.42.0
