--- Begin Message ---
Package: debootstrap
Version: 1.0.110
Severity: wishlist
Tags: patch
User: md@linux.it
Usertags: usrmerge
As discussed in <https://bugs.debian.org/913229> and the debian-devel
thread starting at <https://lists.debian.org/debian-devel/2018/11/msg00299.html>,
buildd chroots should not be generated with merged /usr. However, this
is now the default in stretch-backports' debootstrap, which buildds
apparently use.
Avoiding merged /usr for buildds mitigates a frequently-seen class of
bugs in which packages end up with wrong executable paths hard-coded,
for example /usr/bin/bash or /bin/apt-get (which would both work fine
on a merged-/usr system, but not on an unmerged-/usr system).
I've proposed a patch to dsa-puppet that explicitly disables merged /usr
for buildd chroots (#914204) and I already had a similar patch accepted
into sbuild-createchroot, but I think it might also be wise to make
--variant=buildd default to --no-merged-usr? That would avoid having to
patch everything that creates a buildd chroot.
In the attached patch, --variant=buildd produces an unmerged-/usr chroot,
but --variant=buildd --merged-usr still produces a merged-/usr chroot.
smcv
>From d062ce0f8511f3f25ed57b8467f20a4eb1be3df9 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Tue, 20 Nov 2018 16:32:43 +0000
Subject: [PATCH] Disable merged /usr by default when making a buildd chroot
Merged /usr is known to cause multiple packages to be misbuilt. As long
as we support unmerged /usr for user systems, we should mitigate
this class of bugs by using unmerged-/usr chroots on official buildds,
resulting in binary packages that work equally well on merged- or
unmerged-/usr user systems.
See:
https://bugs.debian.org/913229
https://udd.debian.org/cgi-bin/bts-usertags.cgi?user=md@linux.it&tag=usrmerge
thread at https://lists.debian.org/debian-devel/2018/11/msg00299.html
Signed-off-by: Simon McVittie <smcv@debian.org>
---
debootstrap.8 | 3 ++-
functions | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debootstrap.8 b/debootstrap.8
index f68a710..a77c5bc 100644
--- a/debootstrap.8
+++ b/debootstrap.8
@@ -86,10 +86,11 @@ base Debian installation with all packages of priority \fIrequired\fR and
.IP
.IP "\fB\-\-merged-usr\fP"
Create /{bin,sbin,lib}/ symlinks pointing to their counterparts in /usr/.
-(Default.)
+(Default for most variants.)
.IP
.IP "\fB\-\-no-merged-usr\fP"
Do not create /{bin,sbin,lib}/ symlinks pointing to their counterparts in /usr/.
+(Default for the buildd variant.)
.IP
.IP "\fB\-\-keyring=KEYRING\fP"
Override the default keyring for the distribution being bootstrapped,
diff --git a/functions b/functions
index b204b04..51f0186 100644
--- a/functions
+++ b/functions
@@ -1319,6 +1319,10 @@ setup_dselect_method () {
# either installs the RTLD in a directory different from /lib or builds
# multilib library packages.
setup_merged_usr() {
+ if doing_variant buildd && [ -z "$MERGED_USR" ]; then
+ MERGED_USR="no"
+ fi
+
if [ "$MERGED_USR" = "no" ]; then return 0; fi
local link_dir
--
2.19.1
--- End Message ---
--- Begin Message ---
Source: debootstrap
Source-Version: 1.0.111
We believe that the bug you reported is fixed in the latest version of
debootstrap, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 914208@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Julien Cristau <jcristau@debian.org> (supplier of updated debootstrap package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Fri, 30 Nov 2018 21:01:08 +0100
Source: debootstrap
Binary: debootstrap debootstrap-udeb
Architecture: source
Version: 1.0.111
Distribution: unstable
Urgency: medium
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Julien Cristau <jcristau@debian.org>
Description:
debootstrap - Bootstrap a basic Debian system
debootstrap-udeb - Bootstrap the Debian system (udeb)
Closes: 914208
Changes:
debootstrap (1.0.111) unstable; urgency=medium
.
* Team upload
.
[ Simon McVittie ]
* Disable merged /usr by default when making a buildd chroot (closes: #914208)
Checksums-Sha1:
76745e4c95c82250cd719418d9fdf9ba54c03bc5 1988 debootstrap_1.0.111.dsc
d9497616a66299096ff8158c275e92113e94edc2 75503 debootstrap_1.0.111.tar.gz
Checksums-Sha256:
b91c6b89f98192d906cf5193147ef3890fb877ca8382b32ecb357a14f6c4d774 1988 debootstrap_1.0.111.dsc
1c184198f7f542da379c937c585de07c6cca59d876ea79cf178d6b263c3a46d4 75503 debootstrap_1.0.111.tar.gz
Files:
8944c2a469086323a6597bf5a7431203 1988 admin optional debootstrap_1.0.111.dsc
3cf2802de87c4997d65bb532b383bdfe 75503 admin optional debootstrap_1.0.111.tar.gz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEVXgdqzTmGgnvuIvhnbAjVVb4z60FAlwBoNgACgkQnbAjVVb4
z628VA//er0o8ojGHEqOPNr8GjQPA45szxIiBhWgFujrDyYjMZQvD6vd/NWfkXIi
gh2bKUAIDcpT6oJI8y5HGCgkTvgMJ3+VCQZxgmAgl+sq7JR6dovH8qGOD4Jr2mp6
TAy0KGINYu5UkVxnBzY4f2HiAVjPZpCsKsz9qS6oty93OCSwFEk/Gggdpc/wYAIG
56plW/3ZG95axa0Fmh3seDDdvDodOW/kr4PzZ7qdqWNgbNhPNStI7DK2ASEUI+Hi
egQmcwT1p2Cuohww6hslKi8afwoLh7jZ3okYekN00PkQ5wb5PoOY4t3IYMvjhS/J
bnYbHFtK/7Of8OdnR3n0CyF7bhTq3cpfx3F8WJGzbztbVljZRe+ezRPtAS58VI5i
bveAlbN/n0/SQGDWz1QeIBVVoSnALpUlHCI/3S7a+o+0PAlsyGN8jwEMWf/3Pkr8
75w9hC34knxASSb4gOYlRYzH04mIj7WVbaUfeOUbzP9kmt7q4rVAXo1l3VVZkaZ9
g75iv8h9P29RpzHPtet6vs2munT5TwTY3Dzlf7fjWgivuAC77SqIx9/qNHFW8Hsj
sXRKi36dxIXgw+hthZVtKupTuvYdz/SYV4su+TDcTr+nyMFstmUcgyDbKNf3y9Qe
aizOdizfRE/1wxM7p3taHRbuK+G7ti6oWBUnGTcK+yuTAuJI5EM=
=yUVE
-----END PGP SIGNATURE-----
--- End Message ---