From owner-svn-src-all@FreeBSD.ORG Mon Aug 4 22:37:12 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 938DDCF1 for ; Mon, 4 Aug 2014 22:37:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D8602639 for ; Mon, 4 Aug 2014 22:37:12 +0000 (UTC) Received: from imp (uid 547) (envelope-from imp@FreeBSD.org) id 529c by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 04 Aug 2014 22:37:02 +0000 From: Warner Losh Date: Mon, 4 Aug 2014 22:37:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269540 - in head/sys: conf modules/an modules/arcnet modules/cam modules/carp modules/cxgb/cxgb modules/cxgb/iw_cxgb modules/cxgb/tom modules/cxgbe/if_cxgbe modules/cxgbe/iw_cxgbe modu... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e00b0f.529c.265fe830@svn.freebsd.org> X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Aug 2014 22:37:12 -0000 Author: imp Date: Mon Aug 4 22:37:02 2014 New Revision: 269540 URL: http://svnweb.freebsd.org/changeset/base/269540 Log: Move most of the 15 variations on generating opt_inet.h and opt_inet6.h into kmod.mk by forcing almost everybody to eat the same dogfood. While at it, consolidate the opt_bpf.h and opt_mroute.h targets here too. Modified: head/sys/conf/kern.opts.mk head/sys/conf/kmod.mk head/sys/modules/an/Makefile head/sys/modules/arcnet/Makefile head/sys/modules/cam/Makefile head/sys/modules/carp/Makefile head/sys/modules/cxgb/cxgb/Makefile head/sys/modules/cxgb/iw_cxgb/Makefile head/sys/modules/cxgb/tom/Makefile head/sys/modules/cxgbe/if_cxgbe/Makefile head/sys/modules/cxgbe/iw_cxgbe/Makefile head/sys/modules/cxgbe/tom/Makefile head/sys/modules/dummynet/Makefile head/sys/modules/em/Makefile head/sys/modules/en/Makefile head/sys/modules/fatm/Makefile head/sys/modules/firewire/fwip/Makefile head/sys/modules/hatm/Makefile head/sys/modules/i40e/Makefile (contents, props changed) head/sys/modules/if_bridge/Makefile head/sys/modules/if_disc/Makefile head/sys/modules/if_faith/Makefile head/sys/modules/if_gif/Makefile head/sys/modules/if_gre/Makefile head/sys/modules/if_lagg/Makefile head/sys/modules/if_stf/Makefile head/sys/modules/if_tap/Makefile head/sys/modules/if_tun/Makefile head/sys/modules/igb/Makefile head/sys/modules/ip6_mroute_mod/Makefile head/sys/modules/ip_mroute_mod/Makefile head/sys/modules/ipdivert/Makefile head/sys/modules/ipfilter/Makefile head/sys/modules/ipfw/Makefile head/sys/modules/ipoib/Makefile head/sys/modules/ixgbe/Makefile head/sys/modules/krpc/Makefile head/sys/modules/linux/Makefile head/sys/modules/lmc/Makefile head/sys/modules/mlx4/Makefile head/sys/modules/mlx4ib/Makefile head/sys/modules/mlxen/Makefile head/sys/modules/mthca/Makefile head/sys/modules/netgraph/gif/Makefile head/sys/modules/netgraph/iface/Makefile head/sys/modules/netgraph/ipfw/Makefile head/sys/modules/netgraph/netflow/Makefile head/sys/modules/nfscl/Makefile head/sys/modules/nfsclient/Makefile head/sys/modules/nfslockd/Makefile head/sys/modules/nfsserver/Makefile head/sys/modules/patm/Makefile head/sys/modules/pf/Makefile head/sys/modules/pflog/Makefile head/sys/modules/pfsync/Makefile head/sys/modules/smbfs/Makefile head/sys/modules/snc/Makefile head/sys/modules/sppp/Makefile head/sys/modules/trm/Makefile head/sys/modules/virtio/network/Makefile head/sys/modules/vmware/vmxnet3/Makefile head/sys/modules/wlan/Makefile head/sys/modules/wlan_acl/Makefile head/sys/modules/wlan_amrr/Makefile head/sys/modules/wlan_ccmp/Makefile head/sys/modules/wlan_rssadapt/Makefile head/sys/modules/wlan_tkip/Makefile head/sys/modules/wlan_wep/Makefile head/sys/modules/wlan_xauth/Makefile Modified: head/sys/conf/kern.opts.mk ============================================================================== --- head/sys/conf/kern.opts.mk Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/conf/kern.opts.mk Mon Aug 4 22:37:02 2014 (r269540) @@ -18,6 +18,8 @@ __DEFAULT_YES_OPTIONS = \ ARM_EABI \ FORMAT_EXTENSIONS \ + INET \ + INET6 \ KERNEL_SYMBOLS # expanded inline from bsd.mkopt.mk: @@ -32,3 +34,17 @@ MK_${var}:= yes .endif .endfor .undef __DEFAULT_YES_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 Modified: head/sys/conf/kmod.mk ============================================================================== --- head/sys/conf/kmod.mk Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/conf/kmod.mk Mon Aug 4 22:37:02 2014 (r269540) @@ -315,6 +315,34 @@ unload: ${KMODUNLOAD} -v ${PROG} .endif +# Generate options files that otherwise would be built +# in substantially similar ways through the tree. Move +# the code here when they all produce identical results +# (or should) +.if !defined(KERNBUILDDIR) +opt_bpf.h: + echo "#define DEV_BPF 1" > ${.TARGET} +.if ${MK_INET_SUPPORT} != "no" +opt_inet.h: + @echo "#define INET 1" > ${.TARGET} + @echo "#define TCP_OFFLOAD 1" >> ${.TARGET} +.endif +.if ${MK_INET6_SUPPORT} != "no" +opt_inet6.h: + @echo "#define INET6 1" > ${.TARGET} +.endif +opt_mrouting.h: + echo "#define MROUTING 1" > ${.TARGET} +opt_natm.h: + echo "#define NATM 1" > ${.TARGET} +opt_scsi.h: + echo "#define SCSI_DELAY 15000" > ${.TARGET} +opt_wlan.h: + echo "#define IEEE80211_DEBUG 1" > ${.TARGET} + echo "#define IEEE80211_AMPDU_AGE 1" >> ${.TARGET} + echo "#define IEEE80211_SUPPORT_MESH 1" >> ${.TARGET} +.endif + .if defined(KERNBUILDDIR) .PATH: ${KERNBUILDDIR} CFLAGS+= -I${KERNBUILDDIR} Modified: head/sys/modules/an/Makefile ============================================================================== --- head/sys/modules/an/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/an/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -7,9 +7,4 @@ SRCS= if_an.c if_an_pccard.c if_an_pci.c SRCS+= opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h SRCS+= pccarddevs.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/arcnet/Makefile ============================================================================== --- head/sys/modules/arcnet/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/arcnet/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -16,12 +16,4 @@ EXPORT_SYMS= arc_frag_init \ arc_output \ arc_storelladdr -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/cam/Makefile ============================================================================== --- head/sys/modules/cam/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/cam/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -43,9 +43,4 @@ SRCS+= ata_pmp.c EXPORT_SYMS= YES # XXX evaluate -.if !defined(KERNBUILDDIR) -opt_scsi.h: - echo "#define SCSI_DELAY 15000" > ${.TARGET} -.endif - .include Modified: head/sys/modules/carp/Makefile ============================================================================== --- head/sys/modules/carp/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/carp/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -3,23 +3,9 @@ .PATH: ${.CURDIR}/../../netinet .PATH: ${.CURDIR}/../../crypto -.include - KMOD= carp SRCS= ip_carp.c sha1.c SRCS+= device_if.h bus_if.h vnode_if.h SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/cxgb/cxgb/Makefile ============================================================================== --- head/sys/modules/cxgb/cxgb/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/cxgb/cxgb/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - CXGB = ${.CURDIR}/../../../dev/cxgb .PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys @@ -15,17 +13,4 @@ SRCS+= uipc_mvec.c CFLAGS+= -g -DDEFAULT_JUMBO -I${CXGB} -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} - @echo "#define TCP_OFFLOAD 1" >> ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/cxgb/iw_cxgb/Makefile ============================================================================== --- head/sys/modules/cxgb/iw_cxgb/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/cxgb/iw_cxgb/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - CXGB = ${.CURDIR}/../../../dev/cxgb .PATH: ${CXGB}/ulp/iw_cxgb @@ -13,12 +11,4 @@ SRCS+= bus_if.h device_if.h opt_sched.h SRCS+= opt_inet.h opt_ofed.h vnode_if.h CFLAGS+= -I${CXGB} -I${.CURDIR}/../../../ofed/include -DLINUX_TYPES_DEFINED -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - echo "#define TCP_OFFLOAD 1" >> ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/cxgb/tom/Makefile ============================================================================== --- head/sys/modules/cxgb/tom/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/cxgb/tom/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - CXGB = ${.CURDIR}/../../../dev/cxgb .PATH: ${CXGB}/ulp/tom @@ -14,12 +12,4 @@ CFLAGS+= -g -I${CXGB} #CFLAGS+= -DDEBUG_PRINT -DDEBUG -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - echo "#define TCP_OFFLOAD 1" >> ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/cxgbe/if_cxgbe/Makefile ============================================================================== --- head/sys/modules/cxgbe/if_cxgbe/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/cxgbe/if_cxgbe/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -2,8 +2,6 @@ # $FreeBSD$ # -.include - CXGBE= ${.CURDIR}/../../../dev/cxgbe .PATH: ${CXGBE} ${CXGBE}/common @@ -26,17 +24,4 @@ SRCS+= t4_tracer.c CFLAGS+= -I${CXGBE} -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} - @echo "#define TCP_OFFLOAD 1" >> ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/cxgbe/iw_cxgbe/Makefile ============================================================================== --- head/sys/modules/cxgbe/iw_cxgbe/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/cxgbe/iw_cxgbe/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - CXGBE= ${.CURDIR}/../../../dev/cxgbe .PATH: ${CXGBE}/iw_cxgbe @@ -27,17 +25,4 @@ SRCS+= vnode_if.h CFLAGS+= -I${CXGBE} -I${.CURDIR}/../../../ofed/include -DLINUX_TYPES_DEFINED -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} - @echo "#define TCP_OFFLOAD 1" >> ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/cxgbe/tom/Makefile ============================================================================== --- head/sys/modules/cxgbe/tom/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/cxgbe/tom/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -2,8 +2,6 @@ # $FreeBSD$ # -.include - CXGBE= ${.CURDIR}/../../../dev/cxgbe .PATH: ${CXGBE}/tom @@ -22,17 +20,4 @@ SRCS+= t4_tom_l2t.c CFLAGS+= -I${CXGBE} -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} - @echo "#define TCP_OFFLOAD 1" >> ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/dummynet/Makefile ============================================================================== --- head/sys/modules/dummynet/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/dummynet/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../netpfil/ipfw KMOD= dummynet SRCS= ip_dummynet.c @@ -10,11 +8,4 @@ SRCS+= dn_heap.c dn_sched_fifo.c dn_sche SRCS+= dn_sched_prio.c SRCS+= opt_inet6.h -.if !defined(KERNBUILDDIR) -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/em/Makefile ============================================================================== --- head/sys/modules/em/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/em/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../dev/e1000 KMOD = if_em SRCS = device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h @@ -21,16 +19,4 @@ CFLAGS += -I${.CURDIR}/../../dev/e1000 # DEVICE_POLLING for a non-interrupt-driven method #CFLAGS += -DDEVICE_POLLING -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/en/Makefile ============================================================================== --- head/sys/modules/en/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/en/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -8,15 +8,4 @@ SRCS+= opt_inet.h opt_natm.h opt_ddb.h CFLAGS+= -DENABLE_BPF # CFLAGS+= -DINVARIANT_SUPPORT -DINVARIANTS -DEN_DEBUG=0 -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -opt_natm.h: - echo "#define NATM 1" > ${.TARGET} - -# opt_ddb.h: -# echo "#define DDB 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/fatm/Makefile ============================================================================== --- head/sys/modules/fatm/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/fatm/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -9,12 +9,4 @@ SRCS= if_fatm.c device_if.h bus_if.h pci # CFLAGS+= -DFATM_DEBUG=0 -DINVARIANT_SUPPORT -DINVARIANTS -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -opt_natm.h: - echo "#define NATM 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/firewire/fwip/Makefile ============================================================================== --- head/sys/modules/firewire/fwip/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/firewire/fwip/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -11,11 +11,6 @@ SRCS = bus_if.h device_if.h \ firewire.h firewirereg.h \ if_fwsubr.c -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} -.endif - #CFLAGS += -DDEVICE_POLLING .include Modified: head/sys/modules/hatm/Makefile ============================================================================== --- head/sys/modules/hatm/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/hatm/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -11,12 +11,4 @@ SRCS= if_hatm.c if_hatm_intr.c if_hatm_i CFLAGS+= -DENABLE_BPF # CFLAGS+= -DHATM_DEBUG -DINVARIANT_SUPPORT -DINVARIANTS -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -opt_natm.h: - echo "#define NATM 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/i40e/Makefile ============================================================================== --- head/sys/modules/i40e/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/i40e/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,7 +1,5 @@ #$FreeBSD$ -.include - .PATH: ${.CURDIR}/../../dev/i40e KMOD = if_i40e @@ -18,16 +16,4 @@ CFLAGS += -DSMP # Debug messages / sysctls # CFLAGS += -DI40E_DEBUG -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/if_bridge/Makefile ============================================================================== --- head/sys/modules/if_bridge/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/if_bridge/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,19 +1,7 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../net KMOD= if_bridge SRCS= if_bridge.c opt_inet.h opt_inet6.h opt_carp.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/if_disc/Makefile ============================================================================== --- head/sys/modules/if_disc/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/if_disc/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -5,12 +5,4 @@ KMOD= if_disc SRCS= if_disc.c opt_inet.h opt_inet6.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -#opt_inet6.h: -# echo "#define INET6 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/if_faith/Makefile ============================================================================== --- head/sys/modules/if_faith/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/if_faith/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -5,12 +5,4 @@ KMOD= if_faith SRCS= if_faith.c opt_inet.h opt_inet6.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/if_gif/Makefile ============================================================================== --- head/sys/modules/if_gif/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/if_gif/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -7,21 +7,10 @@ KMOD= if_gif SRCS= if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif - -opt_mrouting.h: - echo "#define MROUTING 1" > ${.TARGET} -.else +.if defined(KERNBUILDDIR) OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h -.if empty(OPT_INET6) -MK_INET6_SUPPORT= no +.if !empty(OPT_INET6) +MK_INET6_SUPPORT=no .endif .endif Modified: head/sys/modules/if_gre/Makefile ============================================================================== --- head/sys/modules/if_gre/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/if_gre/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -5,12 +5,4 @@ KMOD= if_gre SRCS= if_gre.c ip_gre.c opt_inet.h opt_inet6.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/if_lagg/Makefile ============================================================================== --- head/sys/modules/if_lagg/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/if_lagg/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,19 +1,7 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../net KMOD= if_lagg SRCS= if_lagg.c ieee8023ad_lacp.c opt_inet.h opt_inet6.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/if_stf/Makefile ============================================================================== --- head/sys/modules/if_stf/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/if_stf/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -5,12 +5,4 @@ KMOD= if_stf SRCS= if_stf.c opt_inet.h opt_inet6.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/if_tap/Makefile ============================================================================== --- head/sys/modules/if_tap/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/if_tap/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -10,9 +10,6 @@ SRCS= if_tap.c opt_compat.h opt_inet.h v .if !defined(KERNBUILDDIR) opt_compat.h: echo "#define COMPAT_FREEBSD6 1" > ${.TARGET} - -opt_inet.h: - echo "#define INET 1" > ${.TARGET} .endif .include Modified: head/sys/modules/if_tun/Makefile ============================================================================== --- head/sys/modules/if_tun/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/if_tun/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -5,12 +5,4 @@ KMOD= if_tun SRCS= if_tun.c opt_inet.h opt_inet6.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/igb/Makefile ============================================================================== --- head/sys/modules/igb/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/igb/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,7 +1,5 @@ #$FreeBSD$ -.include - .PATH: ${.CURDIR}/../../dev/e1000 KMOD = if_igb SRCS = device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h opt_rss.h @@ -23,20 +21,4 @@ CFLAGS += -I${.CURDIR}/../../dev/e1000 - # ALTQ. #CFLAGS += -DIGB_LEGACY_TX -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif - -opt_rss.h: - @echo "" > ${.TARGET} - -.endif - .include Modified: head/sys/modules/ip6_mroute_mod/Makefile ============================================================================== --- head/sys/modules/ip6_mroute_mod/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/ip6_mroute_mod/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -7,11 +7,4 @@ KMOD= ip6_mroute SRCS= ip6_mroute.c SRCS+= opt_inet6.h opt_mrouting.h -.if !defined(KERNBUILDDIR) -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -opt_mrouting.h: - echo "#define MROUTING 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/ip_mroute_mod/Makefile ============================================================================== --- head/sys/modules/ip_mroute_mod/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/ip_mroute_mod/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -7,11 +7,4 @@ KMOD= ip_mroute SRCS= ip_mroute.c SRCS+= opt_inet.h opt_mrouting.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} -opt_mrouting.h: - echo "#define MROUTING 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/ipdivert/Makefile ============================================================================== --- head/sys/modules/ipdivert/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/ipdivert/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,21 +1,8 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../netinet KMOD= ipdivert SRCS= ip_divert.c opt_inet.h opt_inet6.h opt_sctp.h -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - echo "#define INET 1" > ${.TARGET} -.endif -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/ipfilter/Makefile ============================================================================== --- head/sys/modules/ipfilter/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/ipfilter/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../contrib/ipfilter/netinet KMOD= ipl @@ -11,15 +9,6 @@ SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_s ip_nat6.c ip_rules.c ip_scan.c ip_dstlist.c radix_ipf.c SRCS+= opt_bpf.h opt_inet6.h -.if !defined(KERNBUILDDIR) -opt_bpf.h: - echo "#define DEV_BPF 1" > ${.TARGET} - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif -.endif CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP # Modified: head/sys/modules/ipfw/Makefile ============================================================================== --- head/sys/modules/ipfw/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/ipfw/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,7 +1,5 @@ # $FreeBSD$ -.include - .PATH: ${.CURDIR}/../../netpfil/ipfw KMOD= ipfw @@ -20,15 +18,4 @@ CFLAGS+= -DIPFIREWALL #CFLAGS+= -DIPFIREWALL_DEFAULT_TO_ACCEPT # -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - echo "#define INET 1" > ${.TARGET} -.endif -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/ipoib/Makefile ============================================================================== --- head/sys/modules/ipoib/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/ipoib/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -2,8 +2,6 @@ .PATH: ${.CURDIR}/../../ofed/drivers/infiniband/ulp/ipoib .PATH: ${.CURDIR}/../../ofed/include/linux -.include - KMOD = ipoib SRCS = device_if.h bus_if.h opt_ofed.h vnode_if.h opt_inet.h opt_inet6.h SRCS += ipoib_cm.c ipoib_ib.c ipoib_main.c ipoib_multicast.c ipoib_verbs.c ipoib.h @@ -14,18 +12,6 @@ CFLAGS+= -I${.CURDIR}/../ibcore CFLAGS+= -I${.CURDIR}/../../ofed/include/ CFLAGS+= -DINET6 -DINET -DOFED -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: head/sys/modules/ixgbe/Makefile ============================================================================== --- head/sys/modules/ixgbe/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/ixgbe/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,7 +1,5 @@ #$FreeBSD$ -.include - .PATH: ${.CURDIR}/../../dev/ixgbe KMOD = if_ixgbe @@ -14,20 +12,4 @@ SRCS += ixgbe_dcb.c ixgbe_dcb_82598.c SRCS += ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -DIXGBE_FDIR -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif - -opt_rss.h: - @echo "" > ${.TARGET} - -.endif - .include Modified: head/sys/modules/krpc/Makefile ============================================================================== --- head/sys/modules/krpc/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/krpc/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -32,13 +32,4 @@ SRCS+= xdr.c \ SRCS+= opt_inet6.h -.if !defined(KERNBUILDDIR) -NFS_INET6?= 1 # 0/1 - requires INET6 to be configured in kernel - -.if ${NFS_INET6} > 0 -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include Modified: head/sys/modules/linux/Makefile ============================================================================== --- head/sys/modules/linux/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/linux/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -56,8 +56,6 @@ linux${SFX}_genassym.o: linux${SFX}_gena ${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC} .if !defined(KERNBUILDDIR) -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} .if defined(KTR) CFLAGS+= -DKTR .endif Modified: head/sys/modules/lmc/Makefile ============================================================================== --- head/sys/modules/lmc/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/lmc/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -10,15 +10,9 @@ SRCS += opt_netgraph.h SRCS += opt_global.h SRCS += opt_bpf.h -opt_inet.h: - echo "#define INET 1" > ${.TARGET} -opt_inet6.h: - echo "#define INET6 0" > ${.TARGET} opt_netgraph.h: echo "#define NETGRAPH 1" > ${.TARGET} opt_global.h: echo "#define ALTQ 1" > ${.TARGET} -opt_bpf.h: # FreeBSD-5: - echo "#define DEV_BPF 1" > ${.TARGET} .include Modified: head/sys/modules/mlx4/Makefile ============================================================================== --- head/sys/modules/mlx4/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/mlx4/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,8 +1,5 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../ofed/drivers/net/mlx4 - -.include - .PATH: ${.CURDIR}/../../ofed/include/linux KMOD = mlx4 SRCS = device_if.h bus_if.h pci_if.h vnode_if.h @@ -12,18 +9,6 @@ SRCS+= pd.c port.c profile.c qp.c reset. CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4 CFLAGS+= -I${.CURDIR}/../../ofed/include/ -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: head/sys/modules/mlx4ib/Makefile ============================================================================== --- head/sys/modules/mlx4ib/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/mlx4ib/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -2,8 +2,6 @@ .PATH: ${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4 .PATH: ${.CURDIR}/../../ofed/include/linux -.include - KMOD = mlx4ib SRCS = device_if.h bus_if.h pci_if.h vnode_if.h SRCS+= linux_compat.c linux_radix.c linux_idr.c @@ -17,18 +15,6 @@ CFLAGS+= -I${.CURDIR}/../../ofed/include CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM CFLAGS+= -DINET6 -DINET -DOFED -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: head/sys/modules/mlxen/Makefile ============================================================================== --- head/sys/modules/mlxen/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/mlxen/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,8 +1,6 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../ofed/drivers/net/mlx4 -.include - KMOD = mlxen SRCS = device_if.h bus_if.h pci_if.h vnode_if.h SRCS += en_cq.c en_frag.c en_main.c en_netdev.c en_port.c en_resources.c @@ -11,18 +9,6 @@ SRCS += opt_inet.h opt_inet6.h CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4 CFLAGS+= -I${.CURDIR}/../../ofed/include/ -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: head/sys/modules/mthca/Makefile ============================================================================== --- head/sys/modules/mthca/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/mthca/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -2,8 +2,6 @@ .PATH: ${.CURDIR}/../../ofed/drivers/infiniband/hw/mthca -.include - KMOD = mthca SRCS = device_if.h bus_if.h pci_if.h vnode_if.h SRCS+= mthca_allocator.c mthca_av.c mthca_catas.c mthca_cmd.c mthca_cq.c @@ -14,18 +12,6 @@ SRCS+= opt_inet.h opt_inet6.h CFLAGS+= -I${.CURDIR}/../../ofed/include -.if !defined(KERNBUILDDIR) -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - @echo "#define INET 1" > ${.TARGET} -.endif - -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - @echo "#define INET6 1" > ${.TARGET} -.endif -.endif - .include CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} Modified: head/sys/modules/netgraph/gif/Makefile ============================================================================== --- head/sys/modules/netgraph/gif/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/netgraph/gif/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -3,12 +3,4 @@ KMOD= ng_gif SRCS= ng_gif.c opt_inet.h opt_inet6.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/netgraph/iface/Makefile ============================================================================== --- head/sys/modules/netgraph/iface/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/netgraph/iface/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -4,12 +4,4 @@ KMOD= ng_iface SRCS= ng_iface.c opt_inet.h opt_inet6.h -.if !defined(KERNBUILDDIR) -opt_inet.h: - echo "#define INET 1" > ${.TARGET} - -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif - .include Modified: head/sys/modules/netgraph/ipfw/Makefile ============================================================================== --- head/sys/modules/netgraph/ipfw/Makefile Mon Aug 4 22:34:56 2014 (r269539) +++ head/sys/modules/netgraph/ipfw/Makefile Mon Aug 4 22:37:02 2014 (r269540) @@ -1,20 +1,6 @@ # $FreeBSD$ -.include - KMOD= ng_ipfw SRCS= ng_ipfw.c opt_inet.h opt_inet6.h -.if !defined(KERNBUILDDIR) - -.if ${MK_INET_SUPPORT} != "no" -opt_inet.h: - echo "#define INET 1" > ${.TARGET} -.endif -.if ${MK_INET6_SUPPORT} != "no" -opt_inet6.h: - echo "#define INET6 1" > ${.TARGET} -.endif -.endif - *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***