From 4a2d414f61103baece8049f2dc04b283fe09dbbb Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Mon, 21 Oct 2002 14:21:08 +0000
Subject: Make floppy-making part of release.9 conditional on *BOOTSIZE rather
 than on "pc98" (rev. 1.710) and "sparc64" (rev. 1.711).

---
 release/Makefile | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

(limited to 'release/Makefile')

diff --git a/release/Makefile b/release/Makefile
index ea0177766f70..6f2f5f87983f 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -657,7 +657,7 @@ release.9:
 .if ${TARGET_ARCH} == "alpha"
 	rm -rf ${RD}/mfsfd/stand/help/*
 .endif
-.if ${TARGET} == "pc98"
+.if defined(SMALLBOOTSIZE)
 .if exists(${.CURDIR}/${TARGET}/drivers-small.conf)
 	@rm -rf ${RD}/mfsfd/stand/modules
 	@mkdir -p ${RD}/mfsfd/stand/modules
@@ -671,22 +671,9 @@ release.9:
 	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot-small.flp \
 		${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot-small.gz \
 		${BOOTINODE} ${SMALLBOOTLABEL}
-.if exists(${.CURDIR}/${TARGET}/drivers.conf)
-	@rm -rf ${RD}/mfsfd/stand/modules
-	@mkdir -p ${RD}/mfsfd/stand/modules
-	@awk -f  ${.CURDIR}/scripts/driver-copy2.awk 2 \
-	    ${.CURDIR}/${TARGET}/drivers.conf \
-	    ${RD}/trees/base/boot/kernel ${RD}/mfsfd/stand/modules
 .endif
-	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \
-		${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
-	@gzip -9vc mfsroot > mfsroot.gz
-	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
-		${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
-	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL
-	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
-.else
 .if exists(${.CURDIR}/${TARGET}/drivers.conf)
+	@rm -rf ${RD}/mfsfd/stand/modules
 	@mkdir -p ${RD}/mfsfd/stand/modules
 	@awk -f  ${.CURDIR}/scripts/driver-copy2.awk 2 \
 	    ${.CURDIR}/${TARGET}/drivers.conf \
@@ -706,11 +693,15 @@ release.9:
 	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \
 		${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
 	@gzip -9vc mfsroot > mfsroot.gz
-.if ${TARGET_ARCH} != "sparc64"
+.if defined(BOOTSIZE)
 	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
 		${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
 	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
 .endif
+.if defined(SMALLBOOTSIZE)
+	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL
+.endif
+.if defined(BIGBOOTSIZE)
 	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG
 .endif
 	@rm mfsroot mfsroot.gz
-- 
cgit v1.2.3