From nobody Wed Dec 31 17:36:54 2025 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 4dhHFf5nBRz6M0Qd for ; Wed, 31 Dec 2025 17:36:54 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhHFf573Xz47fm for ; Wed, 31 Dec 2025 17:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767202614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brgdRvBMUQyzxQbrIVBAiosow27vQO2r2I0pdq90QFc=; b=BsMQK+G7UMjGEsKB5kTyV6DHmqtn3LUn6rh3l6AoEzExcHYi1kEJP8H5ooObfSaGyJDJTf 3fen9j/b80FQT3QjFVXkaXnQaaVeH6E/KY2oLwhcS6o5RHCv8Ff9gKQ3UBePcKZMKBnjaG 5ZbfatWH5/Le9nScf2CYj9rH+/yud6zn3vn5IkWmxvxYYWX+uRqqifomstjV9fILmq51+1 ApMZiIPY3qL8s2PLcvBVhzq7o42IXBjh+6evOaarf9/b+u38r4DhBr/mP0IwWyVOoczMwJ wK1ttWPY9vQCkJ+8FUqnbonIUeV5Jqrcp3i8HJCg3tU6s0dQZRY7k5UHF0e1eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767202614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brgdRvBMUQyzxQbrIVBAiosow27vQO2r2I0pdq90QFc=; b=y22Jyy1YbIE4LRzJqNB10R+ES4E3NQUJ4qp48bFeb7BiPh4IKF5Ub9UzUa09yUH40OqOkR 4Sx/K6FtQ+BoDKlKvWjWEoY07UaKpD/1Bywakk1/42KFOjGXb6rDTIrmu5QaQpIepY1/vx MYdx3pjYuc+9mRAp4i4exT2CmGdzM3KKBogb6Z5mbTjjyhlyQ9g6Nm76FThi+/kz37GS7/ +6Lj9PJQnJuZ6YYzOl3ferlLmkrHsG+a4y4LP6tjGEgp6bO7oX2ON49Ftjrg0pmvzOyuiX +dYQPJqNTLmJdwE+BRTeBDbE460SJTMLpNlEgOVjPOQ7SMpcsIcgAhJoK0yx3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767202614; a=rsa-sha256; cv=none; b=cI/y9Vec/yEoR6Jhs+oeZBLyu61xgd1ueofckQ1RldyH6lKZekqzp4++5sU1EVOj3NuXkb n8lSyp4zPSMVxr0H8663287r72GpsoJ6QaJOuzUCkdqpMkOn/aCE+Icn+GOGvlT9thGSrk zF2dQAHwtnUqUNKUz3mXF+RemSsG4HFR2/r0hiMSC58wG2i/ibKpGmfEQzVRb6gmQVecgM UVggwpSdGopRDeN2968rYYvcm9ozDnNiU1dryg2rWHJUbPjE6KDvK+gjTfjXD8gsHzIEAj dCsMMnk/c5spY6nn3Mmz5aNBE8RPpB2D84c8gl3sEL4L8L9ZvcJK4HR93r2XgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhHFf43Q7zwLq for ; Wed, 31 Dec 2025 17:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22863 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 31 Dec 2025 17:36:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 2c0e9a76c1ce - main - 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c0e9a76c1cee8766245a0b5bdad73e995b790c6 Auto-Submitted: auto-generated Date: Wed, 31 Dec 2025 17:36:54 +0000 Message-Id: <69555f36.22863.80e0842@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2c0e9a76c1cee8766245a0b5bdad73e995b790c6 commit 2c0e9a76c1cee8766245a0b5bdad73e995b790c6 Author: Jessica Clarke AuthorDate: 2025-12-31 17:36:10 +0000 Commit: Jessica Clarke CommitDate: 2025-12-31 17:36:10 +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 --- Makefile.inc1 | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9518d4034afc..c0bf42c3d008 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1753,10 +1753,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} @@ -1798,12 +1794,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 "--------------------------------------------------------------" @@ -1865,6 +1861,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. # @@ -1891,8 +1897,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 "--------------------------------------------------------------" @@ -1929,8 +1935,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/} \ @@ -1961,8 +1967,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 | \ @@ -2330,8 +2336,8 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap create-kernel-packages: .PHONY .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