- Remove obsolete PC-card boot.flp hack. It was for making both PC-card

  boot.flp and plain boot.flp.
- Clean up crunchgen related routine.

- Add PC-98 support.
  TODO:
    o Documentation
    o Fix some messages for PC-98
    o Decrease the size of fixit.flp to 1.2MB
    o I18N (See: http://www.jp.FreeBSD.org/BootAsia/index.html)

No response from jkh

1 files changed, 32 insertions, 24 deletions

diff --git a/release/Makefile b/release/Makefile
index 21decf8..9320451 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -88,17 +88,29 @@ MNT=			/mnt
 
 # Various floppy image parameters.
 #
+.if ${MACHINE} == "pc98"
+BOOTSIZE=		1200
+FIXITSIZE=		1440
+MFSSIZE=		2880
+BOOTINODE=		80000
+FIXITINODE=		4000
+MFSINODE=		8000
+BOOTLABEL=		fd1200
+FIXITLABEL=		fd1440
+MFSLABEL=		minimum2
+.else
 BOOTSIZE=		1440
 FIXITSIZE=		1440
 MFSSIZE=		2880
 BIGBOOTSIZE=		2880
 BOOTINODE=		80000
-MFSINODE=		8000
 FIXITINODE=		4000
+MFSINODE=		8000
 BOOTLABEL=		fd1440
 FIXITLABEL=		fd1440
-BIGBOOTLABEL=		minimum2
 MFSLABEL=		minimum2
+BIGBOOTLABEL=		minimum2
+.endif
 
 # overrides.
 .if ${MACHINE_ARCH} == "alpha"
@@ -142,9 +154,8 @@ BOOTSTRAPUTILS+= /usr/bin/cpio
 CRUNCH_TARGETS=	boot fixit
 .endif
 
-.if ${MACHINE_ARCH} == "i386"
-# Make both PC-card boot.flp and plain boot.flp
-EXTRAS= floppies cdrom.1 ftp.1
+.if ${MACHINE} == "pc98"
+EXTRAS= ftp.1
 .else
 EXTRAS= cdrom.1 ftp.1
 .endif
@@ -291,7 +302,8 @@ rerelease release:
 	chroot ${CHROOTDIR} /mk
 
 clean:
-	rm -rf boot_crunch ${.OBJDIR}/boot_crunch.conf release.[0-9]
+	rm -rf boot_crunch release.[0-9]
+	rm -rf ${.OBJDIR}/boot_crunch.conf ${.OBJDIR}/fixit_crunch.conf
 
 # Clean out ${_R} and make the directory structure.
 release.1:
@@ -359,19 +371,18 @@ release.3:
 # See /usr/src/bin/ls/Makefile.
 release.4:
 	@mkdir -p /stand
-	cp ${.CURDIR}/boot_crunch.conf.generic ${.OBJDIR}/boot_crunch.conf
 	cd ${.CURDIR}/sysinstall && make obj depend all install
 	rm -rf ${RD}/crunch
 	mkdir -p ${RD}/crunch
 	export RELEASE_BUILD_FIXIT=noway ; \
 	for j in ${CRUNCH_TARGETS} ; do \
+		sed -e "s:MACHINE:${MACHINE}:" \
+			${.CURDIR}/$${j}_crunch.conf > \
+			${.OBJDIR}/$${j}_crunch.conf && \
 		rm -rf $${j}_crunch && \
 		mkdir $${j}_crunch && \
 		( cd $${j}_crunch && \
-		  ( ( [ -f ${.CURDIR}/$${j}_crunch.conf ] && \
-		    crunchgen ${.CURDIR}/$${j}_crunch.conf ) || \
-		    ( [ -f ${.OBJDIR}/$${j}_crunch.conf ] && \
-		    crunchgen ${.OBJDIR}/$${j}_crunch.conf ) ) && \
+		  crunchgen ${.OBJDIR}/$${j}_crunch.conf && \
 		  ${MAKE} -DRELEASE_CRUNCH -f $${j}_crunch.mk subclean all \
 		    NOCRYPT=yes "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY") && \
 		mv $${j}_crunch/$${j}_crunch ${RD}/crunch/$${j} && \
@@ -529,7 +540,9 @@ release.8: write_mfs_in_kernel
 	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
 		${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
 	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
+.if ${MACHINE} != "pc98"
 	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot BIGBOOT=YES
+.endif
 	@rm mfsroot mfsroot.gz mfsroot.size
 	@echo "Regular and MFS boot floppies made."
 	touch release.8
@@ -718,15 +731,9 @@ installCRUNCH:
 		ln -f ${RD}/crunch/${CRUNCH} ${DIR}/${CRUNCH}_crunch ; \
 	fi
 	@chmod 555 ${DIR}/${CRUNCH}_crunch
-	@if [ -f ${.OBJDIR}/${CRUNCH}_crunch.conf ] ; then \
-		for i in `crunchgen -l ${.OBJDIR}/${CRUNCH}_crunch.conf` ; do \
-			ln -f ${DIR}/${CRUNCH}_crunch ${DIR}/$$i ; \
-		done \
-	else \
-		for i in `crunchgen -l ${.CURDIR}/${CRUNCH}_crunch.conf` ; do \
-			ln -f ${DIR}/${CRUNCH}_crunch ${DIR}/$$i ; \
-		done \
-	fi
+	@for i in `crunchgen -l ${.OBJDIR}/${CRUNCH}_crunch.conf` ; do \
+		ln -f ${DIR}/${CRUNCH}_crunch ${DIR}/$$i ; \
+	done
 
 #
 # --==## Compile a kernel by name ${KERNEL} ##==--
@@ -736,7 +743,7 @@ installCRUNCH:
 #
 doKERNEL:
 	@rm -f ${RD}/kernels/${KERNEL}
-	@cd ${.CURDIR}/../sys/${MACHINE_ARCH}/conf && config ${KERNEL}
+	@cd ${.CURDIR}/../sys/${MACHINE}/conf && config ${KERNEL}
 	@cd ${.CURDIR}/../sys/compile/${KERNEL} && \
 			make  depend && \
 			make  ${KERNEL} && \
@@ -749,14 +756,15 @@ doKERNEL:
 doMFSKERN:
 	@echo "Running doMFSKERN for ${FSIMAGE}"
 	@rm -f ${RD}/kernels/BOOTMFS.${FSIMAGE}
-	@cd ${.CURDIR}/../sys/${MACHINE_ARCH}/conf && \
+	@cd ${.CURDIR}/../sys/${MACHINE}/conf && \
 	  sh ${.CURDIR}/scripts/dokern.sh ${BIGBOOT} < ${KERNCONF} > BOOTMFS
 .if ${MACHINE_ARCH} == "i386"
-	@echo "options  INTRO_USERCONFIG" >> ${.CURDIR}/../sys/i386/conf/BOOTMFS
+	@echo "options  INTRO_USERCONFIG" >> \
+	  ${.CURDIR}/../sys/${MACHINE}/conf/BOOTMFS
 .endif
 .if defined(BIGBOOT)
 	@echo "options \"MD_ROOT_SIZE=`cat mfsroot.size`\"" >> \
-	  ${.CURDIR}/../sys/${MACHINE_ARCH}/conf/BOOTMFS
+	  ${.CURDIR}/../sys/${MACHINE}/conf/BOOTMFS
 .endif
 	@cd ${.CURDIR} && ${MAKE} doKERNEL KERNEL=BOOTMFS
 	@rm -rf ${RD}/image.${FSIMAGE}