Page MenuHomeFreeBSD

build: fix ordering of pkgbase targets to get a dtb package reliably
ClosedPublic

Authored by kevans on Oct 10 2025, 5:07 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Dec 8, 2:55 PM
Unknown Object (File)
Tue, Dec 2, 5:58 PM
Unknown Object (File)
Sat, Nov 29, 11:36 PM
Unknown Object (File)
Nov 3 2025, 12:46 AM
Unknown Object (File)
Nov 2 2025, 7:38 AM
Unknown Object (File)
Nov 1 2025, 9:50 AM
Unknown Object (File)
Oct 15 2025, 5:46 PM
Unknown Object (File)
Oct 15 2025, 2:10 PM

Details

Summary

dtb.plist is generated by mtree-to-plist when it processes the kernel
metalog, so we shouldn't try to create dtb packages until that's been
done. Add another level of indirection to the create-kernel-packages
target to organize all of the kernel flavors under a single target that
is ordered before the create-dtb-packages target.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 67688
Build 64571: arc lint + arc unit

Event Timeline

Makefile.inc1
2271

did you mean to drop .PHONY here? i think this is still applicable since this isn't a real target.

2271

edit: i misread that, you didn't drop it from this target, but i think it should be added :-)

2274

i wonder if it would make more sense to just do

.ORDER: create-kernel-packages create-dtb-package

? there's already a bunch of these rules elsewhere in the file.

Makefile.inc1
2274

We would have to restructure the dependencies so that the dtb target isn't a subset of the kernel one (otherwise the dependency can't be fulfilled), but I'm not sure that makes sense from an organizational standpoint- the dtb is tied to the kernel in some ways, and it makes sense to consider it a kernel package. We could add a level of indirection like all-kernel-packages to clean it up, but I think minimally invasive for 15.0 might be best.

Add a create-kernel-flavored-packages level of indirection instead, which looks
a little cleaner

kevans added inline comments.
Makefile.inc1
2271

I note that it was already marked .PHONY just above the loop

cperciva added a subscriber: cperciva.

This fixes the issue for me. Please commit and insta-MFC so it will be in BETA1.

This revision is now accepted and ready to land.Oct 10 2025, 5:24 PM