Date: Wed, 4 Jan 2012 12:50:38 -0500 From: Jason Hellenthal <jhell@DataIX.net> To: John Baldwin <jhb@freebsd.org> Cc: stable@freebsd.org Subject: Re: svn commit: r229497 - in stable/8/sys: conf modules modules/ipfw netinet/ipfw Message-ID: <20120104175038.GA19251@DataIX.net> In-Reply-To: <201201041620.q04GKupF086196@svn.freebsd.org> References: <201201041620.q04GKupF086196@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--CUfgB8w4ZwR/yMy5 Content-Type: multipart/mixed; boundary="tThc/1wpZn/ma/RB" Content-Disposition: inline --tThc/1wpZn/ma/RB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable After this change I am recieving the attached error log. On Wed, Jan 04, 2012 at 04:20:56PM +0000, John Baldwin wrote: > Author: jhb > Date: Wed Jan 4 16:20:55 2012 > New Revision: 229497 > URL: http://svn.freebsd.org/changeset/base/229497 >=20 > Log: > MFC 225518,225793,227085: > Allow the ipfw.ko module built with a kernel to honor any options defin= ed > in the kernel config. This more closely matches the behavior of other > modules which inherit configuration settings from the kernel configurat= ion > during a kernel + modules build. > =20 > Do not try to build the module in case of no INET support but keep #err= or > calls for now in case we would compile it into the kernel. > =20 > While here garbage collect unneeded opt_*.h includes. > opt_ipdn.h is not used anywhere but we need to leave the DUMMYNET > entry in options for conditional inclusion in kernel so keep the > file with the same name. >=20 > Modified: > stable/8/sys/modules/Makefile > stable/8/sys/modules/ipfw/Makefile > stable/8/sys/netinet/ipfw/ip_fw2.c > stable/8/sys/netinet/ipfw/ip_fw_dynamic.c > stable/8/sys/netinet/ipfw/ip_fw_log.c > stable/8/sys/netinet/ipfw/ip_fw_pfil.c > stable/8/sys/netinet/ipfw/ip_fw_sockopt.c > stable/8/sys/netinet/ipfw/ip_fw_table.c > Directory Properties: > stable/8/sys/ (props changed) > stable/8/sys/amd64/include/xen/ (props changed) > stable/8/sys/cddl/contrib/opensolaris/ (props changed) > stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed) > stable/8/sys/conf/ldscript.mips.octeon1.64 (props changed) > stable/8/sys/contrib/dev/acpica/ (props changed) > stable/8/sys/contrib/pf/ (props changed) >=20 > Modified: stable/8/sys/modules/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/8/sys/modules/Makefile Wed Jan 4 16:07:16 2012 (r229496) > +++ stable/8/sys/modules/Makefile Wed Jan 4 16:20:55 2012 (r229497) > @@ -134,7 +134,7 @@ SUBDIR=3D ${_3dfx} \ > ${_io} \ > ipdivert \ > ${_ipfilter} \ > - ipfw \ > + ${_ipfw} \ > ipfw_nat \ > ${_ipmi} \ > ip_mroute_mod \ > @@ -366,6 +366,10 @@ _random=3D random > _ipfilter=3D ipfilter > .endif > =20 > +.if ${MK_INET_SUPPORT} !=3D "no" || defined(ALL_MODULES) > +_ipfw=3D ipfw > +.endif > + > .if ${MK_NETGRAPH} !=3D "no" || defined(ALL_MODULES) > _netgraph=3D netgraph > .endif >=20 > Modified: stable/8/sys/modules/ipfw/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/8/sys/modules/ipfw/Makefile Wed Jan 4 16:07:16 2012 (r229496) > +++ stable/8/sys/modules/ipfw/Makefile Wed Jan 4 16:20:55 2012 (r229497) > @@ -8,7 +8,7 @@ KMOD=3D ipfw > SRCS=3D ip_fw2.c ip_fw_pfil.c > SRCS+=3D ip_fw_dynamic.c ip_fw_log.c > SRCS+=3D ip_fw_sockopt.c ip_fw_table.c > -SRCS+=3D opt_inet6.h opt_ipsec.h > +SRCS+=3D opt_inet.h opt_inet6.h opt_ipdivert.h opt_ipfw.h opt_ipsec.h > =20 > CFLAGS+=3D -DIPFIREWALL > CFLAGS+=3D -I${.CURDIR}/../../contrib/pf > @@ -22,6 +22,10 @@ CFLAGS+=3D -I${.CURDIR}/../../contrib/pf > # > =20 > .if !defined(KERNBUILDDIR) > +.if ${MK_INET_SUPPORT} !=3D "no" > +opt_inet.h: > + echo "#define INET 1" > ${.TARGET} > +.endif > .if ${MK_INET6_SUPPORT} !=3D "no" > opt_inet6.h: > echo "#define INET6 1" > ${.TARGET} >=20 > Modified: stable/8/sys/netinet/ipfw/ip_fw2.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/8/sys/netinet/ipfw/ip_fw2.c Wed Jan 4 16:07:16 2012 (r229496) > +++ stable/8/sys/netinet/ipfw/ip_fw2.c Wed Jan 4 16:20:55 2012 (r229497) > @@ -30,15 +30,12 @@ __FBSDID("$FreeBSD$"); > * The FreeBSD IP packet firewall, main file > */ > =20 > -#if !defined(KLD_MODULE) > #include "opt_ipfw.h" > #include "opt_ipdivert.h" > -#include "opt_ipdn.h" > #include "opt_inet.h" > #ifndef INET > #error IPFIREWALL requires INET. > #endif /* INET */ > -#endif > #include "opt_inet6.h" > #include "opt_ipsec.h" > =20 >=20 > Modified: stable/8/sys/netinet/ipfw/ip_fw_dynamic.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/8/sys/netinet/ipfw/ip_fw_dynamic.c Wed Jan 4 16:07:16 2012 (r= 229496) > +++ stable/8/sys/netinet/ipfw/ip_fw_dynamic.c Wed Jan 4 16:20:55 2012 (r= 229497) > @@ -33,17 +33,12 @@ __FBSDID("$FreeBSD$"); > * Dynamic rule support for ipfw > */ > =20 > -#if !defined(KLD_MODULE) > #include "opt_ipfw.h" > -#include "opt_ipdivert.h" > -#include "opt_ipdn.h" > #include "opt_inet.h" > #ifndef INET > #error IPFIREWALL requires INET. > #endif /* INET */ > -#endif > #include "opt_inet6.h" > -#include "opt_ipsec.h" > =20 > #include <sys/param.h> > #include <sys/systm.h> >=20 > Modified: stable/8/sys/netinet/ipfw/ip_fw_log.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/8/sys/netinet/ipfw/ip_fw_log.c Wed Jan 4 16:07:16 2012 (r2294= 96) > +++ stable/8/sys/netinet/ipfw/ip_fw_log.c Wed Jan 4 16:20:55 2012 (r2294= 97) > @@ -30,17 +30,12 @@ __FBSDID("$FreeBSD$"); > * Logging support for ipfw > */ > =20 > -#if !defined(KLD_MODULE) > #include "opt_ipfw.h" > -#include "opt_ipdivert.h" > -#include "opt_ipdn.h" > #include "opt_inet.h" > #ifndef INET > #error IPFIREWALL requires INET. > #endif /* INET */ > -#endif > #include "opt_inet6.h" > -#include "opt_ipsec.h" > =20 > #include <sys/param.h> > #include <sys/systm.h> >=20 > Modified: stable/8/sys/netinet/ipfw/ip_fw_pfil.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/8/sys/netinet/ipfw/ip_fw_pfil.c Wed Jan 4 16:07:16 2012 (r229= 496) > +++ stable/8/sys/netinet/ipfw/ip_fw_pfil.c Wed Jan 4 16:20:55 2012 (r229= 497) > @@ -27,15 +27,12 @@ > #include <sys/cdefs.h> > __FBSDID("$FreeBSD$"); > =20 > -#if !defined(KLD_MODULE) > #include "opt_ipfw.h" > -#include "opt_ipdn.h" > #include "opt_inet.h" > +#include "opt_inet6.h" > #ifndef INET > #error IPFIREWALL requires INET. > #endif /* INET */ > -#endif /* KLD_MODULE */ > -#include "opt_inet6.h" > =20 > #include <sys/param.h> > #include <sys/systm.h> > @@ -150,7 +147,7 @@ again: > /* next_hop may be set by ipfw_chk */ > if (args.next_hop =3D=3D NULL) > break; /* pass */ > -#ifndef IPFIREWALL_FORWARD > +#if !defined(IPFIREWALL_FORWARD) || (!defined(INET6) && !defined(INET)) > ret =3D EACCES; > #else > { > @@ -178,7 +175,7 @@ again: > if (in_localip(args.next_hop->sin_addr)) > (*m0)->m_flags |=3D M_FASTFWD_OURS; > } > -#endif > +#endif /* IPFIREWALL_FORWARD */ > break; > =20 > case IP_FW_DENY: >=20 > Modified: stable/8/sys/netinet/ipfw/ip_fw_sockopt.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/8/sys/netinet/ipfw/ip_fw_sockopt.c Wed Jan 4 16:07:16 2012 (r= 229496) > +++ stable/8/sys/netinet/ipfw/ip_fw_sockopt.c Wed Jan 4 16:20:55 2012 (r= 229497) > @@ -33,17 +33,12 @@ __FBSDID("$FreeBSD$"); > * the upper half of the ipfw code. > */ > =20 > -#if !defined(KLD_MODULE) > #include "opt_ipfw.h" > -#include "opt_ipdivert.h" > -#include "opt_ipdn.h" > #include "opt_inet.h" > #ifndef INET > #error IPFIREWALL requires INET. > #endif /* INET */ > -#endif > #include "opt_inet6.h" > -#include "opt_ipsec.h" > =20 > #include <sys/param.h> > #include <sys/systm.h> >=20 > Modified: stable/8/sys/netinet/ipfw/ip_fw_table.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/8/sys/netinet/ipfw/ip_fw_table.c Wed Jan 4 16:07:16 2012 (r22= 9496) > +++ stable/8/sys/netinet/ipfw/ip_fw_table.c Wed Jan 4 16:20:55 2012 (r22= 9497) > @@ -39,17 +39,12 @@ __FBSDID("$FreeBSD$"); > * from userland, because operations are typically fast. > */ > =20 > -#if !defined(KLD_MODULE) > #include "opt_ipfw.h" > -#include "opt_ipdivert.h" > -#include "opt_ipdn.h" > #include "opt_inet.h" > #ifndef INET > #error IPFIREWALL requires INET. > #endif /* INET */ > -#endif > #include "opt_inet6.h" > -#include "opt_ipsec.h" > =20 > #include <sys/param.h> > #include <sys/systm.h> > _______________________________________________ > svn-src-stable-8@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8 > To unsubscribe, send any mail to "svn-src-stable-8-unsubscribe@freebsd.or= g" --=20 ;s =3D; --tThc/1wpZn/ma/RB Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="buildkernel.log" Script started on Wed Jan 4 12:43:54 2012 time -h make -DNO_CLEAN buildkernel WITH_CTF=1 -------------------------------------------------------------- >>> Kernel build for DISBATCH started on Wed Jan 4 12:43:55 EST 2012 -------------------------------------------------------------- ===> DISBATCH mkdir -p /usr/obj/usr/src/sys -------------------------------------------------------------- >>> stage 1: configuring the kernel -------------------------------------------------------------- cd /usr/src/sys/i386/conf; PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/usr/games:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/usr/obj/usr/src/tmp/usr/games:/sbin:/bin:/usr/sbin:/usr/bin config -d /usr/obj/usr/src/sys/DISBATCH /usr/src/sys/i386/conf/DISBATCH Kernel build directory is /usr/obj/usr/src/sys/DISBATCH Don't forget to do ``make cleandepend && make depend'' -------------------------------------------------------------- >>> stage 2.2: rebuilding the object tree -------------------------------------------------------------- cd /usr/obj/usr/src/sys/DISBATCH; MAKEOBJDIRPREFIX=/usr/obj MACHINE_ARCH=i386 MACHINE=i386 CPUTYPE=native GROFF_BIN_PATH=/usr/obj/usr/src/tmp/legacy/usr/bin GROFF_FONT_PATH=/usr/obj/usr/src/tmp/legacy/usr/share/groff_font GROFF_TMAC_PATH=/usr/obj/usr/src/tmp/legacy/usr/share/tmac _SHLIBDIRPREFIX=/usr/obj/usr/src/tmp VERSION="FreeBSD 8.2-STABLE i386 802514" INSTALL="sh /usr/src/tools/install.sh" PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/usr/games:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/usr/obj/usr/src/tmp/usr/games:/sbin:/bin:/usr/sbin:/usr/bin make KERNEL=kernel obj cd /usr/src/sys/modules; MAKEOBJDIRPREFIX=/usr/obj/usr/src/sys/DISBATCH/modules KMODDIR=/boot/kernel DEBUG_FLAGS="-g3" MACHINE=i386 KERNBUILDDIR="/usr/obj/usr/src/sys/DISBATCH" SYSDIR="/usr/src/sys" make obj "/usr/src/sys/modules/Makefile", line 369: Malformed conditional (${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)) "/usr/src/sys/modules/Makefile", line 371: if-less endif make: fatal errors encountered -- cannot continue *** Error code 1 Stop in /usr/obj/usr/src/sys/DISBATCH. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. 3.69s real 2.21s user 0.80s sys Script done on Wed Jan 4 12:43:58 2012 --tThc/1wpZn/ma/RB-- --CUfgB8w4ZwR/yMy5 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJPBJFtAAoJEJBXh4mJ2FR+2h8H/3OPwoUJkHxLOh3i5IXFMmOf Kc662VATFhw2rS6wmeIC2G6GlyrcgmixDZJg7YfOTI3VPyRKgshCEYB3QDevkTBz 1FQUft6j21FjhPQotkPDA6+iLWVZzhZ57LCbCFS1Ghjx9waF2dZqDbS41eMxyS4h M7YdsOhDfmU91E5atgKYXi58+yCl8UH5o4fN8/8yNYmkNvMLVCM3ViqWu8+JPwkw I4EcsnSy2NgnQBq3otkyQYJUxZjMFA3GJROdA/YzAr1FdWnE69tK5wuStlfYquZB /2mUAE2cuyJSYwCFCjohyerDpSEL77ww7s2zdSQOCs5SnNMiD57A933TtlCZK0E= =LFPY -----END PGP SIGNATURE----- --CUfgB8w4ZwR/yMy5--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120104175038.GA19251>