Skip to content

Commit 3faa5bf

Browse files
committed
kern: Don't need bsd.own.mk
Instead, replace it with bsd.init.mk and remove old comments about FreeBSD 10.x compat. We used to need bsd.own.mk, but now can suffice with bsd.init.mk since kern.opts.mk doesn't included that in too many places. Sponsored by: Netflix
1 parent 8e98577 commit 3faa5bf

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

sys/conf/dtb.build.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
2-
.include <bsd.init.mk>
3-
# Grab all the options for a kernel build. For backwards compat, we need to
4-
# do this after bsd.own.mk.
51
.include "kern.opts.mk"
62

73
DTC?= dtc

sys/conf/kern.opts.mk

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# parts to omit (eg CDDL or SOURCELESS_HOST). Some of these will cause
55
# config.mk to define symbols in various opt_*.h files.
66

7+
78
#
89
# Define MK_* variables (which are either "yes" or "no") for users
910
# to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the
@@ -13,17 +14,12 @@
1314
# that haven't been converted over.
1415
#
1516

16-
# Note: bsd.own.mk must be included before the rest of kern.opts.mk to make
17-
# building on 10.x and earlier work. This should be removed when that's no
18-
# longer supported since it confounds the defaults (since it uses the host's
19-
# notion of defaults rather than what's default in current when building
20-
# within sys/modules).
21-
.include <bsd.own.mk>
22-
2317
# These options are used by the kernel build process (kern.mk and kmod.mk)
2418
# They have to be listed here so we can build modules outside of the
2519
# src tree.
2620

21+
.include <bsd.init.mk>
22+
2723
KLDXREF_CMD?= kldxref
2824

2925
__DEFAULT_YES_OPTIONS = \

0 commit comments

Comments
 (0)