buildworld failure

[Robert Watson]

On Sun, 14 Aug 2011, Alexander Best wrote:

> has anybody seen this buildworld failure?

Could you try the attached patch and see if it helps?  I currently have it in 
the re@ approval queue.  It does appear to fix the problem here.

Generally, I would strongly advise against using modules built with world, and 
wonder if we should be de-supporting that explicitly at this point.  Checking 
that the below works for you would be great, but you might not want to use 
MODULES_WITH_WORLD anymore.

(If we do want to keep MODULES_WITH_WORLD, we may want to add it to the 
tinderboxes.)

Robert

--

Fix two cases involving opt_capsicum.h and module builds:

(1) opt_capsicum.h is no longer required in ffs_alloc.c, so remove the
     #include.

(2) portalfs depends on opt_capsicum.h, so have the Makefile generate one
     if required.

Note, however, that attempting to use modules built without a kernel
configuration is a bad idea generally -- it's a bit worrying that we still
provide MODULES_WITH_WORLD.

Approved by:	re (xxx)
Sponsored by:	Google Inc

Index: ufs/ffs/ffs_alloc.c
===================================================================
--- ufs/ffs/ffs_alloc.c	(revision 224860)
+++ ufs/ffs/ffs_alloc.c	(working copy)
@@ -62,7 +62,6 @@
  #include <sys/cdefs.h>
  __FBSDID("$FreeBSD$");

-#include "opt_capsicum.h"
  #include "opt_quota.h"

  #include <sys/param.h>
Index: modules/portalfs/Makefile
===================================================================
--- modules/portalfs/Makefile	(revision 224860)
+++ modules/portalfs/Makefile	(working copy)
@@ -4,6 +4,7 @@

  KMOD=	portalfs
  SRCS=	vnode_if.h \
-	portal_vfsops.c portal_vnops.c
+	portal_vfsops.c portal_vnops.c \
+	opt_capsicum.h

  .include <bsd.kmod.mk>