From nobody Thu Jan 13 15:00:25 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 BE4B81955942; Thu, 13 Jan 2022 15:00:25 +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 4JZSKP4y1cz4pnc; Thu, 13 Jan 2022 15:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642086025; 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=8MlQO/K3ve+FhuFj1AFJT2qsshuQzLFRl0m0v50C5DA=; b=J9VsKo4vh9NA5vxc1xqyD2czUTxGdTzXvpqmNezD4ywwPb3W67BWbKorughuwfrvQWnrrb XvKU189fBJGetncPzWJ1vii2N7lXglJQexlCf2bd/fB3JAWanQJd5RQpcNzGFy1+wlHv6p L8Npv7HO9oPCCrU0CdYWfrSg9JsHoVpLKMvnEnL3rtHcSod7c3wER8X12IpIKAjrn+FXQs 1ll9rKyFIyNSnQkQSKfVMb5yOl6ypQgvZ1HalVIWWEcSI5ncugK4GAuy1YEIrWN6OYV1Fr GdxJ7wKkP/vJ/iFGBoj8uSpEVNMBIL7xr6TVRTYY8tKAC9aABu4rjGAiRLr5wA== 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 89D3722574; Thu, 13 Jan 2022 15:00:25 +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 20DF0PFc018179; Thu, 13 Jan 2022 15:00:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20DF0PWd018178; Thu, 13 Jan 2022 15:00:25 GMT (envelope-from git) Date: Thu, 13 Jan 2022 15:00:25 GMT Message-Id: <202201131500.20DF0PWd018178@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: 9b6aa99e1f20 - main - Revert "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: 9b6aa99e1f20577c361cd57e427a5a95013dbac1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642086025; 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=8MlQO/K3ve+FhuFj1AFJT2qsshuQzLFRl0m0v50C5DA=; b=mXBDCWgUNI1moglvSo4EEqAiVqbuDA7bxFq8dSLDVlQ0KBEfFJMJI4OB4d818no2V1GCw6 TwHi/919Rxd0nFEdqFvJmMPiSnIRnlilRBa4MOFkp/OpBFZDTfDqytY0IX/o4kK7Rd7C3Z oFatF0UpJSJgkbOUoosRc89BKzdcZTmlVXwUQ8cyfUnL01QPSCgtyAvuZrjXitB+guIUre mU8LN3fTpOncXIaX4u3Nfo1gYyERzuf92pqqbjaA0TmxTaYPVbRkd/ZHBLy71auMMQ/h/3 3SoUeIR0CPbjabvEdBz5mq2kIXXvjMw3F77dNNEocpeA1vMk34cvmELfaXDPaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642086025; a=rsa-sha256; cv=none; b=qBsBwXISqfqiK6uGBT9Umoo8Lu/2jbOIJE1WI4z6Ydpkf8f04tkSvL5xTVlkZBl9NM1ya/ G2XFEDFtpvZDG3vj6WgVNScJ8WaiSeUZsZZk2BSPsJwCcdRbLa7RRHqGFVaUTbuHBpDbKT UDPD78mnUbtojqa7cKSuhI2hIQhf5D8aoLxJ+p+BgKVyqxGJnjLjicGZIbuj+HxVum1mhe yFp7hQM3pnt0Cxr+1Bf3dvDzMsJKVW99BaJ94mps6xBmj34fA7+waRpwt0Tno0OO+tR6xR aph+jrZGrjj7izE/YkNAekQi8IzL8NER8O3IeEbx77Xw/TaakEIkHZF7FR5r6Q== 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=9b6aa99e1f20577c361cd57e427a5a95013dbac1 commit 9b6aa99e1f20577c361cd57e427a5a95013dbac1 Author: Emmanuel Vadot AuthorDate: 2022-01-13 14:59:42 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-13 14:59:47 +0000 Revert "Introduce MODULES_EXCLUDE" This is already present as WITHOUT_MODULES This reverts commit 8c0c5bdf9d5ebe08bb239633c16a567eb8a9f898. Reported by: jrtc27 --- share/man/man5/make.conf.5 | 5 +---- share/mk/bsd.kmod.mk | 6 ------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index fd0837ecc121..b3623b29a950 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 13, 2021 +.Dd June 14, 2021 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -272,9 +272,6 @@ 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 2287f447c704..683967749e75 100644 --- a/share/mk/bsd.kmod.mk +++ b/share/mk/bsd.kmod.mk @@ -1,10 +1,4 @@ # $FreeBSD$ -.if defined(MODULES_EXCLUDE) && defined(KMOD) && ${MODULES_EXCLUDE:M${KMOD}} -all: -install: -cleandir: -.else .include .include "${SYSDIR}/conf/kmod.mk" -.endif