git: 9af9e7c5cc47 - main - pkgbase: default to installing all specified kernels

[Kyle Evans]

The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=9af9e7c5cc47d3b5ff5fde5bd6707f910486d273

commit 9af9e7c5cc47d3b5ff5fde5bd6707f910486d273
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-01-15 13:43:38 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-01-17 20:05:33 +0000

    pkgbase: default to installing all specified kernels
    
    These only get staged off to the side, not installed into the system. Let's
    change the default for packages/update-packages to be less surprising.
    
    MFC after:      1 week
    Reviewed by:    manu, meena <me igalic co>
    Differential Revision:  https://reviews.freebsd.org/D28190
---
 Makefile.inc1 | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 5a9eff870dd5..27229cb06711 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1711,7 +1711,15 @@ buildkernel: .MAKE .PHONY
 	  echo "ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}"
 	@echo "--------------------------------------------------------------"
 
+.if !make(packages) && !make(update-packages)
 NO_INSTALLEXTRAKERNELS?=	yes
+.else
+# packages/update-packages installs kernels to a staging directory then builds
+# packages from the result to be installed, typically to other systems.  It is
+# less surprising for these targets to honor KERNCONF if multiple kernels are
+# specified.
+NO_INSTALLEXTRAKERNELS?=	no
+.endif
 
 #
 # installkernel, etc.
@@ -1872,11 +1880,14 @@ PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest
 .endif
 .endif
 
+PKGMAKEARGS+=	PKG_VERSION=${PKG_VERSION} \
+		NO_INSTALLEXTRAKERNELS=${NO_INSTALLEXTRAKERNELS}
+
 packages: .PHONY
-	${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} real-packages
+	${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-packages
 
 update-packages: .PHONY
-	${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} real-update-packages
+	${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-update-packages
 
 package-pkg: .PHONY
 	rm -rf /tmp/ports.${TARGET} || :