From nobody Thu Aug 14 16:03:18 2025 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 4c2qlq2mrpz64fyd; Thu, 14 Aug 2025 16:03:19 +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 4c2qlp6d6mz3KJH; Thu, 14 Aug 2025 16:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755187398; 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=t+dGOm3LZo2hRm3zfDKdjaIKvE8psnytTIETtyD+DhU=; b=uGzxso0TCtjekHn+EcUjrWVEZoP6Ik78m/FuJh7dJ+yS4QXs9pSPYNdrM1EPC6Ct+dBZbG bWb3OXteEgfh15ei4wIV2Z5bV9oOy/8lOEbIxyivzVl8LD1lx6wLpUfMqM6MweH1sS1JUi DvZsucbCwTSwBY/ZToV4l0m3CAjMqzn9pZak44Hte764GcT9qdgnujpZ5OoLT/eWfRMZlk fzfrMYgIqLAYSVcU77+4Od2woZP0wjiR4XvY+AIMZ+7UTUupS8y1uEehQapoHHQ1EHjtte qMif0yrAYYrk7wDvRettG4nRm7dJG3NVfkbv4GzqjFMA7D0xzjpuWRTZtYZc1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755187398; 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=t+dGOm3LZo2hRm3zfDKdjaIKvE8psnytTIETtyD+DhU=; b=XUEo8t87yMhnhFjZAy+NutxyR1Y/GFXeHzHWl2Or5DkBN6kuF2nVlDxlPxDmYK3aPNfPj1 dAk1aMCsgXbD4I7/v1b5ZltRaQx2sSoC7Be1Cm8KNb5J7HrHiG2VtEYUnf6c1Kx5V6A6ET oXRuoFKFydGsQDvGuLzKfgxdJ2U8SbSeHVmn+8XNxMy5fGWinnkUK1pbQsK8QEEaDVSG1E 6WX4YOR0ZMvuGqzgUuM7uoTVWZP1OrKK/AVmydXF5Fc92+jjz/ZOAfW2L7he+XGyEgtuRv KMt3QMlf05n4svDzbMj9oI0wC2me3+/QCd4EtbGJmss1m7utt9rd7aVnSl1twg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755187398; a=rsa-sha256; cv=none; b=SuFtt61TXIKCLa3ef7B8zP0geT7DI9cGZnUTk2+YEjWg3w04oHb5Coxy8FfC+WzNn/YGIB KpDiaVCzC4SC4iIkSd3LrMBlea50761AxnhaeytFAmDRrcmMxC/ZygiMJavjBtvAYYzJoR /EuicQiMlaHqCGrn67l0d9gcCfLVPhnV/XVkLsZqlN1ZSP8kFRiZHNaJmbv2zVR+Dw0LEp QLOLLXGQv0y8ucmSPEUyjZaFKnWpStV9urduGwySxiYukGzHn+mV50hUwunSxyrh3ZtS7E zqVQ3ElWjRmFvCfrUXEmrnJ3WH9VUNm1jSg8bGWykjzvYCdxQDuAfUdW7E49zw== 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 4c2qlp5lgcz10cY; Thu, 14 Aug 2025 16:03:18 +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 57EG3IKq080238; Thu, 14 Aug 2025 16:03:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57EG3IS5080235; Thu, 14 Aug 2025 16:03:18 GMT (envelope-from git) Date: Thu, 14 Aug 2025 16:03:18 GMT Message-Id: <202508141603.57EG3IS5080235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 64de28a52827 - stable/14 - kern.post.mk: Support flavors in PORTS_MODULES 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 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 64de28a52827f0ec919e470ffa6f67963c877b28 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=64de28a52827f0ec919e470ffa6f67963c877b28 commit 64de28a52827f0ec919e470ffa6f67963c877b28 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-11 13:54:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-14 14:00:09 +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 (cherry picked from commit 988426e815c12a899c8c6853090b8c8fca7ed5cd) --- 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 f180dc501f41..82d3e3913bce 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 January 10, 2025 +.Dd August 8, 2025 .Dt BUILD 7 .Os .Sh NAME @@ -658,8 +658,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 d74087fc7c3d..320410a337c9 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -128,7 +128,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 @@ -136,7 +139,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