On Thu, 31 Aug 2023 at 00:12:45 +0100, Simon McVittie wrote:
> [ 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).
I'm aware that we're getting close to the deadline for 12.2 and 11.8,
so I've uploaded the proposed version to bullseye-proposed-updates for
easier testing and review. Luca: the proposed version and a signed tag
are available from my fork on salsa (I am not able to push to the d-i
repository for debootstrap). I uploaded with dgit, so the git tree and
the .dsc have been verified to be identical.
If this version is not accepted for whatever reason, then I think we
should treat version 1.0.123+deb11u2 as having been used, and skip
ahead to 1.0.123+deb11u3 for any subsequent bullseye update.
(And if there is a problem with having this version in bullseye-pu for
whatever reason, I'm happy to upload a +deb11u3 that is identical to
1.0.123+deb11u1 except for the changelog.)
Thanks,
smcv
