Re: Request for review of debootstrap change [was: Re: Second take at DEP17 - consensus call on /usr-merge matters]

2023-08-13 Thread Holger Levsen
On Fri, Aug 11, 2023 at 10:56:03PM +0200, Helmut Grohne wrote:
> > what about cdebootstrap?
> cdebootstrap (and mmdebstrap) never implemented a merging step[1] and to
> this date rely on the usrmerge package doing it at postinst time. Once
> base-files ships the aliasing symlinks, both will produce /usr-merged
> trees without any modifications. The reason that we need a change to
> debootstrap is that its current merging implementation breaks when
> base-files ships aliasing symlinks.
> 
> So the main reason for doing this change to debootstrap is that it
> enables us to continue supporting cdebootstrap and mmdebstrap without
> any changes there.

ah, thank you!


-- 
cheers,
Holger

 ⢀⣴⠾⠻⢶⣦⠀
 ⣾⠁⢠⠒⠀⣿⡁  holger@(debian|reproducible-builds|layer-acht).org
 ⢿⡄⠘⠷⠚⠋⠀  OpenPGP: B8BF54137B09D35CF026FE9D 091AB856069AAA1C
 ⠈⠳⣄

Just because other people are also responsible, does not mean you are not
responsible.


signature.asc
Description: PGP signature


Re: Request for review of debootstrap change [was: Re: Second take at DEP17 - consensus call on /usr-merge matters]

2023-08-11 Thread Helmut Grohne
Hi Holger,

On Fri, Aug 11, 2023 at 09:28:51AM +, Holger Levsen wrote:
> On Fri, Aug 11, 2023 at 09:38:02AM +0100, Luca Boccassi wrote:
> > > This is implemented in
> > > https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/96
>  
> what about cdebootstrap?

cdebootstrap (and mmdebstrap) never implemented a merging step[1] and to
this date rely on the usrmerge package doing it at postinst time. Once
base-files ships the aliasing symlinks, both will produce /usr-merged
trees without any modifications. The reason that we need a change to
debootstrap is that its current merging implementation breaks when
base-files ships aliasing symlinks.

So the main reason for doing this change to debootstrap is that it
enables us to continue supporting cdebootstrap and mmdebstrap without
any changes there.

Helmut

[1] For mmdebstrap there is a merged-usr hook that can do it. Johannes
will migrate it to the same post-merging approach I am proposing for
debootstrap here.



Re: Request for review of debootstrap change [was: Re: Second take at DEP17 - consensus call on /usr-merge matters]

2023-08-11 Thread Holger Levsen
On Fri, Aug 11, 2023 at 09:38:02AM +0100, Luca Boccassi wrote:
> > This is implemented in
> > https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/96
 
what about cdebootstrap?


-- 
cheers,
Holger

 ⢀⣴⠾⠻⢶⣦⠀
 ⣾⠁⢠⠒⠀⣿⡁  holger@(debian|reproducible-builds|layer-acht).org
 ⢿⡄⠘⠷⠚⠋⠀  OpenPGP: B8BF54137B09D35CF026FE9D 091AB856069AAA1C
 ⠈⠳⣄

"In just 6 decades, roughly the life span of a blue whale, humans took blue 
whale
population down from 360,000 to just 1,000. In one century, whalers killed two
million baleen whales, which together weighed twice as much as all wild mammals
on Earth today."
https://www.theatlantic.com/science/archive/2021/11/whaling-whales-food-krill-iron/620604/


signature.asc
Description: PGP signature


Re: Request for review of debootstrap change [was: Re: Second take at DEP17 - consensus call on /usr-merge matters]

2023-08-11 Thread Luca Boccassi
On Fri, 11 Aug 2023 at 05:52, Helmut Grohne  wrote:
>
> Hi,
>
> This is picking up on the debootstrap matter and is kinda crucial.
>
> On Thu, Jul 13, 2023 at 01:31:04AM +0100, Luca Boccassi wrote:
> > > After having sorted this out, what part of your safety concerns with 3C
> > > do remain?
> >
> > Nothing, as that stemmed from a misunderstanding of what the
> > implementation would have required, and that's cleared now.
>
> So we finally removed the misunderstanding with Luca and I imply that
> this also removes Sam's concern (as he was inheriting the
> misunderstanding from Luca).
>
> Let me briefly recap the most important pieces. The proposal at hand is
> changing debootstrap in unstable, testing, stable and oldstable. Rather
> than merging /usr before the initial unpack, it will merge after the
> initial unpack but before running maintainer scripts. Therefore
> base-files can ship aliasing symlinks without triggering tar errors from
> debootstrap and once it does, the merging step in debootstrap
> automatically becomes a noop. With this change in place, we can move
> forward without changing cdebootstrap nor mmdebstrap.
>
> This is implemented in
> https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/96
> and reviewed by Luca Boccassi and Simon McVittie. Thank you two. I have
> tested this change for bootstrapping buster, bullseye, bookworm and
> trixie on amd64 without hitting regressions.
>
> Do we have any more disagreement with this approach or implementation?
> If you review the MR, don't hesitate to leave a positive or negative
> comment on it. We want to make sure that this doesn't break stuff as its
> exposure is high.
>
> I intend to merge and NMU this change before too long and Simon McVittie
> intends to prepare stable and oldstable uploads with this change and the
> change to make --variant=buildd /usr-merged for trixie and beyond.
> Having these changes in oldstable (and thus affecting buildds) is a
> precondition for lifting the moratorium, so we'd like to move forward
> soon.

Ship it!

If you need help with NMUs to unstable or *stable let me know.

Kind regards,
Luca Boccassi