From 8b53ad071af7690ee370672e14a1c9da2ccbe4a2 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Mon, 25 Feb 2019 14:37:45 +0100 Subject: [PATCH] Clarify 'weak' option, rephrase ballot, allow all three of 'weak', 'middle' and 'hard' --- 914897_merged_usr/ballot.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/914897_merged_usr/ballot.md b/914897_merged_usr/ballot.md index 661a66e..e577d04 100644 --- a/914897_merged_usr/ballot.md +++ b/914897_merged_usr/ballot.md @@ -56,12 +56,12 @@ Various valid long-term desirable situations coexist, and while discussing immed These are the six possible situations at the time of bullseye (buster + 1): -* `none`: "merged `/usr`" has been reverted -* `empty`: "merged `/usr`" has been reverted, `/usr` is empty (but the mandatory files) -* `weak`: both directory schemes are allowed, packages only built on classical hosts -* `middle`: both directory schemes are allowed, packages can be built anywhere -* `hard`: both directory schemes are allowed, packages only built on "merged `/usr`" hosts -* `all`: only "merged `/usr`" directory schemes are allowed, packages only built on "merged `/usr`" hosts +* `none`: "merged `/usr`" has been reverted +* `empty`: "merged `/usr`" has been reverted, `/usr` is empty (but the mandatory files) +* `weak`: both directory schemes are allowed, all packages only built on classical hosts +* `middle`: both directory schemes are allowed, all packages can be built on either +* `hard`: both directory schemes are allowed, packages can be built on either, official packages only built on "merged `/usr`" hosts +* `all`: only "merged `/usr`" directory schemes are allowed, packages only built on "merged `/usr`" hosts It can be summarized by the following table: @@ -71,7 +71,7 @@ It can be summarized by the following table: |----------|-----------------|---------------------|-------------------|—----------------|---------------------|---------------------|----------------------| | none | yes | no | no | yes | no | yes | yes | | empty | yes | no | no | yes | no | yes | yes | -| weak | yes | yes | yes | yes | no | no | no | +| weak | yes | yes | yes | yes | no | no | yes | | middle | yes | yes | yes | yes | yes | no | no | | hard | yes | yes | yes | no | yes | no | no | | all | no | yes | yes | no | yes | yes | no | @@ -83,11 +83,13 @@ The current state of buster is `weak`. The Technical Committee resolves to decline to override the debootstrap maintainers. -Furthermore, using its §6.1.5 "Offering advice" power, the Technical Committee considers that: +Furthermore, using its §6.1.5 "Offering advice" power, the Technical Committee considers that the desirable solution at the time of `bullseye` is: -* A: The desirable solution at the time of bullseye is `weak`; both directory schemes should be allowed, but packages should only be built on hosts with classical directory schemes (or chroots). +* W: `weak`: both directory schemes are allowed, but packages should only be built on hosts with classical directory schemes (or in such chroots) -* B: The desirable solution at the time of bullseye is `hard`; both directory schemes should be allowed, and packages can be built on hosts with either classical or "merged-`/usr`" directory schemes. +* M: `middle`: both directory schemes are allowed, and packages (including official packages) can be built on hosts with either classical or "merged-`/usr`" directory schemes + +* H: `hard`: both directory schemes are allowed, but packages should only be built on hosts with "merged-`/usr`" directory schemes (or in such chroots) * FD: Further Discussion -- 2.39.2