From nobody Fri Jun 26 16:59:39 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 4gn2300w7vz6jmfH for ; Fri, 26 Jun 2026 16:59: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn22z5Fzsz4DBY for ; Fri, 26 Jun 2026 16:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493179; 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=72KhoGJghD2rq76LH6leUnYVxY16rceFVYq6GcX31pE=; b=bI38MBHpvbGKtT2gzgMGJ6Fle4yzMnfvWvC8jgZwtsk5W57VOd1bWOabhjFLaDoHQgFSFe nixZq9GMek7Tug5YxgtzuC1cABZmIxlpL8GuV1ugUCKuybecEN0W1gzDWsK0YQ+jNg9Bcm OriEDGGQRGBSuUx9jnn1eT6kd7BXuVVdKEWAPYY+2xJLG4uO17QsyJZ3bEqbesdVz2u+f0 UCsayVw2ZZmQJhHJsqg1iwJm4GJsNGYbvCx+i9Qd034AWYPfu8mUyXwG+HAtCp+75PzeU9 idg8ga9Ntae6h+22frJKjB84Vmnc5byBud7YGIBHOY/LkObB5PRGemOBsvSnJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493179; a=rsa-sha256; cv=none; b=Yaary//SL3JVVU0dwHvRorjSPmP3Ce0zg+eivm4iuhRIbWWk5GbUMIuMXIQYvNoTOPRtq8 irscSM1dp+mirCpJV4FGfIOF6w4yq6b2uzxRiAoUhgl0hsdf9E/NPYtIlUe/+FVu4CGa5I VyRikagvv7BVQirYS/zsQtsZFfPB38E5kJOSbx5KCFR+xL0uFhWvWVWfQd1z5+bfswOpCp pqMsVgPp9A68f6+ZXEIQS80/o7ZnDqved3V9GFWj6xGWHzNvOAhRw+lHQVJXG8Ju7uw8/5 +ttQSRUQCV51otoYjJsDG4JiCSkrPrmR4o75xJdMG1gBnIWj7aPYXB1yaLZLrg== 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=1782493179; 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=72KhoGJghD2rq76LH6leUnYVxY16rceFVYq6GcX31pE=; b=V/CUHXlKsJGWau++JYQKU4AtbANCR4+RDOVWlF5bIkWYGiNSAjzIMJuwW1mhTfQkRQIKWM Rn05m+eze+ZhVsh93gmmK/etw1VFq7RLL9X/5gSjS8EMXbL0pVJxeqPEt4RH7+ZnS07Q7M kANoaJYy5fZPxvA68wrUjqP7Q2L36PYytlZP/lwsunLTDrehRVoTQ6cd06vLP98kSZnYoP PjIS3NSqcPIUhj2UCQJG4ueUSxNBcsa8KZqJjEY1LaqQ6aH6uwPSCDdS4ksAjQsJADBUbF 190j51QeMPUdfEwz+LJhCa0LmvOP7qBX9x5VrhlpTQ4DEgXtyu9mTQp0r5CnMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn22z3q36zmNL for ; Fri, 26 Jun 2026 16:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34a8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: c8dfb30bc001 - stable/14 - universe: emit warning instead of error for bad/missing KERNCONF 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 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/14 X-Git-Reftype: branch X-Git-Commit: c8dfb30bc001976b7dfc3a1ee745771e4b75ab67 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:39 +0000 Message-Id: <6a3eaffb.34a8c.4a52b780@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=c8dfb30bc001976b7dfc3a1ee745771e4b75ab67 commit c8dfb30bc001976b7dfc3a1ee745771e4b75ab67 Author: Siva Mahadevan AuthorDate: 2026-05-21 14:08:32 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:55:53 +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 d24e09d907db..4eab18a7dce1 100644 --- a/Makefile +++ b/Makefile @@ -772,12 +772,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