git: 8a0cdfc5a58d - stable/15 - build: fix ordering of pkgbase targets to get a dtb package reliably

The branch stable/15 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=8a0cdfc5a58d75272ec98a14c9cc7469db6b51f0

commit 8a0cdfc5a58d75272ec98a14c9cc7469db6b51f0
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2025-10-10 17:37:51 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2025-10-10 17:38:25 +0000

    build: fix ordering of pkgbase targets to get a dtb package reliably
    
    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.
    
    Note that we may later refine these targets after further pkgbase
    review; this is simply a maybe-final stop-gap that's been tested to
    fix a known problem.
    
    Reviewed and tested by: cperciva
    
    (cherry picked from commit a29cf898b09c4d4906f92fd2982410c9f5935f6c)
---
 Makefile.inc1 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index e98b5f233b51..cd3e3f007c3b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2256,7 +2256,7 @@ _default_flavor=	-default
 _debug=-dbg
 . endif
 
-create-dtb-package:
+create-dtb-package:	.PHONY
 	@if [ -f ${KSTAGEDIR}/${DISTDIR}/dtb.plist ]; then \
 	${SRCDIR}/release/packages/generate-ucl.lua \
 		PKGNAME "dtb" \
@@ -2281,9 +2281,12 @@ create-dtb-package:
 		-o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} ; \
 	fi
 
-create-kernel-packages:	.PHONY
+create-kernel-packages:	.PHONY create-kernel-flavored-packages create-dtb-package
+create-kernel-flavored-packages:	.PHONY
+.ORDER: create-kernel-flavored-packages create-dtb-package
+
 . for flavor in "" ${_debug}
-create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-dtb-package
+create-kernel-flavored-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}
 create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY
 	@cd ${KSTAGEDIR}/${DISTDIR} ; \
 	${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \