From owner-freebsd-current@FreeBSD.ORG  Mon Aug 15 00:41:59 2011
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1B2201065673;
	Mon, 15 Aug 2011 00:41:59 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42])
	by mx1.freebsd.org (Postfix) with ESMTP id ED8D08FC14;
	Mon, 15 Aug 2011 00:41:58 +0000 (UTC)
Received: from fledge.watson.org (fledge.watson.org [65.122.17.41])
	by cyrus.watson.org (Postfix) with ESMTPS id 7306746B23;
	Sun, 14 Aug 2011 20:41:58 -0400 (EDT)
Date: Mon, 15 Aug 2011 01:41:58 +0100 (BST)
From: Robert Watson <rwatson@FreeBSD.org>
X-X-Sender: robert@fledge.watson.org
To: Alexander Best <arundel@freebsd.org>
In-Reply-To: <20110814215016.GA40704@freebsd.org>
Message-ID: <alpine.BSF.2.00.1108150139440.63057@fledge.watson.org>
References: <20110814215016.GA40704@freebsd.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: freebsd-current@freebsd.org
Subject: Re: buildworld failure
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Aug 2011 00:41:59 -0000


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>