From owner-svn-src-stable@freebsd.org Tue Sep 8 16:43:33 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 759673CF2E2; Tue, 8 Sep 2020 16:43:33 +0000 (UTC) (envelope-from jhb@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bm9vT2VWJz414d; Tue, 8 Sep 2020 16:43:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 392521385C; Tue, 8 Sep 2020 16:43:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 088GhXeA012084; Tue, 8 Sep 2020 16:43:33 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 088GhWEV012082; Tue, 8 Sep 2020 16:43:32 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009081643.088GhWEV012082@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 8 Sep 2020 16:43:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365465 - in stable: 11/share/mk 11/sys/conf 12/share/mk 12/sys/conf X-SVN-Group: stable-12 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in stable: 11/share/mk 11/sys/conf 12/share/mk 12/sys/conf X-SVN-Commit-Revision: 365465 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Sep 2020 16:43:33 -0000 Author: jhb Date: Tue Sep 8 16:43:32 2020 New Revision: 365465 URL: https://svnweb.freebsd.org/changeset/base/365465 Log: MFC 354970: Add a kmod.opts.mk. This Makefile sets KERN_OPTS. This permits kernel module Makefiles to use KERN_OPTS to control the value of variables such as SRCS that are used by bsd.kmod.mk for KERN_OPTS values that honor WITH/WITHOUT options for standalone builds. Added: stable/12/share/mk/kmod.opts.mk - copied unchanged from r354970, head/share/mk/kmod.opts.mk stable/12/sys/conf/kmod.opts.mk - copied unchanged from r354970, head/sys/conf/kmod.opts.mk Modified: stable/12/sys/conf/kmod.mk Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Added: stable/11/share/mk/kmod.opts.mk - copied unchanged from r354970, head/share/mk/kmod.opts.mk stable/11/sys/conf/kmod.opts.mk - copied unchanged from r354970, head/sys/conf/kmod.opts.mk Modified: stable/11/sys/conf/kmod.mk Directory Properties: stable/11/ (props changed) Copied: stable/12/share/mk/kmod.opts.mk (from r354970, head/share/mk/kmod.opts.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/share/mk/kmod.opts.mk Tue Sep 8 16:43:32 2020 (r365465, copy of r354970, head/share/mk/kmod.opts.mk) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +.include +.include "${SYSDIR}/conf/kmod.opts.mk" Modified: stable/12/sys/conf/kmod.mk ============================================================================== --- stable/12/sys/conf/kmod.mk Tue Sep 8 16:07:47 2020 (r365464) +++ stable/12/sys/conf/kmod.mk Tue Sep 8 16:43:32 2020 (r365465) @@ -73,12 +73,7 @@ KMODUNLOAD?= /sbin/kldunload KMODISLOADED?= /sbin/kldstat -q -n OBJCOPY?= objcopy -.include -# Grab all the options for a kernel build. For backwards compat, we need to -# do this after bsd.own.mk. -.include "kern.opts.mk" -.include -.include "config.mk" +.include "kmod.opts.mk" # Search for kernel source tree in standard places. .if empty(KERNBUILDDIR) Copied: stable/12/sys/conf/kmod.opts.mk (from r354970, head/sys/conf/kmod.opts.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/sys/conf/kmod.opts.mk Tue Sep 8 16:43:32 2020 (r365465, copy of r354970, head/sys/conf/kmod.opts.mk) @@ -0,0 +1,16 @@ +# $FreeBSD$ +# +# Handle options (KERN_OPTS) for kernel module options. This can be included earlier in a kmod Makefile +# to allow KERN_OPTS to control SRCS, etc. + +.if !target(____) +____: + +.include +# Grab all the options for a kernel build. For backwards compat, we need to +# do this after bsd.own.mk. +.include "kern.opts.mk" +.include +.include "config.mk" + +.endif # !target(____)