From owner-p4-projects  Wed May  1 14:15: 5 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75DC537B400; Wed,  1 May 2002 14:14:43 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 7815B37B404
	for <perforce@freebsd.org>; Wed,  1 May 2002 14:14:41 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g41LEfg82533
	for perforce@freebsd.org; Wed, 1 May 2002 14:14:41 -0700 (PDT)
	(envelope-from green@freebsd.org)
Date: Wed, 1 May 2002 14:14:41 -0700 (PDT)
Message-Id: <200205012114.g41LEfg82533@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 10596 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10596

Change 10596 by green@green_laptop_2 on 2002/05/01 14:13:43

	Make sure the extra kernels defined to be built by release
	do come with their modules.  Also, I guess we don't need a
	slightly-different GENERIC kernel by default in addition
	to the one in /boot/kernel.

Affected files ...

... //depot/projects/trustedbsd/mac/release/Makefile#15 edit

Differences ...

==== //depot/projects/trustedbsd/mac/release/Makefile#15 (text+ko) ====

@@ -123,7 +123,7 @@
 
 # Things which without too much trouble can be considered variables
 # BASE_DISTS are special in that they get full /etc installation sets.
-#
+# 
 .if ${MACHINE_ARCH} == "i386"
 COMPAT_DISTS?=	compat1x compat20 compat21 compat22 compat3x compat4x
 .else
@@ -133,7 +133,7 @@
 CRYPTO_DISTS?=	crypto krb4 krb5
 BASE_DISTS?=	base
 DISTRIBUTIONS?=	${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS}
-KERNELS?=	GENERIC MAC
+KERNELS?=	MAC
 
 BOOT1=	etc/defaults/rc.conf
 
@@ -469,7 +469,7 @@
 release.3:
 .for kernel in ${KERNELS}
 	cd ${.CURDIR}/..; \
-	${MAKE} ${KERNEL_FLAGS} -DNO_WERROR -DNO_MODULES \
+	${MAKE} ${KERNEL_FLAGS} -DNO_WERROR \
 	    KERNCONF=${kernel} INSTKERNNAME=${kernel} kernel \
 	    DESTDIR=${RD}/trees/base
 .endfor

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message