Date: Sat, 6 Jun 2009 17:01:45 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r193588 - in head/sys/modules: cxgb/tom firewire/fwip ibcs2 if_gif if_ppp if_stf if_tun ip6_mroute_mod ip_mroute_mod ipfw linux mac_lomac nfsserver pf pseudofs sem svr4 sysvipc/sysvmsg ... Message-ID: <200906061701.n56H1jvr066669@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rwatson Date: Sat Jun 6 17:01:44 2009 New Revision: 193588 URL: http://svn.freebsd.org/changeset/base/193588 Log: Remove opt_mac.h generation for various kernel modules that no longer require it. Submitted by: pjd Modified: head/sys/modules/cxgb/tom/Makefile head/sys/modules/firewire/fwip/Makefile head/sys/modules/ibcs2/Makefile head/sys/modules/if_gif/Makefile head/sys/modules/if_ppp/Makefile head/sys/modules/if_stf/Makefile head/sys/modules/if_tun/Makefile head/sys/modules/ip6_mroute_mod/Makefile head/sys/modules/ip_mroute_mod/Makefile head/sys/modules/ipfw/Makefile head/sys/modules/linux/Makefile head/sys/modules/mac_lomac/Makefile head/sys/modules/nfsserver/Makefile head/sys/modules/pf/Makefile head/sys/modules/pseudofs/Makefile head/sys/modules/sem/Makefile head/sys/modules/svr4/Makefile head/sys/modules/sysvipc/sysvmsg/Makefile head/sys/modules/sysvipc/sysvsem/Makefile head/sys/modules/sysvipc/sysvshm/Makefile head/sys/modules/ufs/Makefile Modified: head/sys/modules/cxgb/tom/Makefile ============================================================================== --- head/sys/modules/cxgb/tom/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/cxgb/tom/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -6,7 +6,7 @@ CXGB = ${.CURDIR}/../../../dev/cxgb KMOD= tom SRCS= cxgb_tom.c cxgb_cpl_io.c cxgb_listen.c cxgb_tom_sysctl.c cxgb_cpl_socket.c SRCS+= cxgb_ddp.c cxgb_vm.c cxgb_l2t.c cxgb_tcp_offload.c -SRCS+= opt_compat.h opt_inet.h opt_inet6.h opt_ipsec.h opt_mac.h +SRCS+= opt_compat.h opt_inet.h opt_inet6.h opt_ipsec.h SRCS+= opt_tcpdebug.h opt_ddb.h opt_sched.h opt_global.h opt_ktr.h SRCS+= device_if.h bus_if.h pci_if.h CFLAGS+= -g -I${CXGB} Modified: head/sys/modules/firewire/fwip/Makefile ============================================================================== --- head/sys/modules/firewire/fwip/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/firewire/fwip/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -6,7 +6,7 @@ KMOD = if_fwip SRCS = bus_if.h device_if.h \ - opt_inet.h opt_inet6.h opt_mac.h \ + opt_inet.h opt_inet6.h \ if_fwip.c if_fwipvar.h \ firewire.h firewirereg.h \ if_fwsubr.c Modified: head/sys/modules/ibcs2/Makefile ============================================================================== --- head/sys/modules/ibcs2/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/ibcs2/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -8,7 +8,7 @@ SRCS= ibcs2_errno.c ibcs2_ipc.c ibcs2_st ibcs2_socksys.c ibcs2_util.c ibcs2_xenix.c ibcs2_xenix_sysent.c \ ibcs2_isc.c ibcs2_isc_sysent.c \ ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c \ - vnode_if.h opt_mac.h opt_spx_hack.h + vnode_if.h opt_spx_hack.h CFLAGS+= -DCOMPAT_IBCS2 Modified: head/sys/modules/if_gif/Makefile ============================================================================== --- head/sys/modules/if_gif/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/if_gif/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -5,8 +5,7 @@ .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 KMOD= if_gif -SRCS= if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mac.h \ - opt_mrouting.h +SRCS= if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h .if !defined(KERNBUILDDIR) opt_inet.h: Modified: head/sys/modules/if_ppp/Makefile ============================================================================== --- head/sys/modules/if_ppp/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/if_ppp/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -4,7 +4,7 @@ KMOD= if_ppp SRCS= if_ppp.c ppp_tty.c slcompress.c \ - opt_inet.h opt_inet6.h opt_ipx.h opt_mac.h opt_ppp.h + opt_inet.h opt_inet6.h opt_ipx.h opt_ppp.h PPP_BSDCOMP?= 1 # 0/1 PPP_DEFLATE?= 1 # 0/1 Modified: head/sys/modules/if_stf/Makefile ============================================================================== --- head/sys/modules/if_stf/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/if_stf/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../net KMOD= if_stf -SRCS= if_stf.c opt_inet.h opt_inet6.h opt_mac.h +SRCS= if_stf.c opt_inet.h opt_inet6.h .if !defined(KERNBUILDDIR) opt_inet.h: Modified: head/sys/modules/if_tun/Makefile ============================================================================== --- head/sys/modules/if_tun/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/if_tun/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../net KMOD= if_tun -SRCS= if_tun.c opt_atalk.h opt_inet.h opt_inet6.h opt_ipx.h opt_mac.h +SRCS= if_tun.c opt_atalk.h opt_inet.h opt_inet6.h opt_ipx.h .if !defined(KERNBUILDDIR) opt_atalk.h: Modified: head/sys/modules/ip6_mroute_mod/Makefile ============================================================================== --- head/sys/modules/ip6_mroute_mod/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/ip6_mroute_mod/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -7,7 +7,7 @@ KMOD= ip6_mroute SRCS= ip6_mroute.c -SRCS+= opt_inet6.h opt_mac.h opt_mrouting.h +SRCS+= opt_inet6.h opt_mrouting.h .if !defined(KERNBUILDDIR) opt_inet6.h: Modified: head/sys/modules/ip_mroute_mod/Makefile ============================================================================== --- head/sys/modules/ip_mroute_mod/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/ip_mroute_mod/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -7,7 +7,7 @@ KMOD= ip_mroute SRCS= ip_mroute.c -SRCS+= opt_inet.h opt_mac.h opt_mrouting.h opt_route.h +SRCS+= opt_inet.h opt_mrouting.h opt_route.h .if !defined(KERNBUILDDIR) opt_inet.h: Modified: head/sys/modules/ipfw/Makefile ============================================================================== --- head/sys/modules/ipfw/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/ipfw/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -6,7 +6,7 @@ KMOD= ipfw SRCS= ip_fw2.c ip_fw_pfil.c -SRCS+= opt_inet6.h opt_ipsec.h opt_mac.h opt_route.h +SRCS+= opt_inet6.h opt_ipsec.h opt_route.h CFLAGS+= -DIPFIREWALL CFLAGS+= -I${.CURDIR}/../../contrib/pf Modified: head/sys/modules/linux/Makefile ============================================================================== --- head/sys/modules/linux/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/linux/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -13,7 +13,7 @@ SRCS= linux${SFX}_dummy.c linux_emul.c l linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \ linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \ linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \ - opt_inet6.h opt_route.h opt_mac.h opt_compat.h opt_posix.h vnode_if.h \ + opt_inet6.h opt_route.h opt_compat.h opt_posix.h vnode_if.h \ device_if.h bus_if.h assym.s # XXX: for assym.s Modified: head/sys/modules/mac_lomac/Makefile ============================================================================== --- head/sys/modules/mac_lomac/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/mac_lomac/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -4,7 +4,6 @@ KMOD= mac_lomac SRCS= vnode_if.h \ - opt_mac.h \ mac_lomac.c .include <bsd.kmod.mk> Modified: head/sys/modules/nfsserver/Makefile ============================================================================== --- head/sys/modules/nfsserver/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/nfsserver/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -5,7 +5,6 @@ KMOD= nfsserver SRCS= vnode_if.h \ nfs_fha.c nfs_serv.c nfs_srvkrpc.c nfs_srvsock.c nfs_srvcache.c \ nfs_srvsubs.c nfs_syscalls.c nfs_common.c \ - opt_mac.h \ opt_kgssapi.h \ opt_nfs.h SRCS+= opt_inet6.h Modified: head/sys/modules/pf/Makefile ============================================================================== --- head/sys/modules/pf/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/pf/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -9,7 +9,7 @@ KMOD= pf SRCS = pf.c pf_if.c pf_subr.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \ pf_ruleset.c \ in4_cksum.c \ - opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_mac.h opt_route.h + opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_route.h CFLAGS+= -I${.CURDIR}/../../contrib/pf Modified: head/sys/modules/pseudofs/Makefile ============================================================================== --- head/sys/modules/pseudofs/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/pseudofs/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -3,8 +3,7 @@ .PATH: ${.CURDIR}/../../fs/pseudofs KMOD= pseudofs -SRCS= opt_mac.h \ - opt_pseudofs.h \ +SRCS= opt_pseudofs.h \ vnode_if.h \ pseudofs.c \ pseudofs_fileno.c \ Modified: head/sys/modules/sem/Makefile ============================================================================== --- head/sys/modules/sem/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/sem/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../kern KMOD= sem -SRCS= uipc_sem.c opt_mac.h opt_posix.h vnode_if.h +SRCS= uipc_sem.c opt_posix.h vnode_if.h .include <bsd.kmod.mk> Modified: head/sys/modules/svr4/Makefile ============================================================================== --- head/sys/modules/svr4/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/svr4/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../${MACHINE_ARCH}/svr4 ${.CURDIR}/../../compat/svr4 KMOD= svr4 -SRCS= svr4_sysent.c svr4_sysvec.c opt_compat.h opt_mac.h opt_svr4.h \ +SRCS= svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h \ vnode_if.h imgact_svr4.c svr4_signal.c svr4_fcntl.c \ svr4_misc.c svr4_ioctl.c svr4_stat.c svr4_filio.c \ svr4_termios.c svr4_stream.c svr4_socket.c svr4_sockio.c \ Modified: head/sys/modules/sysvipc/sysvmsg/Makefile ============================================================================== --- head/sys/modules/sysvipc/sysvmsg/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/sysvipc/sysvmsg/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../../kern KMOD= sysvmsg -SRCS= sysv_msg.c opt_mac.h opt_sysvipc.h +SRCS= sysv_msg.c opt_sysvipc.h .include <bsd.kmod.mk> Modified: head/sys/modules/sysvipc/sysvsem/Makefile ============================================================================== --- head/sys/modules/sysvipc/sysvsem/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/sysvipc/sysvsem/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../../kern KMOD= sysvsem -SRCS= sysv_sem.c opt_mac.h opt_sysvipc.h +SRCS= sysv_sem.c opt_sysvipc.h .include <bsd.kmod.mk> Modified: head/sys/modules/sysvipc/sysvshm/Makefile ============================================================================== --- head/sys/modules/sysvipc/sysvshm/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/sysvipc/sysvshm/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../../kern KMOD= sysvshm -SRCS= sysv_shm.c opt_mac.h opt_sysvipc.h opt_compat.h +SRCS= sysv_shm.c opt_sysvipc.h opt_compat.h .include <bsd.kmod.mk> Modified: head/sys/modules/ufs/Makefile ============================================================================== --- head/sys/modules/ufs/Makefile Sat Jun 6 15:44:07 2009 (r193587) +++ head/sys/modules/ufs/Makefile Sat Jun 6 17:01:44 2009 (r193588) @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../ufs/ufs ${.CURDIR}/../../ufs/ffs KMOD= ufs -SRCS= opt_ddb.h opt_directio.h opt_ffs.h opt_ffs_broken_fixme.h opt_mac.h \ +SRCS= opt_ddb.h opt_directio.h opt_ffs.h opt_ffs_broken_fixme.h \ opt_quota.h opt_suiddir.h opt_ufs.h \ vnode_if.h ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c \ ufs_gjournal.c ufs_inode.c ufs_lookup.c ufs_quota.c ufs_vfsops.c \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906061701.n56H1jvr066669>