From nobody Sat Oct 29 16:33:58 2022 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 4N04jy6Bqsz4gFtP; Sat, 29 Oct 2022 16:33:58 +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 4N04jy5Y6nz40tQ; Sat, 29 Oct 2022 16:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667061238; 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=LvEVpeDHDEIN+DuQnugKNgnILS6M9eIwbtdhtWSGb/Y=; b=at0s8Mz1DhmTedMwxo69taBglGhDNjiimTXjUgppb9Xp34bhz1NSoGGP6uWWwePcstK8Xy vTbqd4wCPLiVqCzlKuP6AxCc2MNUg4M5nYE8KMcSZClRmHDoUtNp8BEUbYAcjNe89cI/HG 6NOm9XCutIyDwXC026w5XscF8/SxVm/hWhpO1vzT2XQI8ayYLsZH7vBC6cOm3Jzx/yTevd IfGGsLloTtUJ0vH6az+708U6U1j+R6etotLNPI7huSpeqGiDqEAY+Tw/Ngx3D6XHKAVrZ9 JdhH5gykPlc6hLY/02I089J6T8InLSVSDLhD2GmfxEtb9bSIvO/3UUZvq8OT5Q== 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 4N04jy4cMvzPKs; Sat, 29 Oct 2022 16:33:58 +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 29TGXwFP076673; Sat, 29 Oct 2022 16:33:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29TGXwma076672; Sat, 29 Oct 2022 16:33:58 GMT (envelope-from git) Date: Sat, 29 Oct 2022 16:33:58 GMT Message-Id: <202210291633.29TGXwma076672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f7026fbbb2bd - main - sys/modules: MODULES_OVERRIDE takes precedence over EXTRA_MODULES and WITHOUT_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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7026fbbb2bd72176d73921dd2dd5e4b263d5103 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667061238; 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=LvEVpeDHDEIN+DuQnugKNgnILS6M9eIwbtdhtWSGb/Y=; b=kjK0aY/o8iubJu/c8Bqg64mohseibOtpmzClpllYeJWuDwcnO9yq3aY2pv7YuGhqm1/sea cD3FOugM1JXl/Kyp/0yUdvqvxzMW3QbjidBlTJ0p5bGRyZi5ldGj6o05D288eHsnhP14L0 AjmZ5NbqTw+dkGA3ZfRxI7BjsvmuCL3oSnkK+lMONR3tyMeQdzj3KRC1JRvRh2gvmvIxvA A+MvI+8jDCBf8SuB8ocfTh5me2autn0eD0YxGiIRT0FlXkrLRIcRGMaMWReyZmH+8w/CII /lRMxfln4SxZNJwoXEpGQZGCaqOqiTxw15WMx2H5mxwP3OdEXFDSH7OtCT8vyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667061238; a=rsa-sha256; cv=none; b=Mx/idikz/j6gBvy39HSCxddrgSsVjzWMIBU2/ho/FGmv5lpXgxoA7DHuUph0lA5neXocgV s+RvleWx+APkWfTMVzh7rJ/FI0ov66niQcroW5r7Kj/Dxrn9lbULOjL9KDzv5JranedGFQ KsZUKEsKC/DEayM5e5l3os1iDw0mu2jmbKsgRS6svAqkyNhtsHsgkP+VD7TI9y/4p3fu/W bzVzM/aRJbYBCQnxeWdnbX/ewJW7qstp3BLlA5RJGz7+6spDEAWTbx2YoGj5JsthyhP2xZ kRAJCoxu0SYwnazv7fCsjcglNadcj5GssULyeuujpJXqHZu4Wj5VgTOtQ702LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f7026fbbb2bd72176d73921dd2dd5e4b263d5103 commit f7026fbbb2bd72176d73921dd2dd5e4b263d5103 Author: Warner Losh AuthorDate: 2022-10-29 14:34:16 +0000 Commit: Warner Losh CommitDate: 2022-10-29 16:17:40 +0000 sys/modules: MODULES_OVERRIDE takes precedence over EXTRA_MODULES and WITHOUT_MODULES MODULES_OVERRIDE has traditionally taken precedence over EXTRA_MODULES and WITHOUT_MODULES as the exact list of modules to build. Over time, things have been added that has broken this. Move the .endif that makes this the case to the right place. The so called 'ALL_MODULES' option is the only thing with higher precedence, but it's not quite all the options anymore (though it is much more of them, and doesn't quite work on !x86). Sponsored by: Netflix --- sys/modules/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 00afbffb1baf..3a009f071cab 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -848,8 +848,6 @@ _nvram= opal_nvram _nvram+= powermac_nvram .endif -.endif - .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" _bcm283x_clkman= bcm283x_clkman _bcm283x_pwm= bcm283x_pwm @@ -867,6 +865,8 @@ SUBDIR+=${MODULES_EXTRA} SUBDIR:= ${SUBDIR:N${reject}} .endfor +.endif # MODULES_OVERRIDE -- Keep last + # Calling kldxref(8) for each module is expensive. .if !defined(NO_XREF) .MAKEFLAGS+= -DNO_XREF