From: Didier Raboud Date: Mon, 4 Feb 2019 14:21:57 +0000 (+0100) Subject: Merge branch 'master' of https://salsa.debian.org/debian/tech-ctte X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6de084192337558358204e0f35424b8498973669;hp=741f1c57af14296af132feb2aec04259af011542;p=debian-ctte.git Merge branch 'master' of https://salsa.debian.org/debian/tech-ctte --- diff --git a/914897_merged_usr/ballot.md b/914897_merged_usr/ballot.md index d4705c2..ccc30f8 100644 --- a/914897_merged_usr/ballot.md +++ b/914897_merged_usr/ballot.md @@ -52,12 +52,24 @@ Two initiatives are worth mentioning at this point: Various valid long-term desireable situations coexist, and while discussing immediate countermeasures, it is useful to keep the long-term outcome that those are most likely to produce. -These are three possible situations for the fleet of bullseye (buster + 1) hosts: - -* `none`: "merged `/usr`" has been reverted; no bullseye hosts have `/{bin,sbin,lib}/`→ `/usr/{bin,sbin,lib}/` symlinks; only `cat` only exists at `/bin/cat`; -* `weak`: bullseye hosts can have any of "merged `/usr`" or "classical" directory schemes; official packages are only built on "classical" directory schemes; packages built on "merged `/usr`" are allowed to break on "classical" directory schemes. -* `hard`: bullseye hosts can have any of "merged `/usr`" or "classical" directory schemes; official packages are built on either "merged `/usr`" or "classical" directory schemes; packages built on either are forbidden to break on either directory schemes. -* `all`: bullseyes hosts all have "merged `/usr`"; official packages are built on "merged `/usr`"; packages built on "classical" directory schemes are allowed to break on "classical" directory schemes. +These are the five possible situations at the time of bullseye (buster + 1): + +* `none`: "merged `/usr`" has been happened +* `weak`: both directory schemes are allowed, packages only built on classical hosts +* `hard`: both directory schemes are allowed, packages can be built anywhere +* `all` : only "merged `/usr`" directory schemes are allowed, packages only built on "merged `/usr`" hosts +* `full`: only "merged `/usr`" directory schemes are allowed, symlinks have been removed + +It can be summarized by the following table: + +| | Host types that are allowed | Are merged-/usr | Official packages are built on | Packages built on … can break on the other | +| Codename | classical hosts | merged-/usr hosts | symlinks allowed | classical hosts | merged-/usr hosts | classical hosts | merged-/usr hosts | +|----------|-----------------|-------------------|------------------|—----------------|-------------------|---------------------|----------------------| +| none | yes | no | no | yes | no | yes | yes | +| weak | yes | yes | yes | yes | no | no | yes | +| hard | yes | yes | yes | yes | yes | no | no | +| all | no | yes | yes | no | yes | yes | no | +| full | no | yes | no | no | yes | yes | yes | ## Immediate actions