summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2002-05-25 16:13:52 +0000
committerru <ru@FreeBSD.org>2002-05-25 16:13:52 +0000
commitcd1298b341eb52b42a1ede4b685573ec6b2359ad (patch)
tree5fe6e9045c6e617cae4da54070d101c299fb7ce4 /release
parent324a67fe9d58173f1a1d6a5b7451237894e96c22 (diff)
downloadFreeBSD-src-cd1298b341eb52b42a1ede4b685573ec6b2359ad.zip
FreeBSD-src-cd1298b341eb52b42a1ede4b685573ec6b2359ad.tar.gz
PC98 creates different BOOTMFS configs for different floppy sizes.
Broken in: rev. 1.672 Spotted by: nyan
Diffstat (limited to 'release')
-rw-r--r--release/Makefile26
1 files changed, 14 insertions, 12 deletions
diff --git a/release/Makefile b/release/Makefile
index 2fb5f9a..2aad694 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -643,18 +643,6 @@ release.9:
@cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot
.endif
@cp ${RD}/trees/base/boot/loader.help ${RD}/mfsfd/boot
- @cd ${.CURDIR}/../sys/${TARGET}/conf && \
- sh ${.CURDIR}/${TARGET_ARCH}/dokern.sh ${FDSIZE} < GENERIC > BOOTMFS && \
- [ -r GENERIC.hints ] && cp GENERIC.hints BOOTMFS.hints
-.if exists(${.CURDIR}/${TARGET}/drivers.conf)
- @awk -f ${.CURDIR}/scripts/driver-remove.awk \
- ${.CURDIR}/${TARGET}/drivers.conf \
- ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS
- @mkdir -p ${RD}/mfsfd/stand/modules
- @awk -f ${.CURDIR}/scripts/driver-copy2.awk \
- ${.CURDIR}/${TARGET}/drivers.conf \
- ${RD}/trees/base/boot/kernel ${RD}/mfsfd/stand/modules
-.endif
@echo "Making the regular boot floppy."
@tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \
tar xf - -C ${RD}/mfsfd/stand
@@ -663,6 +651,12 @@ release.9:
.if ${TARGET_ARCH} == "alpha"
rm -rf ${RD}/mfsfd/stand/help/*
.endif
+.if exists(${.CURDIR}/${TARGET}/drivers.conf)
+ @mkdir -p ${RD}/mfsfd/stand/modules
+ @awk -f ${.CURDIR}/scripts/driver-copy2.awk \
+ ${.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
@@ -927,6 +921,14 @@ installCRUNCH:
doMFSKERN:
@echo "Running ${.TARGET} for ${FSIMAGE}"
@rm -f ${RD}/kernels/BOOTMFS ${RD}/kernels/BOOTMFS.${FSIMAGE}
+ @cd ${.CURDIR}/../sys/${TARGET}/conf && \
+ sh ${.CURDIR}/${TARGET_ARCH}/dokern.sh ${FDSIZE} < GENERIC > BOOTMFS && \
+ [ -r GENERIC.hints ] && cp GENERIC.hints BOOTMFS.hints
+.if exists(${.CURDIR}/${TARGET}/drivers.conf)
+ @awk -f ${.CURDIR}/scripts/driver-remove.awk \
+ ${.CURDIR}/${TARGET}/drivers.conf \
+ ${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS
+.endif
cd ${.CURDIR}/..; \
KERNEL_KO=BOOTMFS KODIR= \
${CROSSMAKE} ${KERNEL_FLAGS} -DNO_WERROR -DNO_MODULES -DNO_KERNELCLEAN \
OpenPOWER on IntegriCloud