From owner-p4-projects@FreeBSD.ORG  Wed Aug  8 01:04:56 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ABF6F16A419; Wed,  8 Aug 2007 01:04:56 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6BC6E16A417
	for <perforce@FreeBSD.org>; Wed,  8 Aug 2007 01:04:56 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 572BF13C46E
	for <perforce@FreeBSD.org>; Wed,  8 Aug 2007 01:04:56 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7814uK7065942
	for <perforce@FreeBSD.org>; Wed, 8 Aug 2007 01:04:56 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7814uF8065939
	for perforce@freebsd.org; Wed, 8 Aug 2007 01:04:56 GMT
	(envelope-from zec@FreeBSD.org)
Date: Wed, 8 Aug 2007 01:04:56 GMT
Message-Id: <200708080104.l7814uF8065939@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 124861 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Aug 2007 01:04:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=124861

Change 124861 by zec@zec_tpx32 on 2007/08/08 01:04:43

	Do not attempt to build ng_wormhole as a module for
	nooptions VIMAGE kernel configs, since ng_wormhole is
	pointless on clean kernels, plus it won't even compile
	there (neither now nor ever in the future).

Affected files ...

.. //depot/projects/vimage/src/sys/modules/netgraph/Makefile#5 edit

Differences ...

==== //depot/projects/vimage/src/sys/modules/netgraph/Makefile#5 (text+ko) ====

@@ -52,7 +52,7 @@
 	UI \
 	vjc \
 	vlan \
-	wormhole
+	${_wormhole}
 
 .if ${MACHINE_ARCH} == "i386"
 _sync_ar=	sync_ar
@@ -67,4 +67,9 @@
 _mppc=		mppc
 .endif
 
+VIMAGE!=        grep VIMAGE ${KERNBUILDDIR}/opt_vimage.h | cut -d" " -f3 || true
+.if ${VIMAGE} == 1
+_wormhole=	wormhole
+.endif
+
 .include <bsd.subdir.mk>