From nobody Tue Jan 6 01:49:40 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 4dlYxw47rdz6MvMX for ; Tue, 06 Jan 2026 01:49:40 +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 4dlYxw3cKFz49W9 for ; Tue, 06 Jan 2026 01:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767664180; 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=If1GoPZWu2YCqH8OW2uuLAjjT5BeIKkF1LchliDTBwk=; b=h3xoeuNYQiwN90O9cFf9vSloCSysU9GciZT0zxOACDNF/tQfCSEm0dWgNNq4of6v4Z+Lwj ZAjhoJrTFZDxqg+3KAOgT4ahCI0Juu5R5QF7HaPzXW1P3Ozah8k9GonZWB2eR3ArPtwImN F+YB9q+SNgaEfi+LnHYFB3U1f7qvWXjB/PA4zg/DLe2vkmM6iJWCYoLVEPqWRddRdVkMGO mKEuozW+adPmHg0MCVLdyxpMdZXk+lAG21cFZN5ayha1HCD3FAVXwy/KqKtXrrXAlxDJpC /3fQUcqR3yODfMrRqycCkOOZUIL9snfK3fXaess8al2AEooB0dI/HaaFcYJD/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767664180; 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=If1GoPZWu2YCqH8OW2uuLAjjT5BeIKkF1LchliDTBwk=; b=g8CkqrXtzhIZtwOn+wegG7ZCb+08aJyR+jI63pAU0hvblXlfFqkc3UeW50/lUpk3cka2Up jJgDk1i12YtsujzCWef1DzMNRHPST2agQFRvBCVDZudNBFCLOACIMQv1DPN1zZnrgKZJrv AybqH9Cjt6SvTE+UAD26iaGGZ6vQGhCjXxSJPyILECX1b98Dmm94SQjOBzOT9SPVWaDz8o NjDlxMP8usn29hvbUzZsnJ6vj/pUBP2uMaLz8elFhFVE1IPzOmhmQtWqM2sJecIKmVRNTa umfUfEzz8zyVK2TU8DlfkhVE3KxrBe9smQDkQhWoWLxHfK87JQEK9Nb3t1Z8tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767664180; a=rsa-sha256; cv=none; b=ZPzadS/wECdo8AqLrJNJzKi5pGTHgrfWfYVoIWIxP/Kv1b5nQqulRJCwBGcm3UI4rfI47u lb8f8ZsQJ7K9PltOhuzBYrSi7RBgPpw5In7Bel1MzykQr734b0iwCTOCJq7q8RtyYl9Azd PohGvp4pfojsTGQ2E2KL1HzfXelDOd90QDkOH+v2mdRYuL6rrNZ5jjOleNdm3if4OwzB1m LV/4vM9fLgTgYeD11OKeqWSPKF7yz+fom54El5YRkk4oy3GWtBIol1Pgu0rrH2ArkCvOvG uroic1PJfDOd2Dg6MdCooSDpV9GnJecWu91BBtYV/bkxN7U38Ej4jGqWQs47WA== 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 4dlYxw3B19zmYX for ; Tue, 06 Jan 2026 01:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40744 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Jan 2026 01:49:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 0b298e314a8b - main - Makefile.inc1: Fix INSTALLEXTRAKERNELS for one-kernel case 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/main X-Git-Reftype: branch X-Git-Commit: 0b298e314a8b47c1f2bf8a9ff86c050accbd744d Auto-Submitted: auto-generated Date: Tue, 06 Jan 2026 01:49:40 +0000 Message-Id: <695c6a34.40744.6f1ce1f9@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=0b298e314a8b47c1f2bf8a9ff86c050accbd744d commit 0b298e314a8b47c1f2bf8a9ff86c050accbd744d Author: Lexi Winter AuthorDate: 2026-01-06 01:48:04 +0000 Commit: Lexi Winter CommitDate: 2026-01-06 01:48:04 +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 --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b8f59686784d..5005e4e0acc7 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1844,10 +1844,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