Hi, Quoting Helmut Grohne (2023-06-09 15:22:39) > Add a new package usrmerge-support (or whatever). It is a bit similar to > multiarch-support: It must not have any dependencies or pre-dependencies. It > will not have files, but maintainer scripts. Those scripts set up protective > diversions on behalf of base-files for the symbolic links that cause > aliasing. Then base-files will issue a Pre-Depends on usrmerge-support (but > not yet ship symlinks). I initially thought, this could be part of > usr-is-merged, but then base-files would pull that and standard mmdebstrap > would no longer pull usrmerge and break. So it really needs to be a separate > package. Anyway, once we have protective diversions, we can move files > without risking that dpkg deletes the symbolic links. > > Then we can actually perform that move of files to their canonical > locations except for a small set of locations including dash, bash, > libc6, and util-linux (maybe not exhaustive). [There is a lot of missing > detail about non-bootstrap aspects here.] > > Once all essential packages (but the exceptions) have no files left in > aliased locations, we can upload base-files adding the symlinks together > with the packages previously kept unmodified in one dinstall. Before > that dinstall, things will continue to work normally. The protective > diversions will not affect unpacking, because dpkg only performs exact > matches on diversions. After that dinstall, base-files will create the > symlinks and things will hopefully work (because the patched debootstrap only > creates them after the initial unpack). if I understand that plan correctly, the usrmerge-support package setting up diversions is only necessary because you want to avoid having to do the move to /usr of *all* affected packages in the essential set in a single dinstall? Is that correct? If yes, how many source packages are we have to be modified part from base-files, dash, bash, libc6, and util-linux? Is it just these? audit bzip2 coreutils debianutils dpkg gcc-13 grep gzip hostname libcap2 libcap-ng libgpg-error libselinux libxcrypt ncurses pam sed shadow sysvinit tar xz-utils zlib Would it be too much to prepare patches for all of these, test that everything works with some QA setup and then NMU all 22 source packages with pre-approved patches in a single dinstall? Would that avoid having to temporarily go via a usrmerge-support package? Thanks! cheers, josch
Attachment:
signature.asc
Description: signature