Page MenuHomeFreeBSD

packages: Remove the /boot hack from mtree-to-plist.awk
ClosedPublic

Authored by ivy on Oct 17 2025, 10:07 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Dec 19, 7:20 PM
Unknown Object (File)
Sun, Dec 14, 12:44 AM
Unknown Object (File)
Fri, Dec 12, 10:11 PM
Unknown Object (File)
Sat, Dec 6, 12:36 AM
Unknown Object (File)
Fri, Dec 5, 1:18 PM
Unknown Object (File)
Tue, Dec 2, 5:24 AM
Unknown Object (File)
Fri, Nov 28, 6:09 PM
Unknown Object (File)
Thu, Nov 27, 12:03 AM

Details

Summary

Currently, files in /boot (other than /boot/kernel) are assigned to the
bootloader package using a filename match in mtree-to-plist.awk. This
causes some problems, most notably that debug info for userboot ends up
in the utilities-dbg package instead of bootloader-dbg.

Remove the path handling from mtree-to-plist and instead set PACKAGE
in the appropriate Makefiles to put these in the correct package.

While here, move userboot*.so from bootloader-dev to bootloader.

MFC after: 3 days

Diff Detail

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

Event Timeline

ivy requested review of this revision.Oct 17 2025, 10:07 PM
kevans added inline comments.
release/scripts/mtree-to-plist.awk
43

Probably also need to GC parts of the below kernel != "" && pkgname != "dtb" condition

release/scripts/mtree-to-plist.awk
43

i think we need to keep that (assuming you mean around line 69) since that's handling the kernel package name.

release/scripts/mtree-to-plist.awk
43

Right, I meant the conditional itself (since we don't set pkgname=dtb explicitly), but looking again I realize that it just became implied- they'll have the correct package= tag still in the kernel mtree

Looks plausible to me. I don't know enough about the bits to confirm that everything now goes in the right places but assuming you've tested that should be fine.

This revision is now accepted and ready to land.Oct 18 2025, 12:11 AM