From nobody Thu May 21 14:22:57 2026 X-Original-To: dev-commits-src-main@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 4gLrGn5s4Rz6f74b for ; Thu, 21 May 2026 14:22:57 +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 4gLrGn4gMnz3KlF for ; Thu, 21 May 2026 14:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779373377; 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=lBnL30T0DVO1/Fvw9xWegJf/MiArltaFiJrseM3PoJE=; b=HdzJPFHILvk94EC+c22lZJqmlZEJZI4q1olQ69BBu5xvpDZ5QhXEh7Sf95q7wm01xu53l2 wzenFFfJryFA+Jc/mLR9h3wlOQ1+c6dEZRppE/sA+cxbDDcZQut6RmjCmwrvMAGm3n9ID6 WaQN6ZWkl06EILhvgJLtMNk6S97VCsTc76Ksy2Y1XlYWAbgHn3glYtvx9LY0v7VvLfokB6 DKfs3+yuBcZoVxuiwARGyNXcrf44uUd0EU7NpjQEevNK0u7sgA4eDia/0hjbiXWb4bzVBn DN5Ax1jDSrfCDg1eEy3Lf4MAQaNtDMFKh11AxgM/dtz9151sQ+/tcRp8LsmVXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779373377; a=rsa-sha256; cv=none; b=Pf/bTBJweE6Iclbx42ybW2K4pdfPiR9ruutxA9hfrdaoJLB8hH9Gdv0L5ZsTXw+Sfn9itu qlpSvto9OnFbITw6E4zAdYC7Lx0sOZnKMntkxg18eNNUsAxaG57O9jEOAsbNsN21KXcp1j BU+ippQi/FLiEP+SUmiRwhR+Aqkp+Pu4jZ1xn7pp40XIr7DF6WQqPGw9i39XNNmaHBzCvm hY91jeF03pDm4VrUdGoee0ntQ02fBL+69q6csNNsexr1zmA3aJ1EBIOovc03V4faJ91SJ3 UgaY4wdvimwKDn2hsoZEw3IdUoZhdQlJmPzS0QUN09NV6bxKVlN1rKYU6GmesA== 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=1779373377; 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=lBnL30T0DVO1/Fvw9xWegJf/MiArltaFiJrseM3PoJE=; b=xNncGzbwZc5GQ03HTTcbCRzuzJ188YW3exChJONrhEa3puPB3nBtRf/75feDxMrfQtnILE e17oCkeZyZQuTyFPa3IIePWSKo7VH3enYKB4N85J9IDWlaYOwDAmgOERPAPh3FrkmsYAVD wQ+tyahmemnyG7ymQJbvyJakJnWjVM+KfvMBHU4OwCRlnMISlJTZflcpqioFlvkZT+gbIr FGgizXGbBQ1vEs0bKU4VM92FniTMD69zb3pz7rwSRI3PPIGHF1VsmcLF68md7QfkhV5Nox LmUBzjSQTArTl23D9TvwzM+ETPrf2ZrYYgbrb3UPxDT/F/iVzBaQEI/BWsFsmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLrGn40HlzcZn for ; Thu, 21 May 2026 14:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f55a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 21 May 2026 14:22:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: c170a96dbeeb - main - universe: emit warning instead of error for bad/missing KERNCONF List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c170a96dbeeb3b0d36456d21beee6c551957a456 Auto-Submitted: auto-generated Date: Thu, 21 May 2026 14:22:57 +0000 Message-Id: <6a0f1541.3f55a.265c45dd@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=c170a96dbeeb3b0d36456d21beee6c551957a456 commit c170a96dbeeb3b0d36456d21beee6c551957a456 Author: Siva Mahadevan AuthorDate: 2026-05-21 14:08:32 +0000 Commit: Siva Mahadevan CommitDate: 2026-05-21 14:17:03 +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 --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e7a565cff05e..00c454b38147 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