From nobody Thu Jan 13 14:16:56 2022 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 023A019645A3; Thu, 13 Jan 2022 14:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JZRMD3j59z4YCn; Thu, 13 Jan 2022 14:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642083416; 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=0FcuacbXsMvjOmPo0S/OkjXpk5Arr/cBC6lsAOZrXtI=; b=v+eJJFpL4jsB29NcJyXAsKy1FhoneV+tnyojIzYzVjwCAt6DmKT/qju9/YPxc9P5SLeehD y7nqkpGTI79Km5oeyGCa4uOglrGC4WW4hzhN2xTlVWNBCmJmnAbgQKaNbWJpafC9ifTVqO Xh0RPlGc8g/0fx/0YhejMUaOSgkNEI9poAOmFJHQQRW0Lu7Olgx+dU+52TNntRgmGj73Mv Qs5GoMNBqXU6UA9N7Y2odcrXtOC/LrfAgRz0l5W1GihgjkKxwQszrnM6MDt/C+eHh6JBc9 ozk6FzVyylV3hpGpgmqZgM0CXNuC/eA/4u5RbtNXn2ldNT/LfbGUuMN5Cc8mdg== 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 5AE8821DBA; Thu, 13 Jan 2022 14:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20DEGuPO056092; Thu, 13 Jan 2022 14:16:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20DEGuue056091; Thu, 13 Jan 2022 14:16:56 GMT (envelope-from git) Date: Thu, 13 Jan 2022 14:16:56 GMT Message-Id: <202201131416.20DEGuue056091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 8c0c5bdf9d5e - main - Introduce MODULES_EXCLUDE 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c0c5bdf9d5ebe08bb239633c16a567eb8a9f898 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642083416; 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=0FcuacbXsMvjOmPo0S/OkjXpk5Arr/cBC6lsAOZrXtI=; b=bMKRMLT07kWlrsTcBmP/V+v7ZjwxBMMY6FkFN4/cGxKxzkmGp2F5xJHMGV6trVT7Fwy9aG cbhyaceWkKWdYIAgYkbTVNuxiXPwN9fhr3MLDPsZGExFO5cnCMI/AWDoQq0eOEqPvYT8jp jhOBr3hzFfrWIzwEkEiX0w3D73ENwuSF5ZFQpnGusG44akXuSBstxz/wl009pdlsFCdi/n YSeUc6MMFcRs2SyQGqVOJ8ihIRuyNStp3esIH9U+7JBSOH1d2358Vy5tWkbodo1MH3hBjJ JjBJOpHdQiGCkXoxSb+xzc4Cz91PSEvHdjVfYePYk//p0mffkuX2aK2+mlFErQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642083416; a=rsa-sha256; cv=none; b=qubZzsx8hheRzoS/+1q+XQFM0wGlvTQR5W6VAJohJAoAYMCJCnl8D0GJ1XyvZndo0MqjKk jGKPzuNEcWsKwRsi28gYfkmgPQSJmGi4M+KSnz/W03nex3/2wDCC7WjyG7TO21ut8qmzHK PRsbC1NwEsgjvdkSVD0YEMRIl8B3UAQ8jPmPy+VK5xOBQDSlzfq3p7lARXqr/YJaKznRqC /iTNnJlXdDFcBgNLyuZTEkFPK6tsD3n6NgdqafcfxotC3knlNdR0oVMZIizt1Ut/8dJx2n Cu0wtjiiJ4ct1HzKgkWNTE1Lml1SZHCc9pawfU7gRSoj+lZQvPrIz6k61pqHHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8c0c5bdf9d5ebe08bb239633c16a567eb8a9f898 commit 8c0c5bdf9d5ebe08bb239633c16a567eb8a9f898 Author: Emmanuel Vadot AuthorDate: 2021-11-06 09:11:58 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-13 14:16:34 +0000 Introduce MODULES_EXCLUDE It's sometimes easier to exclude some modules rather than listing all possibly needed ones with MODULES_OVERRIDE. So for this add MODULES_EXCLUDE which do exactly as one would guess, excludes some modules from the build/install. For example if one wants to exclude all modules which are only present in the GENERIC config on amd64 : export MODULES_EXCLUDE=$(grep -E '^device' sys/amd64/conf/GENERIC | awk '{print $2}' | tr '\n' ' ') MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33443 --- share/man/man5/make.conf.5 | 5 ++++- share/mk/bsd.kmod.mk | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index b3623b29a950..fd0837ecc121 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 14, 2021 +.Dd January 13, 2021 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -272,6 +272,9 @@ It defaults to .It Va MODULES_OVERRIDE .Pq Vt str Set to a list of modules to build instead of all of them. +.It Va MODULES_EXCLUDE +.Pq Vt str +Set to a list of modules to exclude from the build. .It Va NO_KERNELCLEAN .Pq Vt bool Set this to skip running diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk index 683967749e75..2287f447c704 100644 --- a/share/mk/bsd.kmod.mk +++ b/share/mk/bsd.kmod.mk @@ -1,4 +1,10 @@ # $FreeBSD$ +.if defined(MODULES_EXCLUDE) && defined(KMOD) && ${MODULES_EXCLUDE:M${KMOD}} +all: +install: +cleandir: +.else .include .include "${SYSDIR}/conf/kmod.mk" +.endif