Index: sys/conf/kern.opts.mk =================================================================== --- sys/conf/kern.opts.mk +++ sys/conf/kern.opts.mk @@ -15,10 +15,29 @@ # They have to be listed here so we can build modules outside of the # src tree. +.include + __DEFAULT_YES_OPTIONS = \ ARM_EABI \ + BLUETOOTH \ + CDDL \ + CRYPT \ FORMAT_EXTENSIONS \ - KERNEL_SYMBOLS + INET \ + INET6 \ + IPFILTER \ + KERNEL_SYMBOLS \ + NAND \ + NETGRAPH \ + PF \ + SOURCELESS_HOST \ + SOURCELESS_UCODE \ + USB_GADGET_EXAMPLES \ + ZFS + +__DEFAULT_NO_OPTIONS = \ + EISA \ + OFED # expanded inline from bsd.mkopt.mk: @@ -32,3 +51,28 @@ .endif .endfor .undef __DEFAULT_YES_OPTIONS + +.for var in ${__DEFAULT_NO_OPTIONS} +.if !defined(MK_${var}) +.if defined(WITH_${var}) && !defined(WITHOUT_${var}) # WITHOUT always wins +MK_${var}:= yes +.else +MK_${var}:= no +.endif +.endif +.endfor +.undef __DEFAULT_NO_OPTIONS + +# +# MK_*_SUPPORT options which default to "yes" unless their corresponding +# MK_* variable is set to "no". +# +.for var in \ + INET \ + INET6 +.if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no" +MK_${var}_SUPPORT:= no +.else +MK_${var}_SUPPORT:= yes +.endif +.endfor Index: sys/modules/Makefile =================================================================== --- sys/modules/Makefile +++ sys/modules/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../conf/kern.opts.mk" SUBDIR_PARALLEL= Index: sys/modules/acl_nfs4/Makefile =================================================================== --- sys/modules/acl_nfs4/Makefile +++ sys/modules/acl_nfs4/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../kern KMOD= acl_nfs4 SRCS= vnode_if.h subr_acl_nfs4.c Index: sys/modules/acl_posix1e/Makefile =================================================================== --- sys/modules/acl_posix1e/Makefile +++ sys/modules/acl_posix1e/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../kern KMOD= acl_posix1e SRCS= vnode_if.h subr_acl_posix1e.c Index: sys/modules/aic7xxx/ahc/Makefile =================================================================== --- sys/modules/aic7xxx/ahc/Makefile +++ sys/modules/aic7xxx/ahc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../../dev/aic7xxx KMOD= ahc Index: sys/modules/alq/Makefile =================================================================== --- sys/modules/alq/Makefile +++ sys/modules/alq/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../kern KMOD= alq SRCS= opt_mac.h vnode_if.h kern_alq.c Index: sys/modules/carp/Makefile =================================================================== --- sys/modules/carp/Makefile +++ sys/modules/carp/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../netinet .PATH: ${.CURDIR}/../../crypto -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" KMOD= carp SRCS= ip_carp.c sha1.c Index: sys/modules/cc/cc_cdg/Makefile =================================================================== --- sys/modules/cc/cc_cdg/Makefile +++ sys/modules/cc/cc_cdg/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../../netinet/cc KMOD= cc_cdg SRCS= cc_cdg.c Index: sys/modules/cc/cc_chd/Makefile =================================================================== --- sys/modules/cc/cc_chd/Makefile +++ sys/modules/cc/cc_chd/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../../netinet/cc KMOD= cc_chd SRCS= cc_chd.c Index: sys/modules/cc/cc_cubic/Makefile =================================================================== --- sys/modules/cc/cc_cubic/Makefile +++ sys/modules/cc/cc_cubic/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../../netinet/cc KMOD= cc_cubic SRCS= cc_cubic.c Index: sys/modules/cc/cc_hd/Makefile =================================================================== --- sys/modules/cc/cc_hd/Makefile +++ sys/modules/cc/cc_hd/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../../netinet/cc KMOD= cc_hd SRCS= cc_hd.c Index: sys/modules/cc/cc_htcp/Makefile =================================================================== --- sys/modules/cc/cc_htcp/Makefile +++ sys/modules/cc/cc_htcp/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../../netinet/cc KMOD= cc_htcp SRCS= cc_htcp.c Index: sys/modules/cc/cc_vegas/Makefile =================================================================== --- sys/modules/cc/cc_vegas/Makefile +++ sys/modules/cc/cc_vegas/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../../netinet/cc KMOD= cc_vegas SRCS= cc_vegas.c Index: sys/modules/cxgb/Makefile =================================================================== --- sys/modules/cxgb/Makefile +++ sys/modules/cxgb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" SUBDIR= cxgb SUBDIR+= cxgb_t3fw Index: sys/modules/cxgb/cxgb/Makefile =================================================================== --- sys/modules/cxgb/cxgb/Makefile +++ sys/modules/cxgb/cxgb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" CXGB = ${.CURDIR}/../../../dev/cxgb .PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys Index: sys/modules/cxgb/iw_cxgb/Makefile =================================================================== --- sys/modules/cxgb/iw_cxgb/Makefile +++ sys/modules/cxgb/iw_cxgb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" CXGB = ${.CURDIR}/../../../dev/cxgb .PATH: ${CXGB}/ulp/iw_cxgb Index: sys/modules/cxgb/tom/Makefile =================================================================== --- sys/modules/cxgb/tom/Makefile +++ sys/modules/cxgb/tom/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" CXGB = ${.CURDIR}/../../../dev/cxgb .PATH: ${CXGB}/ulp/tom Index: sys/modules/cxgbe/Makefile =================================================================== --- sys/modules/cxgbe/Makefile +++ sys/modules/cxgbe/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" SUBDIR= if_cxgbe SUBDIR+= t4_firmware Index: sys/modules/cxgbe/if_cxgbe/Makefile =================================================================== --- sys/modules/cxgbe/if_cxgbe/Makefile +++ sys/modules/cxgbe/if_cxgbe/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" CXGBE= ${.CURDIR}/../../../dev/cxgbe .PATH: ${CXGBE} ${CXGBE}/common Index: sys/modules/cxgbe/iw_cxgbe/Makefile =================================================================== --- sys/modules/cxgbe/iw_cxgbe/Makefile +++ sys/modules/cxgbe/iw_cxgbe/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" CXGBE= ${.CURDIR}/../../../dev/cxgbe .PATH: ${CXGBE}/iw_cxgbe Index: sys/modules/cxgbe/tom/Makefile =================================================================== --- sys/modules/cxgbe/tom/Makefile +++ sys/modules/cxgbe/tom/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" CXGBE= ${.CURDIR}/../../../dev/cxgbe .PATH: ${CXGBE}/tom Index: sys/modules/dpt/Makefile =================================================================== --- sys/modules/dpt/Makefile +++ sys/modules/dpt/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../dev/dpt KMOD= dpt Index: sys/modules/drm/Makefile =================================================================== --- sys/modules/drm/Makefile +++ sys/modules/drm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" # Modules that include binary-only blobs of microcode should be selectable by # MK_SOURCELESS_UCODE option (see below). Index: sys/modules/drm2/Makefile =================================================================== --- sys/modules/drm2/Makefile +++ sys/modules/drm2/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ -.include -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .if ${MACHINE_CPUARCH} == "amd64" _radeonkms= radeonkms Index: sys/modules/drm2/radeonkms/Makefile =================================================================== --- sys/modules/drm2/radeonkms/Makefile +++ sys/modules/drm2/radeonkms/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../../dev/drm2/radeon KMOD = radeonkms Index: sys/modules/dtrace/Makefile =================================================================== --- sys/modules/dtrace/Makefile +++ sys/modules/dtrace/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -.include .include "Makefile.inc" SUBDIR= dtmalloc \ Index: sys/modules/dummynet/Makefile =================================================================== --- sys/modules/dummynet/Makefile +++ sys/modules/dummynet/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../netpfil/ipfw KMOD= dummynet Index: sys/modules/em/Makefile =================================================================== --- sys/modules/em/Makefile +++ sys/modules/em/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../dev/e1000 KMOD = if_em Index: sys/modules/ep/Makefile =================================================================== --- sys/modules/ep/Makefile +++ sys/modules/ep/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../dev/ep Index: sys/modules/i40e/Makefile =================================================================== --- sys/modules/i40e/Makefile +++ sys/modules/i40e/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../dev/i40e Index: sys/modules/ibcore/Makefile =================================================================== --- sys/modules/ibcore/Makefile +++ sys/modules/ibcore/Makefile @@ -2,8 +2,6 @@ .PATH: ${.CURDIR}/../../ofed/drivers/infiniband/core .PATH: ${.CURDIR}/../../ofed/include/linux -.include - KMOD = ibcore SRCS = addr.c cm_msgs.h iwcm.c mad_rmpp.h sa_query.c ucma.c uverbs_cmd.c SRCS+= agent.c local_sa.c iwcm.h multicast.c smi.c ud_header.c uverbs_main.c Index: sys/modules/if_bridge/Makefile =================================================================== --- sys/modules/if_bridge/Makefile +++ sys/modules/if_bridge/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../net KMOD= if_bridge @@ -9,7 +9,7 @@ .if !defined(KERNBUILDDIR) opt_inet.h: echo "#define INET 1" > ${.TARGET} - + .if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: echo "#define INET6 1" > ${.TARGET} Index: sys/modules/if_gif/Makefile =================================================================== --- sys/modules/if_gif/Makefile +++ sys/modules/if_gif/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 Index: sys/modules/if_lagg/Makefile =================================================================== --- sys/modules/if_lagg/Makefile +++ sys/modules/if_lagg/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../net KMOD= if_lagg Index: sys/modules/igb/Makefile =================================================================== --- sys/modules/igb/Makefile +++ sys/modules/igb/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../dev/e1000 KMOD = if_igb Index: sys/modules/ip6_mroute_mod/Makefile =================================================================== --- sys/modules/ip6_mroute_mod/Makefile +++ sys/modules/ip6_mroute_mod/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../netinet6 KMOD= ip6_mroute Index: sys/modules/ip_mroute_mod/Makefile =================================================================== --- sys/modules/ip_mroute_mod/Makefile +++ sys/modules/ip_mroute_mod/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 KMOD= ip_mroute Index: sys/modules/ipdivert/Makefile =================================================================== --- sys/modules/ipdivert/Makefile +++ sys/modules/ipdivert/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../netinet Index: sys/modules/ipfilter/Makefile =================================================================== --- sys/modules/ipfilter/Makefile +++ sys/modules/ipfilter/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../contrib/ipfilter/netinet Index: sys/modules/ipfw/Makefile =================================================================== --- sys/modules/ipfw/Makefile +++ sys/modules/ipfw/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../netpfil/ipfw Index: sys/modules/ipoib/Makefile =================================================================== --- sys/modules/ipoib/Makefile +++ sys/modules/ipoib/Makefile @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../ofed/drivers/infiniband/ulp/ipoib .PATH: ${.CURDIR}/../../ofed/include/linux -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" KMOD = ipoib SRCS = device_if.h bus_if.h opt_ofed.h vnode_if.h opt_inet.h opt_inet6.h Index: sys/modules/ixgbe/Makefile =================================================================== --- sys/modules/ixgbe/Makefile +++ sys/modules/ixgbe/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../dev/ixgbe Index: sys/modules/khelp/h_ertt/Makefile =================================================================== --- sys/modules/khelp/h_ertt/Makefile +++ sys/modules/khelp/h_ertt/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../../netinet/khelp KMOD= h_ertt SRCS= h_ertt.c Index: sys/modules/mlx4/Makefile =================================================================== --- sys/modules/mlx4/Makefile +++ sys/modules/mlx4/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../ofed/drivers/net/mlx4 -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../ofed/include/linux KMOD = mlx4 Index: sys/modules/mlx4ib/Makefile =================================================================== --- sys/modules/mlx4ib/Makefile +++ sys/modules/mlx4ib/Makefile @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4 .PATH: ${.CURDIR}/../../ofed/include/linux -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" KMOD = mlx4ib SRCS = device_if.h bus_if.h pci_if.h vnode_if.h Index: sys/modules/mlxen/Makefile =================================================================== --- sys/modules/mlxen/Makefile +++ sys/modules/mlxen/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../ofed/drivers/net/mlx4 -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" KMOD = mlxen SRCS = device_if.h bus_if.h pci_if.h vnode_if.h Index: sys/modules/mthca/Makefile =================================================================== --- sys/modules/mthca/Makefile +++ sys/modules/mthca/Makefile @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../ofed/drivers/infiniband/hw/mthca -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" KMOD = mthca SRCS = device_if.h bus_if.h pci_if.h vnode_if.h Index: sys/modules/netgraph/Makefile =================================================================== --- sys/modules/netgraph/Makefile +++ sys/modules/netgraph/Makefile @@ -1,7 +1,7 @@ # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" SUBDIR= async \ atm \ Index: sys/modules/netgraph/ipfw/Makefile =================================================================== --- sys/modules/netgraph/ipfw/Makefile +++ sys/modules/netgraph/ipfw/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" KMOD= ng_ipfw SRCS= ng_ipfw.c opt_inet.h opt_inet6.h Index: sys/modules/netgraph/netflow/Makefile =================================================================== --- sys/modules/netgraph/netflow/Makefile +++ sys/modules/netgraph/netflow/Makefile @@ -3,7 +3,7 @@ # Author: Gleb Smirnoff # -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../../netgraph/netflow Index: sys/modules/pf/Makefile =================================================================== --- sys/modules/pf/Makefile +++ sys/modules/pf/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../netpfil/pf Index: sys/modules/pflog/Makefile =================================================================== --- sys/modules/pflog/Makefile +++ sys/modules/pflog/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../netpfil/pf Index: sys/modules/pfsync/Makefile =================================================================== --- sys/modules/pfsync/Makefile +++ sys/modules/pfsync/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../netpfil/pf Index: sys/modules/siftr/Makefile =================================================================== --- sys/modules/siftr/Makefile +++ sys/modules/siftr/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../netinet KMOD= siftr SRCS= siftr.c Index: sys/modules/sound/driver/Makefile =================================================================== --- sys/modules/sound/driver/Makefile +++ sys/modules/sound/driver/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" # Modules that include binary-only blobs of microcode should be selectable by # MK_SOURCELESS_UCODE option (see below). Index: sys/modules/usb/Makefile =================================================================== --- sys/modules/usb/Makefile +++ sys/modules/usb/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" # # Check for common USB debug flags to pass when building the USB Index: sys/modules/virtio/network/Makefile =================================================================== --- sys/modules/virtio/network/Makefile +++ sys/modules/virtio/network/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../../dev/virtio/network Index: sys/modules/vmware/vmxnet3/Makefile =================================================================== --- sys/modules/vmware/vmxnet3/Makefile +++ sys/modules/vmware/vmxnet3/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # -.include +.include "${.CURDIR}/../../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../../dev/vmware/vmxnet3 Index: sys/modules/vx/Makefile =================================================================== --- sys/modules/vx/Makefile +++ sys/modules/vx/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include "${.CURDIR}/../../conf/kern.opts.mk" .PATH: ${.CURDIR}/../../dev/vx