From nobody Sun Feb 22 01:11:23 2026 X-Original-To: dev-commits-src-branches@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 4fJQt40X22z6SdQC for ; Sun, 22 Feb 2026 01:11:24 +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 4fJQt35Xhkz3xDt for ; Sun, 22 Feb 2026 01:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771722683; 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=/P3+59tehR8WhIPclmFdAbZPfOlzf2dFmBGjGJdL0tI=; b=SUBEBqcLeoRldbn9v0+b3TQk81cKWXhUiqZTJFxjIZ/bWPbdRHSeYNy4qpLsaUsd7fF5bS X88jPIhv2t6BuaGRjRdD51be/q/jGGlsdAc2dBqUwTFdgUI5UJRUZBiXoMz+UyDpXVHHz8 kp5hJzUKZdrS0AWPAJn/QuzEKkgIXREZtZdge0Rwk0tpTXDOP+Ya+/Xa6MHpV95DqSjMr6 3Wpmuu/AARF34fZV7NlPmSd6FHyeiXjw/bcMW+Nm4DU8VVSPB6eey2UaJ98PS5in5vJ2q0 DgpUkCelTpGHkggATibcGVDGbtrm/okUaxPHfSUlpnQAriqwdVcCTxLGNZyp4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771722683; a=rsa-sha256; cv=none; b=TRDlywN1MYMdCAQnwCAHqDJR3zCUqdp33Ub+iUeq7n9fB+O1zGJEhS/D8UitWBh6Pa2Yn6 OVTr/Lp7dPpc9oW1lLoc2FNS6gb4qPIr6PwvpMRv47Fe+IQCzI0bNH5CGbttIliOLRuzns FFPXCYyRuzOitqnq8ycNlYcTM37gNgbtLwf3ejY3Gd+bFLcddqzWdu7/qiDM8UZl5MNHtd L/OYCSFTAPU6BwiijvEkQEjJgPppkfKTOO0+sZUJKUBJplQSjRkMQr9quyWsNwO8gNqZoQ vEpM5rw0/3Tbi7lyB4+Cc6U4zkS4z79FjsnvOqFLYKQ1nfx1SqXeMRHyFgemyg== 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=1771722683; 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=/P3+59tehR8WhIPclmFdAbZPfOlzf2dFmBGjGJdL0tI=; b=v9HuEiYCyKpuApgJCs0U+TY0S3+bhAXBx2ywdsTchu70ehNYwP8yvrxZLSBTDRCBpRPIWE xQoyKTx75SeR5DWvZYxs+hIil0HqAJHHWR4hFQZu1jmvjG1TEQqZpU8vETyhJpSt+59kEF t/o02EGXByQwXpWRiOpLE4PyOZLUXk3WkaM5YSKpV9Bx6WVdp9QCWnsUDI8rLSli3cHa1+ XdTpb4a9WXMe81U2eq2h9HEb0kAlc3gVXWP++C1x/5gn4s//prRcWRAw2gLokWUhT2wSR2 yEQ1KvnYUzc62GZjDUZ0fahoQ8PjDBcuFkRPEwVBLyGL7sHbcAvyfrCh0BUGNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJQt358mZz7Gc for ; Sun, 22 Feb 2026 01:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 413e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 01:11:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 03c9ad37b497 - stable/15 - Makefile.inc1: Fix INSTALLEXTRAKERNELS for one-kernel case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 03c9ad37b497bd59dc3fb9ec86310b95e5d1abbe Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 01:11:23 +0000 Message-Id: <699a57bb.413e1.6cd5de24@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=03c9ad37b497bd59dc3fb9ec86310b95e5d1abbe commit 03c9ad37b497bd59dc3fb9ec86310b95e5d1abbe Author: Lexi Winter AuthorDate: 2026-01-06 01:48:04 +0000 Commit: Lexi Winter CommitDate: 2026-02-22 00:57:33 +0000 Makefile.inc1: Fix INSTALLEXTRAKERNELS for one-kernel case If BUILDKERNELS contains a single kernel, and NO_INSTALLEXTRAKERNELS=no, then ${BUILDKERNELS:[2..-1]} returns the first kernel in the list and that kernel ends up in both INSTALLKERNEL and INSTALLEXTRAKERNELS. This breaks the package build because it means we generate that package twice, once with an incorrect install path of /boot/kernel.NAME instead of /boot/kernel. Only set INSTALLEXTRAKERNELS if we're building at least two kernels. Fixes: 2c0e9a76c1ce ("Makefile.inc1: Make NO_INSTALLKERNEL less of a hack") Reviewed by: jrtc27 Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D54539 (cherry picked from commit 0b298e314a8b47c1f2bf8a9ff86c050accbd744d) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ea7e417992e0..631c12543b3a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1884,10 +1884,12 @@ NO_INSTALLEXTRAKERNELS?= no .if ${NO_INSTALLEXTRAKERNELS} != "yes" .if defined(NO_INSTALLKERNEL) INSTALLEXTRAKERNELS= ${BUILDKERNELS} -.else +.elif ${BUILDKERNELS:[#]} > 1 # First kernel is installed separately by INSTALLKERNEL, typically to # /boot/kernel, rather than to a config-suffixed directory. INSTALLEXTRAKERNELS= ${BUILDKERNELS:[2..-1]} +.else +INSTALLEXTRAKERNELS= .endif .endif