Re: Bug#1025708: bullseye-pu: package debootstrap/1.0.123+deb11u2

[Simon McVittie]

Control: tags -1 = bullseye d-i

[ Reason ]
The same changes proposed for bookworm in #1050868, but for bullseye.
Because official buildds that build trixie/sid are not yet all running
bookworm, we'll need this change in bullseye too.

I also included the changes that Luca previously proposed on this bug,
which are backports from bookworm's debootstrap:

- no longer including usrmerge and its dependencies in the installed
  system if usr-is-merged would be sufficient, saving ~ 50MB on a minbase
  image and effectively fixing a regression caused by making
  usrmerge|usr-is-merged transitively Essential in bookworm (#1025657)
- enabling merged-/usr on Hurd

These are technically a behaviour change for bullseye, but we're making
a larger behaviour change here already, and it aligns the behaviour
with what we have in bookworm. We could revert those if required, but
they're really small changes and seem desirable to me: in particular,
they make the whole merged-/usr code path into the same tested code
that's in trixie and proposed for bookworm.

[ Impact ]
If not accepted, trixie will continue to be stuck in a
mostly-but-not-entirely merged-/usr limbo, with the moratorium from #1035831
remaining in place (until all buildds can be upgraded to bookworm).

[ Tests ]
I did the same testing as for bookworm's #1050868, summarized on
.
As with #1050868, all differences between the output of a reference
version (from Debian 12.1) and the output of this version were expected
or ignorable. In addition to the ignorable differences noted in #1050868,
/etc/apt/apt.conf.d/01autoremove-kernels reflected the use of a bullseye
rather than bookworm kernel.

The autopkgtest passes, as in #1050868.

[ Risks ]
Same as in #1050868.

Additionally, I suppose someone could conceivably be relying on debootstrap
of bookworm|trixie|sid from a bullseye host installing a non-minimal system
with Perl and various libraries? But that seems tenuous.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable (and trixie)

[ Changes ]

The addition of EXCLUDE_DEPENDENCY in ./debootstrap, and the logic that
uses it (last hunk in ./functions and second hunk in scripts/debian-common),
are for #1025657.

setup_merged_usr() in ./functions now allows merged-/usr to continue on
Hurd too.

In copying setup_merged_usr() from trixie (via bookworm), it seems we've
accidentally enabled correct merged-/usr handling for loongarch64, which
wasn't exactly intentional but seems harmless!

scripts/trixie now exists (it's a symlink, the same as for every other
Debian suite).

The rest is the same as in bookworm's #1050868.

[ Other info ]
To keep bookworm's debootstrap "better" than bullseye's, this update
should not be accepted until after #1050868 is.

smcv
diffstat for debootstrap-1.0.123+deb11u1 debootstrap-1.0.123+deb11u2

 debian/.gitignore  |6 +
 debian/changelog   |   44 +
 debian/gbp.conf|3 
 debian/salsa-ci.yml|1 
 debian/tests/debian-testing|   27 +++
 debian/tests/fake/schroot-1.6.10-3 |2 
 debootstrap|4 +
 debootstrap.8  |5 -
 functions  |  125 +
 scripts/amber  |2 
 scripts/artful |2 
 scripts/bionic |2 
 scripts/cosmic |2 
 scripts/debian-common  |9 +-
 scripts/disco  |2 
 scripts/eoan   |2 
 scripts/focal  |2 
 scripts/gutsy  |2 
 scripts/hardy  |2 
 scripts/intrepid   |2 
 scripts/jaunty |2 
 scripts/karmic |2 
 scripts/lucid  |2 
 scripts/maverick   |2 
 scripts/natty  |2 
 scripts/oneiric|2 
 scripts/precise|2 
 scripts/quantal|2 
 scripts/raring |2 
 scripts/saucy  |2 
 scripts/trixie |   16 
 scripts/trusty |2 
 scripts/utopic |2 
 scripts/vivid  |2 
 scripts/wily   |2 
 scripts/xenial |2 
 scripts/yakkety|2 
 scripts/zesty  |2 
 38 files changed, 246 insertions(+), 50 deletions(-)

diff -Nru debootstrap-1.0.123+deb11u1/debian/changelog debootstrap-1.0.123+deb11u2/debian/changelog
--- 

Re: Bug#1050868: bookworm-pu: package debootstrap/1.0.128+nmu2+deb12u1

[Simon McVittie]

Control: tags -1 + d-i

On Wed, 30 Aug 2023 at 16:27:12 +0100, Simon McVittie wrote:
> Part of the transition to merged-/usr, and more specifically, allowing
> us to stop shipping files in trixie whose physical path on disk does
> not match their path in the dpkg database due to directory aliasing.
> 
> This change needs to be in bookworm (and bullseye, and maybe buster)
> before that process can continue, because official buildds run debootstrap
> from stable (or older).
> 
> I also took the opportunity to backport changes that make the autopkgtests
> pass.

Sorry, I should have mentioned that this is a (significant) d-i component
and so will presumably need a d-i ack. I haven't explicitly cc'd
debian-boot on the basis that it's already the package's maintainer of
record (and the bug already appeared on the mailing list).

smcv

Re: Daily d-i images for i386 not being built?

[Cyril Brulebois]

Holger Wansing  (2023-08-30):
> So you mean a changing like attached...

I'm so sorry, I had assumed the other image section was built using a
loop on devel image list, that's why I thought we'd need an addition
there. Since that's using an hardcoded list of download links, no need
to change that, and the single change required is adjusting devel and
trixie images list?


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Re: Daily d-i images for i386 not being built?

[Holger Wansing]

Hi,

Cyril Brulebois  wrote (Mon, 28 Aug 2023 18:03:35 +0200):
> Holger Wansing  (2023-08-28):
> > There's already a mechanism for filtering archs here, so I'm not
> > sure, if inventing another method in parallel is an improvement.
> 
> That's really apples and oranges:
>  - s390x is here and is here to stay (I have no opinions regarding the
>current exclusion/implementation though — in passing, s390 is long
>gone even if it still appears…);
>  - i386 is in a weird state where it's going to be in the archive, with
>d-i builds, without debian-cd builds.
> 
> It really does make sense to me to have both archs treated separately.

So you mean a changing like attached...

Resulting in a html page like the attached html...


Holger


-- 
Holger Wansing 
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076
diff --git a/english/devel/debian-installer/images.data b/english/devel/debian-installer/images.data
index 499bce27778..0fdc241bf2c 100644
--- a/english/devel/debian-installer/images.data
+++ b/english/devel/debian-installer/images.data
@@ -54,20 +54,23 @@
 https://cdimage.debian.org/cdimage/_di_/@ARCH@/bt-cd/" arch="" />
 
 
 https://cdimage.debian.org/cdimage/_di_/@ARCH@/bt-dvd/" arch="" />
 
 
 
 https://deb.debian.org/debian/dists/testing/main/installer-@ARCH@/current/images/; arch="" "source" />" />
 
 
+
+https://deb.debian.org/debian/dists/testing/main/installer-i386/current/images/; arch="i386" />
+
 
 
 # obsoleted; replaced by "devel-small-cd"
 
 https://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/@ARCH@/iso-cd/debian-testing-@a...@-netinst.iso; arch="" " s390 s390x source" />" />
 
 
 # obsoleted; replaced by "devel-small-cd"
 
 https://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/@ARCH@/iso-cd/debian-testing-@a...@-businesscard.iso; arch="" " s390 s390x source" />" />
@@ -121,21 +124,20 @@
 # Note that changes here should also be reflected in
 # scripts/daily-build-aggregator in the d-i repository, and in debian-cd.
 
 
 
 https://d-i.debian.org/daily-images/amd64/daily/;>amd64
 https://d-i.debian.org/daily-images/arm64/daily/;>arm64
 https://d-i.debian.org/daily-images/armel/daily/;>armel
 https://d-i.debian.org/daily-images/armhf/daily/;>armhf
 https://d-i.debian.org/daily-images/hurd-i386/daily/;>hurd-i386
-https://d-i.debian.org/daily-images/i386/daily/;>i386
 https://d-i.debian.org/daily-images/mips64el/daily/;>mips64el
 https://d-i.debian.org/daily-images/mipsel/daily/;>mipsel
 https://d-i.debian.org/daily-images/ppc64el/daily/;>ppc64el
 https://d-i.debian.org/daily-images/s390x/daily/;>s390x
 
 
 
 
 # Support for  tags:
 
diff --git a/english/devel/debian-installer/index.wml b/english/devel/debian-installer/index.wml
index 47ba84021eb..c7dd0d32c1b 100644
--- a/english/devel/debian-installer/index.wml
+++ b/english/devel/debian-installer/index.wml
@@ -173,20 +173,21 @@ unstable.
 
 netinst CD images (via jigdo)
 
 
 
 
 
 
 other images (netboot, USB stick, etc.)
 
+
 
 
 
 
 
 
 Notes
 
 
 #	Before you download the daily built images, we suggest you check for
diff --git a/english/template/debian/installer.wml b/english/template/debian/installer.wml
index 719743ecfac..e71ff1e0eb1 100644
--- a/english/template/debian/installer.wml
+++ b/english/template/debian/installer.wml
@@ -1,33 +1,33 @@
 #use wml::debian::release_info
 
-amd64\narm64\narmel\narmhf\ni386\nmips64el\nmipsel\nppc64el\ns390x\nsource
+amd64\narm64\narmel\narmhf\nmips64el\nmipsel\nppc64el\ns390x\nsource
 
 alpha\narm\nhppa\ni386\nia64\nm68k\nmips\nmipsel\npowerpc\nsparc\ns390\nsource
 alpha\namd64\narm\nhppa\ni386\nia64\nmips\nmipsel\npowerpc\nsparc\ns390\nsource
 alpha\namd64\narm\narmel\nhppa\ni386\nia64\nmips\nmipsel\npowerpc\nsparc\ns390\nsource
 amd64\narmel\nkfreebsd-i386\nkfreebsd-amd64\ni386\nia64\nmips\nmipsel\npowerpc\nsparc\ns390\nsource
 amd64\narmel\narmhf\ni386\nia64\nkfreebsd-i386\nkfreebsd-amd64\nmips\nmipsel\npowerpc\nsparc\ns390\ns390x\nsource
 amd64\narm64\narmel\narmhf\ni386\nmips\nmipsel\npowerpc\nppc64el\ns390x\nsource
 arm64\nmips\nmipsel\npowerpc\nppc64el\ns390x\nsource
 amd64\narmel\narmhf\ni386\nsource
 amd64\narm64\narmel\narmhf\ni386\nmips\nmips64el\nmipsel\nppc64el\ns390x\nsource
 mips\nmipsel\npowerpc\nppc64el\ns390x\nsource
 amd64\narm64\narmel\narmhf\ni386\nsource
 amd64\narm64\narmel\narmhf\ni386\nmips\nmips64el\nmipsel\nppc64el\ns390x\nsource
 mips\nmipsel\npowerpc\nppc64el\ns390x\nsource
 amd64\narm64\narmel\narmhf\ni386\nsource
 amd64\narm64\narmel\narmhf\ni386\nmips64el\nmipsel\nppc64el\ns390x\nsource
 mips\nmipsel\npowerpc\nppc64el\ns390x\nsource
 amd64\narm64\narmel\narmhf\ni386\nsource
 amd64\narm64\narmel\narmhf\ni386\nmips64el\nmipsel\nppc64el\ns390x\nsource
-amd64\narm64\narmel\narmhf\ni386\nmips64el\nmipsel\nppc64el\ns390x\nsource
+amd64\narm64\narmel\narmhf\nmips64el\nmipsel\nppc64el\ns390x\nsource
 
 \
 " "sarge" "" />\
 " "etch" "" />\
 " "lenny" "" />\
 " "squeeze" "" />\
 " "wheezy" "" />\
 " "jessie" "" />\
 " "stretch" "" 

Bug#1050868: bookworm-pu: package debootstrap/1.0.128+nmu2+deb12u1

[Simon McVittie]

Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian@packages.debian.org
Usertags: pu
X-Debbugs-Cc: debootst...@packages.debian.org, hel...@subdivi.de
Control: affects -1 + src:debootstrap
Control: block 1025708 by -1

[ Reason ]
Part of the transition to merged-/usr, and more specifically, allowing
us to stop shipping files in trixie whose physical path on disk does
not match their path in the dpkg database due to directory aliasing.

This change needs to be in bookworm (and bullseye, and maybe buster)
before that process can continue, because official buildds run debootstrap
from stable (or older).

I also took the opportunity to backport changes that make the autopkgtests
pass.

[ Impact ]
If not accepted, trixie will continue to be stuck in a
mostly-but-not-entirely merged-/usr limbo, with the moratorium from #1035831
remaining in place.

[ Tests ]
More details of testing on
.
A prerelease (differing only in the changelog) is available from
.

I used this version of debootstrap to install sid, trixie, bookworm,
bullseye and buster on amd64, in the default, minbase and buildd
variants, and compared the results to corresponding pairs of reference
chroots. The reference chroots were installed with the Debian 12.1
version of debootstrap, explicitly forcing --[no-]merged-usr.

All default and minbase chroots continue to be merged-/usr by default.

The sid and trixie buildd chroots are now merged-/usr by default (this
is an intentional change).

The bookworm, bullseye and buster buildd chroots continue to be
non-merged-/usr by default.

When I used diffoscope to compare each chroot tarball to the reference
chroot tarball with the same suite, variant and (non-)merged-/usr status,
all differences were expected or ignorable:

- /lib32, /libx32 symlinks not created (an intentional change)
- empty /usr/lib32/, /usr/libx32/ not created (an intentional change)
- non-reproducible timestamps (ignorable)
- non-reproducible machine ID (ignorable)
- non-reproducible ldconfig cache (ignorable)
- non-reproducible systemd-journald message catalog in buster (ignorable)
- non-reproducible /var/log (ignorable)

Philip Hands built a d-i mini.iso with the proposed version, and it seems
to have installed GNOME successfully under openQA.

There is also an autopkgtest which bootstraps Debian testing and
inspects various subtleties of the resulting chroot. It now passes under
autopkgtest-virt-qemu (which previously failed), autopkgtest-virt-lxc
and Salsa-CI.

The changes were backported from testing/unstable, where there were
no regression reports that I've seen. The last of them migrated to
trixie today.

[ Risks ]
Packages that were relying on sid and trixie buildds to be non-merged-/usr
could break or misbehave. This is intentional: only merged-/usr is
supported, and this change is mainly to get the buildds into a supported
state for the future.

Packages that were relying on the existence of compat symlinks for
non-default multilib flavours (for example /lib32 and /libx32 on amd64)
will no longer find that they exist in all cases. I would say this is only
a minor risk. In principle it could be mitigated by creating the compat
symlinks unconditionally when bootstrapping older suites (<= bookworm)
but if that's wanted, we should do it in unstable first.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable (and trixie)

[ Changes ]

* debootstrap:
  - Add --merged-usr to the --help (#1031828). Minor documentation fix,
no functional change.

* functions:
  - can_usrmerge_symlink(), merge_usr_entry(), merge_usr():
Helmut Grohne's implementation of a new bootstrap protocol for
merged-/usr, which unpacks Essential packages and then does the
equivalent of the usrmerge package's convert-usrmerge before
proceeding, instead of creating the compat symlinks and then unpacking
Essential packages over the top of them.
This is a prerequisite for lifting the moratorium imposed by #1035831.
(#1049898)

Unlike the old setup_merged_usr(), this does not create compat symlinks
for non-default multilib libQUAL directories unless they are mentioned
in an Essential package: the practical effect is that on for example
amd64, the /lib32 and /libx32 symlinks are no longer created (but /lib64
still is, because libc6:amd64 needs it).

  - In merge_usr() (new) and setup_merged_usr() (no longer used by
debootstrap, but some versions of mmdebstrap rely on it),
apply the /usr merge to trixie, sid and future buildd chroots.
Technical Committee consensus is that we want this, and it is a
prerequisite for lifting the moratorium imposed by #1035831.

* scripts/*:
  

Re: 11.8/12.2 planning

[Luna Jernberg]

Will try to help on that date :)

Den tis 29 aug. 2023 kl 19:27 skrev Jonathan Wiltshire :
>
> > >Let's say 30 Sep is still preferred, 7th Oct or at a stretch 14th Oct are
> > >options. Please indicate your availability for those three.
>
> Right, 7th October seems to be the one. Usual confirmations to follow.
>
> Thanks,
>
> --
> Jonathan Wiltshire  j...@debian.org
> Debian Developer http://people.debian.org/~jmw
>
> 4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51
> ed25519/0x196418AAEB74C8A1: CA619D65A72A7BADFC96D280196418AAEB74C8A1
>