Skip to content

Commit 81ec257

Browse files
committed
Doc updates
1 parent fd578c6 commit 81ec257

3 files changed

Lines changed: 228 additions & 47 deletions

‎nextbsd-freebsd-compat-buildworld-plan.html‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,8 @@ <h2 id="loadbearing">6. Load-bearing: <code>/etc</code> guard + setuid from META
184184

185185
<h2 id="downstream">7. Downstream: one line, the proof, the rollback</h2>
186186

187-
<p><strong>The single downstream code change.</strong> <code>nextbsd-pkg/scripts/build.sh</code> hardcodes the base&harr;userland dedup (today just the two <code>Block*.h</code>). A full world adds exactly one new overlap &mdash; <code>syslogd</code> (&sect;4.1). So:</p>
188-
<pre><code># nextbsd-pkg/scripts/build.sh (the dedup rm -f)
189-
rm -f stage/compat/usr/include/Block.h stage/compat/usr/include/Block_private.h \
190-
stage/compat/usr/sbin/syslogd # &lt;-- add (buildworld now ships base syslogd)</code></pre>
191-
<p>The measured collision set is only 3 files, so this is the whole delta &mdash; but don't trust that, <strong>prove it</strong>:</p>
187+
<p><strong>No downstream code addition needed</strong> &mdash; and this corrects the first-pass assumption. Collisions are stripped <em>upstream</em>, in the base build (<code>strip-collisions.sh</code>), so the <code>nextbsd-base-*.tar.gz</code> that <code>nextbsd-pkg</code> consumes already arrives clean of all 3 (verified against the PR #46 artifact: <code>syslogd</code>, <code>Block.h</code>, <code>Block_private.h</code> all absent). That makes the existing dedup at <code>nextbsd-pkg/scripts/build.sh:52-58</code> (<code>rm -f &hellip;/Block.h &hellip;/Block_private.h</code>) a <strong>redundant no-op</strong> &mdash; the files it deletes aren't there anymore. So the change is a <em>deletion</em>, not an addition, and it's optional: remove those lines so collision policy lives in exactly one self-policing place instead of a stale partial copy that only knows <code>Block.h</code>. Adding <code>syslogd</code> there would be pointless.</p>
188+
<p>The measured collision set is only 3 files, all handled upstream &mdash; but don't trust that, <strong>prove it</strong>:</p>
192189
<pre><code># (A) SUPERSET — every path today's base ships must still exist (minus intended strips). Expect EMPTY:
193190
comm -23 old.list new.list | grep -vf intended-strip.txt # must be empty
194191
# (B) NEW userland overlaps — must be fully absorbed by the dedup:

0 commit comments

Comments
 (0)