Page MenuHomeFreeBSD

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

Authored by ivy on Fri, Oct 17, 10:07 PM.
Tags
None
Referenced Files
F132639121: D53179.diff
Sat, Oct 18, 4:09 PM
Unknown Object (File)
Sat, Oct 18, 9:59 AM
Unknown Object (File)
Sat, Oct 18, 9:59 AM
Unknown Object (File)
Sat, Oct 18, 9:34 AM
Unknown Object (File)
Sat, Oct 18, 9:11 AM

Details

Reviewers
cperciva
imp
manu
Group Reviewers
pkgbase
bhyve
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 Skipped
Unit
Tests Skipped
Build Status
Buildable 67885
Build 64768: arc lint + arc unit

Event Timeline

ivy requested review of this revision.Fri, Oct 17, 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.Sat, Oct 18, 12:11 AM