From nobody Mon May 25 23:39:23 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 4gPXQz4HJXz6gKFD for ; Mon, 25 May 2026 23:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gPXQz13tsz3j5R for ; Mon, 25 May 2026 23:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779752363; 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=X/uL2F+RIGCc96O8k9jZrug8ZN/jvjOPyruyt1XnM+o=; b=OLT8WqL4Bjvl9tjfZwKlXGgxbVpYsC7pFB8EuLX838MS5STmqMzR1T+9JEsjnbZMH2rBuB /K4TIMnR8YvNPPsC46dAk6sv7qNx0DvVwieDVPz7z/UbEluaEIXpncYjyciYZpLkVLrfcb /DwVqJWGiYtMBh85mTq0Giz/mI81YzflBk7DPtfFWrd0SzJHAhNjTjljiBOmwvrqaS4o2n g0q8jNcszZqKNnXycOdGzxCbhuSnV7j25ObJBC2gHBIKc20f9cjrrbN/QJzN8+PQX44TLb acfJw2+m89dlMUIozErk8MuFrNAN+5LJIO57xmhYtS5dsRpWxZK7nXBaRMIK0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779752363; a=rsa-sha256; cv=none; b=qBvlGSBD2NR9IxAu+L5BLOK9nEfZP3AGWI8gs7+uhCto1Es3R4bMHwDCB7CFMuXHjgAxJ0 ZnYUh48mlu7NgxqQ19kUM7tqT1Va08mF1CshWyvU4qs/a1lgUJY56M/UGHCCDglyu6RIjb 74C0e/bPfAhAa4FOGzRxvgc9haW0k+rNSHrsyxxXNTFG1x8Epm650cSH/Jl/or4Jrj+sxX Id85CUn47M5xDrrjoc2hjmrsCoBmejC7D/OJCgZi74O29bfSDuGe+5SF8gfOQqIjegaI/j jNwir3EfJokFP5q905b7ZYKOsyQFdVudJ/b3q3DtNQu0+LPCLK6yNpr0NJixvg== 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=1779752363; 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=X/uL2F+RIGCc96O8k9jZrug8ZN/jvjOPyruyt1XnM+o=; b=yI8IUZp+g38xe+MrIbfDY492BC46mPgAlLJF4za9e84QnT53yB78dr1uanJ0heXoph8pOz DJ7HPWETqIjdL1pxV8f/3f9Txn8cX5TRrXYjHB2R9K84wP7hgivHqLSkj7mug7fZ6zXbd2 q0IEL5dV6VgcdWVx46npiFtFODyUM65/0yXRl+93vSwTnNhInHWn/ZlEoeBUKIAVoBV6IS o8rEpHO8yAZTOD9q+wflKLBzzxukrNq7iiAre9qgwKE1n8whSVASFcCj70LM0D7Ape8ukT 8/vSPvYFBgA55arDPZLbx5SK6eMMTfSIazq5ZXGYliMQp+sHqUMeofZA4d5+JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gPXQz0cnJz12h2 for ; Mon, 25 May 2026 23:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 384cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 25 May 2026 23:39:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: f09c84a87dc5 - stable/15 - universe: emit warning instead of error for bad/missing KERNCONF 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f09c84a87dc519ecb69537699686854d6999c45f Auto-Submitted: auto-generated Date: Mon, 25 May 2026 23:39:23 +0000 Message-Id: <6a14ddab.384cc.25acd4c4@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=f09c84a87dc519ecb69537699686854d6999c45f commit f09c84a87dc519ecb69537699686854d6999c45f Author: Siva Mahadevan AuthorDate: 2026-05-21 14:08:32 +0000 Commit: Siva Mahadevan CommitDate: 2026-05-25 23:25:57 +0000 universe: emit warning instead of error for bad/missing KERNCONF When doing a large `make universe` build with multiple KERNCONFS, it should not be an error when a particular target has a missing KERNCONF. In this example, ``` $ make universe TARGETS='arm64 riscv' KERNCONFS='QEMU VIRT' ``` Currently, arm64 does not have a QEMU conf, and riscv does not have a VIRT conf. However, this command should still succeed instead of failing with the following message: ``` make[2]: /usr/src/Makefile:767: Target architecture for riscv/conf/VIRT unknown. config(8) likely too old. in .for loop from /usr/src/Makefile:761 with kernel = VIRT in make[2] in directory "/usr/src" make[2]: stopped making "universe_kernels" in /usr/src ``` Since the opposite is true, we should build whatever confs are available from the requested list of KERNCONFS, while making sure to still emit warnings along the way. Reviewed by: imp Approved by: lwhsu (mentor), emaste (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55571 (cherry picked from commit c170a96dbeeb3b0d36456d21beee6c551957a456) --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8e0cae9002e5..be07e994205c 100644 --- a/Makefile +++ b/Makefile @@ -758,12 +758,16 @@ KERNCONFS!= cd ${KERNSRCDIR}/${TARGET}/conf && \ ${_THINNER} universe_kernconfs: universe_kernels_prologue .PHONY .for kernel in ${KERNCONFS} +.if !exists(${KERNSRCDIR}/${TARGET}/conf/${kernel}) +.warning ${TARGET}/conf/${kernel} missing; skipping. +.else TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \ env PATH=${HOST_OBJTOP}/tmp/legacy/bin:${PATH:Q} \ config -m ${KERNSRCDIR}/${TARGET}/conf/${kernel} 2> /dev/null | \ grep -v WARNING: | cut -f 2 .if empty(TARGET_ARCH_${kernel}) -.error Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old. +.error Target architecture for ${TARGET}/conf/${kernel} cannot be determined, kernconf file may be invalid! +.endif .endif universe_kernconfs_${TARGET_ARCH_${kernel}}: universe_kernconf_${TARGET}_${kernel} universe_kernconf_${TARGET}_${kernel}: .MAKE