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/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)
Changes in other areas also in this revision:
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)
Copied: stable/11/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/11/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 <bsd.sysdir.mk>
+.include "${SYSDIR}/conf/kmod.opts.mk"
Modified: stable/11/sys/conf/kmod.mk
==============================================================================
--- stable/11/sys/conf/kmod.mk Tue Sep 8 16:07:47 2020 (r365464)
+++ stable/11/sys/conf/kmod.mk Tue Sep 8 16:43:32 2020 (r365465)
@@ -69,12 +69,7 @@ KMODUNLOAD?= /sbin/kldunload
KMODISLOADED?= /sbin/kldstat -q -n
OBJCOPY?= objcopy
-.include <bsd.init.mk>
-# 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 <bsd.compiler.mk>
-.include "config.mk"
+.include "kmod.opts.mk"
# Search for kernel source tree in standard places.
.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys
Copied: stable/11/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/11/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(__<kmod.opts.mk>__)
+__<kmod.opts.mk>__:
+
+.include <bsd.init.mk>
+# 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 <bsd.compiler.mk>
+.include "config.mk"
+
+.endif # !target(__<kmod.opts.mk>__)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
