From owner-p4-projects@FreeBSD.ORG  Wed Dec 14 09:39:13 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C2FD816A422; Wed, 14 Dec 2005 09:39:12 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 91B8F16A41F
	for <perforce@freebsd.org>; Wed, 14 Dec 2005 09:39:12 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1748643D5D
	for <perforce@freebsd.org>; Wed, 14 Dec 2005 09:39:12 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBE9dB71045065
	for <perforce@freebsd.org>; Wed, 14 Dec 2005 09:39:11 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBE9dBOL045061
	for perforce@freebsd.org; Wed, 14 Dec 2005 09:39:11 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Wed, 14 Dec 2005 09:39:11 GMT
Message-Id: <200512140939.jBE9dBOL045061@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 88172 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, 14 Dec 2005 09:39:13 -0000

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

Change 88172 by soc-andrew@soc-andrew_serv on 2005/12/14 09:38:33

	Move release.9 to release.8 when BSDINSTALLER is defined

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#20 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#20 (text+ko) ====

@@ -694,6 +694,7 @@
 .endif
 	touch ${.TARGET}
 
+.if !defined(BSDINSTALLER)
 # Build the memory root filesystem.
 release.8:
 	cp ${RD}/trees/base/etc/disktab /etc
@@ -758,9 +759,9 @@
 	    ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
 	@gzip -9fnv ${RD}/mfsroot/mfsroot
 	touch ${.TARGET}
-
+.else
 # Build the BSD Installer mfs images
-release.9:
+release.8:
 	rm -rf ${RD}/bsdinstaller
 	mkdir ${RD}/bsdinstaller
 	( for dir in root usr var ; do \
@@ -806,6 +807,7 @@
 	  10000 ${RD}/bsdinstaller/root ${MFSINODE} auto
 	@gzip -9fnv ${RD}/bsdinstaller/mfsroot
 	touch ${.TARGET}
+.endif
 
 KERNFLOPPYSET=		${RD}/floppyset/kern/kernel.gz
 .if defined(SMALLFLOPPYSIZE)
@@ -1176,7 +1178,7 @@
 	)
 
 doRELEASE: release.1 release.2 ${DOCREL} release.3 release.4 \
-    release.5 release.6 release.7 release.8 release.9 ${EXTRAS}
+    release.5 release.6 release.7 release.8 ${EXTRAS}
 	@echo "Release done"
 
 floppies: