Page MenuHomeFreeBSD

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

Authored by kevans on Fri, Oct 10, 5:07 AM.
Tags
None
Referenced Files
F131728364: D53017.diff
Fri, Oct 10, 4:55 PM
F131728010: D53017.id163908.diff
Fri, Oct 10, 4:51 PM
F131688697: D53017.id163908.diff
Fri, Oct 10, 8:56 AM
F131680040: D53017.diff
Fri, Oct 10, 7:22 AM
F131679085: D53017.id163908.diff
Fri, Oct 10, 7:10 AM
F131678925: D53017.id.diff
Fri, Oct 10, 7:08 AM
F131676245: D53017.diff
Fri, Oct 10, 6:32 AM
Subscribers

Details

Reviewers
manu
ivy
Group Reviewers
pkgbase
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 67708
Build 64591: arc lint + arc unit

Event Timeline

Makefile.inc1
2275

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

2275

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

2278

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
2278

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
2275

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