Date: Fri, 29 Mar 2002 21:49:03 -0800 (PST) From: Murray Stokely <murray@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8656 for review Message-ID: <200203300549.g2U5n3533276@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203300549.g2U5n3533276>