From owner-p4-releng  Fri Mar 29 21:49:10 2002
Delivered-To: p4-releng@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BB8F237B404; Fri, 29 Mar 2002 21:49:04 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (unknown [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id D22DA37B405
	for <perforce@freebsd.org>; Fri, 29 Mar 2002 21:49:03 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g2U5n3533276
	for perforce@freebsd.org; Fri, 29 Mar 2002 21:49:03 -0800 (PST)
	(envelope-from murray@freebsd.org)
Date: Fri, 29 Mar 2002 21:49:03 -0800 (PST)
Message-Id: <200203300549.g2U5n3533276@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to murray@freebsd.org using -f
From: Murray Stokely <murray@FreeBSD.org>
Subject: PERFORCE change 8656 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-releng@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-releng.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-releng>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-releng>
X-Loop: FreeBSD.ORG

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

Change 8656 by murray@murray_builder on 2002/03/29 21:48:32

	Integrate from CVS - bump the Alpha MFSSIZE, and don't include
	pccard.conf.

Affected files ...

... //depot/releng/5_dp1/src/release/Makefile#3 integrate

Differences ...

==== //depot/releng/5_dp1/src/release/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.659 2002/02/25 21:53:18 peter Exp $
+# $FreeBSD: src/release/Makefile,v 1.664 2002/03/30 02:31:17 murray Exp $
 #
 # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \
 #	[ RELEASETAG=tag ]
@@ -170,7 +170,7 @@
 .elif ${MACHINE_ARCH} == "alpha"
 BOOTSIZE=		1440
 FIXITSIZE=		2880
-MFSSIZE=		3200
+MFSSIZE=		4320
 BIGBOOTSIZE=		2880
 BOOTINODE=		80000
 FIXITINODE=		4000
@@ -609,7 +609,9 @@
 		ln -sf /stand $$dir; \
 	  done )
 	cp /sbin/dhclient-script ${RD}/mfsfd/stand
+.if ${MACHINE_ARCH} == "i386"
 	cp ${.CURDIR}/../etc/defaults/pccard.conf ${RD}/mfsfd/etc/defaults/pccard.conf
+.endif
 	cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
 	cd ${RD}/trees/bin && ls ${BOOT1} | cpio -dump ${RD}/mfsfd/stand
 	( for F in netconfig protocols ; do \
@@ -635,6 +637,9 @@
 	-test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd
 	@mkdir -p ${RD}/mfsfd/boot
 	@cp /boot/boot* ${RD}/mfsfd/boot
+.if ${MACHINE} == "i386"
+	@cp /boot/mbr ${RD}/mfsfd/boot
+.endif
 	@cp /boot/loader.help ${RD}/mfsfd/boot
 	@cd ${.CURDIR} && ${MAKE} createBOOTMFS 
 .if exists(${.CURDIR}/${MACHINE}/drivers.conf)

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