Page MenuHomeFreeBSD

release: Support -DNO_ROOT image building
ClosedPublic

Authored by jrtc27 on Jan 22 2022, 1:18 AM.
Tags
None
Referenced Files
Unknown Object (File)
Apr 11 2024, 10:01 PM
Unknown Object (File)
Apr 11 2024, 6:59 PM
Unknown Object (File)
Apr 6 2024, 8:56 PM
Unknown Object (File)
Mar 15 2024, 9:14 AM
Unknown Object (File)
Mar 15 2024, 9:14 AM
Unknown Object (File)
Mar 15 2024, 9:14 AM
Unknown Object (File)
Mar 15 2024, 9:14 AM
Unknown Object (File)
Mar 15 2024, 9:14 AM

Details

Summary

This requires a bunch of METALOG mangling to include the files we inject
into the tree. The mkisoimages.sh and make-memstick.sh scripts are now
called with the current directory inside the tree so that the relative
paths in the METALOG match up with the current directory. The scripts do
not require this when not using a METALOG, but for simplicity we always
do so. The Makefile mangles the real METALOG created from the install,
as those files are shared across all uses of the tree, but the shell
scripts create a temporary copy of the METALOG that they mangle as their
tree modifications are specific to that image. We also need to pass -D
to makefs to turn any duplicate METALOG entry errors into warnings, as
we have many (harmless) instances of those.

Whilst dvd1.iso should work, the !NOPKG code will need more work to
support this.

All media will also lack mergemaster and etcupdate trees, since more
work is needed to add -DNO_ROOT modes to them. Users of install media
built this way will have to manually bootstrap them.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

Document pkg-state -DNO_ROOT support is a TODO

Disable mergemaster/etcupdate pre-configuration as this won't yet work; for some reason we've had (a more complicated version of) this as a downstream diff in CheriBSD for years

Looks good in general.

Wow could this code benefit from refactoring.

release/Makefile
209

Would it make sense to use install here where it's possible?

This revision is now accepted and ready to land.Jan 22 2022, 7:06 PM
gjb added a subscriber: gjb.

My apologies, I forgot to respond to this review request earlier.

Since we do know !NO_PKG does not necessarily work yet, please go ahead and commit to main, but do not MFC to stable/13 until we have that particular area resolved, since we are in the 13.1-RELEASE cycle phase now.

In D33999#779087, @gjb wrote:

My apologies, I forgot to respond to this review request earlier.

Since we do know !NO_PKG does not necessarily work yet, please go ahead and commit to main, but do not MFC to stable/13 until we have that particular area resolved, since we are in the 13.1-RELEASE cycle phase now.

Wasn't planning to MFC it anyway due to the potential disruption to stable branch image building, even aside from the current release cycle, though you're of course welcome to do so at any point that's convenient for you. Do you want to also check over the other smaller patches in the stack (specifically D33998 and D34001 for things that touch release/)? Nothing hugely interesting in those, this is the main one.

In D33999#779087, @gjb wrote:

My apologies, I forgot to respond to this review request earlier.

Since we do know !NO_PKG does not necessarily work yet, please go ahead and commit to main, but do not MFC to stable/13 until we have that particular area resolved, since we are in the 13.1-RELEASE cycle phase now.

Wasn't planning to MFC it anyway due to the potential disruption to stable branch image building, even aside from the current release cycle, though you're of course welcome to do so at any point that's convenient for you. Do you want to also check over the other smaller patches in the stack (specifically D33998 and D34001 for things that touch release/)? Nothing hugely interesting in those, this is the main one.

Just reviewed/accepted the other two. Apologies these fell off my radar.

We can discuss MFC to stable/13 after the releng/13.1 branch is created next week.

In D33999#779112, @gjb wrote:
In D33999#779087, @gjb wrote:

My apologies, I forgot to respond to this review request earlier.

Since we do know !NO_PKG does not necessarily work yet, please go ahead and commit to main, but do not MFC to stable/13 until we have that particular area resolved, since we are in the 13.1-RELEASE cycle phase now.

Wasn't planning to MFC it anyway due to the potential disruption to stable branch image building, even aside from the current release cycle, though you're of course welcome to do so at any point that's convenient for you. Do you want to also check over the other smaller patches in the stack (specifically D33998 and D34001 for things that touch release/)? Nothing hugely interesting in those, this is the main one.

Just reviewed/accepted the other two. Apologies these fell off my radar.

We can discuss MFC to stable/13 after the releng/13.1 branch is created next week.

Great, thanks.

This revision was automatically updated to reflect the committed changes.