From nobody Mon Aug 11 13:55:10 2025 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 4c0x3L5njWz649Gm; Mon, 11 Aug 2025 13:55:10 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c0x3L4fVRz3TcR; Mon, 11 Aug 2025 13:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754920510; 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=XADaJ+onEA3dFK5jYSHgVl/HjxlqtJH1fWRHaUKq07A=; b=jznGVvbMYX7RkwT1tCmT5eGC8SRqmp8s3t1prihmzsT1odJnz3tUxtHZxsvymBOG8KOTKF cM/VtnZN4LTbwbwSbexSUFsnHBkzEDZfWIvOhCxooBAh69/0PoUMnXS3q8jCucEYTCCkxJ ThSGmovbS5T3VvFFolbMjsMyRfLd5TUOjgQITLN1/zzTpHZWVhSfr0lkKGa6tE2DrIzESi XvnKzAJ/FBEkcVLtZLxtTRP2eY6SGs9r/i6F9jMc2fPXfhaQe97udwgi1KhSd0PPMM57w2 NW9m1upCYvbE6VOj6r+eTNtqsP2FrY4l7DthvGUP9JQF7TjzTfUQ4PO+xtt9HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754920510; 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=XADaJ+onEA3dFK5jYSHgVl/HjxlqtJH1fWRHaUKq07A=; b=K5YhegU4SkkotDxEp4h7hysPXCM2EUH/eTAz0pQX+o2UPxh7FaiCcKE3yNNZWNuyx6toM6 XDuX9kCwWDKOnyjNsaePDfd/ItWOb/lwdzyyA87bLeEFHnxYy1QcYpWTv3m1pVSZofBDV5 FYPVCY/pz/GhhKjV4cRyeA8sQb41ZN6iGwqJ/dds5l+2/BBBFQg9LOPRe+ohuGnXvy9Axj vmwmU8uvd74eZqIocrmijG5oeyB356rcwNppAf6P3Iqk/Om4YG1gjls7cRY8G+gjqRbyHw xzCKjasdK87lh5BkC4xo4MUt+2uUbOqVQWWzCKWt7TvByEqjI4HZn802bQzyxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754920510; a=rsa-sha256; cv=none; b=i5sBYJVtsHFsTsgz0/Gy2+mYrL4GHBzTo1nZr5iouEuCQPkbadjV1lBDPhBg9gE/KhZ/R+ 6dybYWzVGR8NApeTgZhRlN5LL0kufVH1FBLlFfVXxUfEnnuGcuQfnXl+nBpbhk+9U64fLg otSJchrfvwhS+SqJ9vZU13zWqfDbrPPxrAOHbWxf8YeZZKgQXSPhnExY+0kiyKNyohzcey SfMvXJ1FqHGHWaSIKokNRu3JGedcfWGCqxrZgH5V4YgD8VUM6asJi4mb/01PqOlMWTjTG+ O/7ijgHbntb9KHC9ZAu3urW5JHin+fe5Ky2rqMWovlBFTEEMFAOXC+2hghjYSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c0x3L4Bp2zvXl; Mon, 11 Aug 2025 13:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57BDtAki089379; Mon, 11 Aug 2025 13:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57BDtAYi089376; Mon, 11 Aug 2025 13:55:10 GMT (envelope-from git) Date: Mon, 11 Aug 2025 13:55:10 GMT Message-Id: <202508111355.57BDtAYi089376@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 988426e815c1 - main - kern.post.mk: Support flavors in PORTS_MODULES 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 988426e815c12a899c8c6853090b8c8fca7ed5cd Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=988426e815c12a899c8c6853090b8c8fca7ed5cd commit 988426e815c12a899c8c6853090b8c8fca7ed5cd Author: Dag-Erling Smørgrav AuthorDate: 2025-08-11 13:54:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-11 13:54:51 +0000 kern.post.mk: Support flavors in PORTS_MODULES MFC after: 1 week PR: 288596 Reviewed by: pkubaj Differential Revision: https://reviews.freebsd.org/D51833 --- share/man/man7/build.7 | 10 +++++++--- sys/conf/kern.post.mk | 10 ++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 0aae2c42ac04..4022b915c972 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 8, 2025 +.Dd August 8, 2025 .Dt BUILD 7 .Os .Sh NAME @@ -667,8 +667,12 @@ This is currently incompatible with building .Pa src into .Cm packages . -.Bd -literal -offset indent -make PORTS_MODULES=emulators/virtualbox-ose-kmod kernel +Each port must be specified as +.Ar category Ns Li / Ns Ar port Ns Op Li @ Ns Ar flavor , +e.g. +.Bd -literal +PORTS_MODULES=graphics/gpu-firmware-intel-kmod@kabylake +PORTS_MODULES+=graphics/drm-66-kmod .Ed .It Va LOCAL_MODULES A list of external kernel modules that should be built and installed diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 59e51c394a35..0e4ffd92724e 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -124,7 +124,10 @@ PORTSMODULESENV=\ all: .for __i in ${PORTS_MODULES} @${ECHO} "===> Ports module ${__i} (all)" - cd ${PORTSDIR:U/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean build + port=${__i}; flavor=$${port#*@}; port=$${port%@*}; flavor=$${flavor%$${port}}; \ + cd ${PORTSDIR:U/usr/ports}/$${port}; \ + ${PORTSMODULESENV} ${MAKE} -B $${flavor:+FLAVOR=}$${flavor} \ + clean build .endfor .for __target in install reinstall clean @@ -132,7 +135,10 @@ ${__target}: ports-${__target} ports-${__target}: .for __i in ${PORTS_MODULES} @${ECHO} "===> Ports module ${__i} (${__target})" - cd ${PORTSDIR:U/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/(re)?install/deinstall reinstall/} + port=${__i}; flavor=$${port#*@}; port=$${port%@*}; flavor=$${flavor%$${port}}; \ + cd ${PORTSDIR:U/usr/ports}/$${port}; \ + ${PORTSMODULESENV} ${MAKE} -B $${flavor:+FLAVOR=}$${flavor} \ + ${__target:C/(re)?install/deinstall reinstall/} .endfor .endfor .endif