From nobody Sun Feb 22 01:11:22 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJQt314b7z6SdKT for ; Sun, 22 Feb 2026 01:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJQt24kryz3xSB for ; Sun, 22 Feb 2026 01:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ImpKR1Kytcexo61ELC3N7WDhdgZ+43UGQ35BpqMXzWU=; b=CPuOcFjEUmI3w3fajRcfzetbwKdI76LZNB4Ln78d+teUylbZeIlAlkb8ycyRl3U3CwCpMl HOM7Zxdd5lA827fPBfAiQEonulHKipPO4cGWgPU6OZgGcvANMiWi+8X5p7Ov5Hj6kaAgva KgpJr1uuCaQ5S1Kubw/jdLL9AqOinygP3FMPam1MTAvQAs6rWRbTO+y9x0loqXSe48wQCl NxXYf0GwI60eM9zcwughWgtkin68x8gAtSVGfb5BwWP6dl9tMUJgZnC9NldU2oAIpQXVgW D4Sg5gYBcznUsWgtXsmCLCeDR1VQJemFgFb2eVYEFU4FW0s7sqUX+tFu+kowgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771722682; a=rsa-sha256; cv=none; b=x/5mvIF3YtXeh+ETAkcfmxQl6ArPZXYLO2OyfC/h7E2xPt5rf0qVwwbkUTH8XI1sMBChQq nmwP0s2eZKP/0Ze4FRDnrzJLfyN41ZSBzaQO+hMj4raI3Jkhq5oisGvvcsI5Nr83mJ2KZS Mib6Xq/PepYZq5YJFowqgLlIOH/+E2cCkZNLMA8PB3jAlIUfz1Towbou5guhj7GUBKzSSP kjUBl53SG3mt+UcrAI4YVed4IRDO9AGeu+LA8iEFwVJBzj+1YdPYTxXjEd/rDG6mP5hDrW V+EGCTvrRA6KE572WMZLBMr9kud4BVn7/f9y+OChjsk8qT8ttgVNpj56TvHldg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ImpKR1Kytcexo61ELC3N7WDhdgZ+43UGQ35BpqMXzWU=; b=Kin71LCP5K2PGnwd7OmCpuQl/db76JwyhaE2nRAkd2DWxHbyDqHpI4nPx5w0DrHOE/4nyf hqcImkRk612yyA27SZNmV2rKbQFvtHVVgXXk+DLdbavXdeVDu7R7BnW5C9HxW/51IpUHSb Yr0X3FZHNudhCkZo6SVlBhmtZzSiEofPrn6nP07OTfLb1sTBKZbkbXnMHHuC73DuTRhwem 9QrGp7WGfJgFwHzrpe2en5oEpL2tB1No2Wg6STFtuG6wSebmQZtxgYZabWbu94n9Y11WQy Ynima9j4W9as3GJUp0mRdDlKEBmwn7aoens2WfVL1yNyhu39fzFs/41Eme6UyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJQt24LPcz7K1 for ; Sun, 22 Feb 2026 01:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41137 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 01:11:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Lexi Winter Subject: git: 6c0c5c03413b - stable/15 - Makefile.inc1: Make NO_INSTALLKERNEL less of a hack List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6c0c5c03413bf69756fa19ac7f2bcd4270bdb01b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 01:11:22 +0000 Message-Id: <699a57ba.41137.197a8557@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=6c0c5c03413bf69756fa19ac7f2bcd4270bdb01b commit 6c0c5c03413bf69756fa19ac7f2bcd4270bdb01b Author: Jessica Clarke AuthorDate: 2025-12-31 17:36:10 +0000 Commit: Lexi Winter CommitDate: 2026-02-22 00:57:19 +0000 Makefile.inc1: Make NO_INSTALLKERNEL less of a hack Rather than adding a dummy entry which requires everyone to know to skip it, introduce a new INSTALLEXTRAKERNELS which contains the set of kernels to install as kernel.KERNCONF. Reviewed by: ivy MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54291 (cherry picked from commit 2c0e9a76c1cee8766245a0b5bdad73e995b790c6) --- Makefile.inc1 | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index dd47b53bf681..ea7e417992e0 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1773,10 +1773,6 @@ KERNCONF?= ${GENERIC_KERNCONF} BUILDKERNELS= INSTALLKERNEL= -.if defined(NO_INSTALLKERNEL) -# All of the BUILDKERNELS loops start at index 1. -BUILDKERNELS+= dummy -.endif .for _kernel in ${KERNCONF} .if !defined(_MKSHOWCONFIG) && exists(${KERNCONFDIR}/${_kernel}) BUILDKERNELS+= ${_kernel} @@ -1818,12 +1814,12 @@ _BUILDKERNEL_START!= date '+%s' # Builds all kernels defined by BUILDKERNELS. # buildkernel: .MAKE .PHONY -.if empty(BUILDKERNELS:Ndummy) +.if empty(BUILDKERNELS) @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \ false .endif @echo -.for _kernel in ${BUILDKERNELS:Ndummy} +.for _kernel in ${BUILDKERNELS} @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`" @echo "--------------------------------------------------------------" @@ -1885,6 +1881,16 @@ NO_INSTALLEXTRAKERNELS?= yes NO_INSTALLEXTRAKERNELS?= no .endif +.if ${NO_INSTALLEXTRAKERNELS} != "yes" +.if defined(NO_INSTALLKERNEL) +INSTALLEXTRAKERNELS= ${BUILDKERNELS} +.else +# First kernel is installed separately by INSTALLKERNEL, typically to +# /boot/kernel, rather than to a config-suffixed directory. +INSTALLEXTRAKERNELS= ${BUILDKERNELS:[2..-1]} +.endif +.endif + # # installkernel, etc. # @@ -1911,8 +1917,8 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY echo ">>> Install kernel(s) ${INSTALLKERNEL} completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" @echo "--------------------------------------------------------------" .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} @echo "--------------------------------------------------------------" @echo ">>> Installing kernel ${_kernel} $$(LC_ALL=C date)" @echo "--------------------------------------------------------------" @@ -1949,8 +1955,8 @@ distributekernel distributekernel.debug: .PHONY ${METALOG_SORT_CMD} >> ${DESTDIR}/${DISTDIR}/kernel.meta .endif .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} rm -f ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta ${_+_}cd ${KRNLOBJDIR}/${_kernel}; \ ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \ @@ -1981,8 +1987,8 @@ packagekernel: .PHONY @${DESTDIR}/${DISTDIR}/kernel.meta | \ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ ${TAR_CMD} cvf - --exclude '*.debug' \ @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ @@ -2350,8 +2356,8 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} . endfor .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -. for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} . if exists(${KSTAGEDIR}/kernel.${_kernel}.meta) . if ${MK_DEBUG_FILES} != "no" _debug=-dbg