git: 0e3acd57984a - stable/14 - pkgbase: add a mechanism to be able to force a give ucl include

The branch stable/14 has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=0e3acd57984ab13270612cf5ea17227ec45f55e7

commit 0e3acd57984ab13270612cf5ea17227ec45f55e7
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-03-20 08:35:47 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-03-27 08:34:50 +0000

    pkgbase: add a mechanism to be able to force a give ucl include
    
    This is made in order to be able to find add the post-install scripts
    for the kernel, where PKGNAME varies for each KERNCONF but we don't want
    to dynamically duplicated the kernel.ucl file.
    
    At the same time we don't want the *-dbg* packages to actually include
    those post-install scripts
    
    (cherry picked from commit 45d83c39262d9e2727c6f409e19c653f19a5d7cc)
---
 Makefile.inc1                 | 2 ++
 release/packages/template.ucl | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index d304dc47010b..58a9b1fd4f3e 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2229,6 +2229,8 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne
 	${SRCDIR}/release/packages/generate-ucl.lua \
 		PKGNAME "kernel-${_kernel:tl}${flavor}" \
 		PKGGENNAME "kernel" \
+		FORCEINCLUDE "kernel${flavor}" \
+		UCLFILES "${SRCDIR}/release/packages/" \
 		VERSION "${PKG_VERSION}" \
 		KERNELDIR "kernel.${_kernel}" \
 		DESC "FreeBSD ${_kernel} kernel ${flavor}" \
diff --git a/release/packages/template.ucl b/release/packages/template.ucl
index 2e325e623336..a65f58868118 100644
--- a/release/packages/template.ucl
+++ b/release/packages/template.ucl
@@ -16,3 +16,4 @@ ${DESC}
 EOD
 .include(try=true,duplicate=rewrite) "${UCLFILES}/${PKGGENNAME}-all.ucl"
 .include(try=true,duplicate=rewrite) "${UCLFILES}/${PKGNAME}.ucl"
+.include(try=true,duplicate=rewrite) "${UCLFILES}/${FORCEINCLUDE}.ucl"