From nobody Thu Aug 14 16:03:18 2025 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 4c2qlq2n8Rz64g5x; 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 4c2qlp6xszz3Jxp; 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=1755187399; 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=i1zYbQZF6srG3FDc5/yTUy6beE93GOY4oSl4PxVDTAw=; b=D9aDjXKsNf798bKr9AWT7wECk/E1FCArGZ9HGOl1YAK/JFbPms8mMXijmdbCG4nZK4y1Mz HpivlgOPfyBaMQzxrVUv4Jr9LUp9X/pwVZ1IZnA4ojPyciZ+p3BDtBU3jGzVB78+uutUwz /wnxxEY/HxSeqbttjbrGkHCWxlpUoi8/fvdaItVJhX76rV6JbFz9tD5qC5No+dO1tHv5sL lU5ftAJPZKsHMhAcBC5/ugS9HvFSpVXc/xtQMni65WMdWcVhIdSWyVMzhNN+tBNy2DBhOy TVPBvC61jKYmn0nRN7/1FJ6B+y9J8kNTCc2mEI/uHnJWbEPc9XPDiUtUGe5x/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755187399; 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=i1zYbQZF6srG3FDc5/yTUy6beE93GOY4oSl4PxVDTAw=; b=oymgc1278yogOdlGDaHd0PJXzcH4DMC8nLgiHHExE/2iiZEc+Cal5/zijKscPsAkYDyD6H YUoWALASnCBVnuWO8caefldl0pvSWimKXSv06WPMcVbcX4YOVsS9Z2bp0xebdijDUmO3Bn UyAGqvK1dcH/NQZR8pL9bnI8OmthteFTlgxRUtNuAc9RNCw+7KddgtmGNxK+o8eN1Dm2Dm EfDIbtQqDza7jqq1q9JH1oN5+pO46b7AblCPnrleqiSmMVibvKhPUgJ9TlbQqhqSAM2q+6 7Ke9Q740QQCqgFVaZIlLdCy6T+X+NH3r8DfMYl8GXokvNZnxW1jjjvLm+pvXFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755187399; a=rsa-sha256; cv=none; b=mJ3acY0hAnSGt3cbOFiRF5ZO2GoIeC34klrFS79APQ3ZnugppQPZd0hIcHbMBPM6awefFK L3wHZu2yRpvWAd2drr0e1hW4e+0VdBHq54IzlDlX2Ebw+nFUIFrMnA9vxR9Orb4PsaZcZD 5FfFS7WI9tZA5SY0oVm1suEj9GFpIQx/lrhFpwv8fXGt1e9eYIXIWyWb43Ez3Uvqx9y0T6 2nWjcYvfNz3P12eZ+0tYzSC6lcyhMbQ43o43pHZm9nNLnGrA214pKAaBlLkeCDBAxmzDmD +H5wa/BTfzLW3AahWveUK+ykLu4MLCgdCDNCSo9J48LI9w21FsookZ9/i2uXnA== 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 4c2qlp62nJz10F9; 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 57EG3ISs080237; 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 57EG3ICR080229; Thu, 14 Aug 2025 16:03:18 GMT (envelope-from git) Date: Thu, 14 Aug 2025 16:03:18 GMT Message-Id: <202508141603.57EG3ICR080229@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: 65cbf5862ead - stable/13 - kern.post.mk: Support flavors in PORTS_MODULES 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 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/13 X-Git-Reftype: branch X-Git-Commit: 65cbf5862eaddd0dfccc6c43e9054252d0ca788b Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=65cbf5862eaddd0dfccc6c43e9054252d0ca788b commit 65cbf5862eaddd0dfccc6c43e9054252d0ca788b Author: Dag-Erling Smørgrav AuthorDate: 2025-08-11 13:54:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-14 14:00:06 +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 57280f967a38..2b36d68e6397 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 30, 2024 +.Dd August 8, 2025 .Dt BUILD 7 .Os .Sh NAME @@ -619,8 +619,12 @@ as part of the and .Cm installkernel process. -.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 6664afc2bf16..5301a711bcb5 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -132,7 +132,10 @@ PORTSMODULESENV=\ all: .for __i in ${PORTS_MODULES} @${ECHO} "===> Ports module ${__i} (all)" - cd $${PORTSDIR:-/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 @@ -140,7 +143,10 @@ ${__target}: ports-${__target} ports-${__target}: .for __i in ${PORTS_MODULES} @${ECHO} "===> Ports module ${__i} (${__target})" - cd $${PORTSDIR:-/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