problem in building modules-with-world re: cvs commit:src/sys/netinet ip_fw_pfil.c

[Ruslan Ermilov]

On Fri, Aug 20, 2004 at 10:07:32PM +0200, Andre Oppermann wrote:
> > > > [...]
> > > > ===> ipfw
> > > > rm -f .depend
> > > > mkdep -f .depend -a   -nostdinc -DIPFIREWALL -D_KERNEL -DKLD_MODULE -I- -I. -I@ -I@/contrib/altq -I@/../include /src/sys/modules/ipfw/../../netinet/ip_fw2.c /src/sys/modules/ipfw/../../netinet/ip_fw_pfil.c
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw2.c:35:22: opt_ipfw.h: No such file or directory
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw2.c:36:22: opt_ipdn.h: No such file or directory
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw2.c:37:26: opt_ipdivert.h: No such file or directory
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw2.c:38:22: opt_inet.h: No such file or directory
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw2.c:39:23: opt_ipsec.h: No such file or directory
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw2.c:41:2: #error IPFIREWALL requires INET.
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw_pfil.c:29:22: opt_ipfw.h: No such file or directory
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw_pfil.c:30:22: opt_ipdn.h: No such file or directory
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw_pfil.c:31:26: opt_ipdivert.h: No such file or directory
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw_pfil.c:32:28: opt_pfil_hooks.h: No such file or directory
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw_pfil.c:33:22: opt_inet.h: No such file or directory
> > > > /src/sys/modules/ipfw/../../netinet/ip_fw_pfil.c:35:2: #error IPFIREWALL requires INET.
> > > > mkdep: compile failed
> > > > *** Error code 1 (continuing)
> > > > `depend' not remade because of errors.
> > > > ===> ip_mroute_mod
> > > > [...]
> > >
> > > I have just cvsupped -current and the GENERIC kernel compiles just fine.
> > >
> > > Looking at the error message in your log output one might conclude that you
> > > are missing "option INET" in your kernel config?
> > 
> > MODULES_WITH_WORLD
> > 
> > Please read the subject line.  ;)
> 
> Ok, there seems to be a problem with setting up the environment when doing
> this.  Why do you build modules with WORLD instead of doing it with the
> kernel?  This sounds quite dangerous to me when kernel/modules go out of
> sync.
> 
> Ruslan, do you have any idea what is going wrong?
> 
Yes.  You removed far too much in your conversion.  ;)

%%%
Index: ip_fw2.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_fw2.c,v
retrieving revision 1.73
diff -u -p -r1.73 ip_fw2.c
--- ip_fw2.c	19 Aug 2004 23:31:40 -0000	1.73
+++ ip_fw2.c	20 Aug 2004 20:37:14 -0000
@@ -32,6 +32,7 @@
  * Implement IP packet firewall (new version)
  */
 
+#if !defined(KLD_MODULE)
 #include "opt_ipfw.h"
 #include "opt_ipdn.h"
 #include "opt_ipdivert.h"
@@ -40,6 +41,7 @@
 #ifndef INET
 #error IPFIREWALL requires INET.
 #endif /* INET */
+#endif
 
 #define IPFW2	1
 #if IPFW2
Index: ip_fw_pfil.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_fw_pfil.c,v
retrieving revision 1.5
diff -u -p -r1.5 ip_fw_pfil.c
--- ip_fw_pfil.c	20 Aug 2004 00:36:55 -0000	1.5
+++ ip_fw_pfil.c	20 Aug 2004 20:39:50 -0000
@@ -26,6 +26,7 @@
  * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.5 2004/08/20 00:36:55 andre Exp $
  */
 
+#if !defined(KLD_MODULE)
 #include "opt_ipfw.h"
 #include "opt_ipdn.h"
 #include "opt_ipdivert.h"
@@ -34,9 +35,10 @@
 #ifndef INET
 #error IPFIREWALL requires INET.
 #endif /* INET */
-#if !defined(KLD_MODULE) && !defined(PFIL_HOOKS)
+#if !defined(PFIL_HOOKS)
 #error IPFIREWALL requires PFIL_HOOKS.
 #endif
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
%%%


Cheers,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20040820/12009595/attachment.bin