From owner-p4-projects  Thu Apr 25 12:19:38 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 959A737B41C; Thu, 25 Apr 2002 12:19:31 -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 E535D37B405
	for <perforce@freebsd.org>; Thu, 25 Apr 2002 12:19:30 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3PJJUH51976
	for perforce@freebsd.org; Thu, 25 Apr 2002 12:19:30 -0700 (PDT)
	(envelope-from green@freebsd.org)
Date: Thu, 25 Apr 2002 12:19:30 -0700 (PDT)
Message-Id: <200204251919.g3PJJUH51976@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 10281 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=10281

Change 10281 by green@green_laptop_2 on 2002/04/25 12:19:16

	Use ${DEFAULTKERNEL} and ${EXTRAKERNELS} instead of the single
	${KERNELS} variable to allow a release without GENERIC.

Affected files ...

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

Differences ...

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

@@ -133,7 +133,8 @@
 CRYPTO_DISTS?=	crypto krb4 krb5
 BIN_DISTS?=	bin
 DISTRIBUTIONS?=	${BIN_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS}
-KERNELS?=	GENERIC
+DEFAULTKERNEL?=	GENERIC
+EXTRAKERNELS?=	MAC
 
 BOOT1=	etc/defaults/rc.conf
 
@@ -459,7 +460,7 @@
 
 # Make and install the generic kernel(s).
 release.3:
-.for kernel in ${KERNELS}
+.for kernel in ${DEFAULTKERNEL} ${EXTRAKERNELS}
 	-chflags -R noschg ${RD}/kernels/${kernel}
 	rm -rf ${RD}/kernels/${kernel}
 	rm -rf ${.CURDIR}/../sys/${MACHINE}/compile/${kernel}
@@ -470,7 +471,7 @@
 .endfor
 	# Install a standard boot kernel+modules
 	mkdir -p ${RD}/trees/bin/boot/kernel
-	cp -Rp ${RD}/kernels/GENERIC/* ${RD}/trees/bin/boot/kernel
+	cp -Rp ${RD}/kernels/${DEFAULTKERNEL}/* ${RD}/trees/bin/boot/kernel
 	touch release.3
 
 # Make and install the three crunched binaries which live on the floppies.

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