Subject: Re: CVS commit: basesrc/distrib/x68k/floppies
To: None <isaki@NetBSD.org>
From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
List: source-changes
Date: 05/19/2002 03:56:46
In article <20020519024133T.isaki@NetBSD.org>
isaki@NetBSD.org wrote:
> This broke sysinst.fs, kern1.fs.
> On floppy boot, I got this message on console:
> -------------------------
> boot_ustart: Illegal secondary boot
> [Hit key to reboot]
:
> How do I fix it ?
It seems "USTAR.volsize.xxxx" is not used for FLOPPYMETAFILE
but used for filename of the secondary boot on x68k.
How about the attached patch? (not tested, though)
---
Izumi Tsutsui
tsutsui@ceres.dti.ne.jp
Index: bootfloppy.generic/Makefile
===================================================================
RCS file: /cvsroot/basesrc/distrib/x68k/floppies/bootfloppy.generic/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- bootfloppy.generic/Makefile 2002/05/13 01:04:19 1.4
+++ bootfloppy.generic/Makefile 2002/05/18 18:48:51
@@ -7,8 +7,8 @@
FLOPPYBASE= kern
FLOPPYSIZE= 2400
-FLOPPYMETAFILE!=printf "USTAR.volsize.%o" ${FLOPPYSIZE}
-FLOPPYFILES= boot ${FLOPPYMETAFILE} netbsd
+BOOTNAME!= printf "USTAR.volsize.%o" ${FLOPPYSIZE}
+FLOPPYFILES= ${BOOTNAME} netbsd
FLOPPYSUFFIX= .fs
FLOPPY_RELEASEDIR= installation/floppy
@@ -16,10 +16,14 @@
MDEC= ${DESTDIR}/usr/mdec
KERNOBJ!= cd ${.CURDIR}/../instkernel && ${PRINTOBJDIR}
FLOPPY_NETBSD= ${KERNOBJDIR}/GENERIC/netbsd
-FLOPPY_BOOT= ${MDEC}/boot
# XXXDISTRIB: use MI installboot
FLOPPYINSTBOOT=\
"dd if=${MDEC}/fdboot_ustar of=@IMAGE@ bs=8k count=1 conv=sync,notrunc"
+
+${BOOTNAME}: ${MDEC}/boot
+ @echo "Copying ${.ALLSRC} to ${.TARGET}"
+ @rm -f ${.TARGET}
+ @cp ${.ALLSRC} ${.TARGET}
.include "${DISTRIBDIR}/common/Makefile.tarfloppy"
Index: bootfloppy.sysinst/Makefile
===================================================================
RCS file: /cvsroot/basesrc/distrib/x68k/floppies/bootfloppy.sysinst/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- bootfloppy.sysinst/Makefile 2002/05/13 01:04:19 1.9
+++ bootfloppy.sysinst/Makefile 2002/05/18 18:48:52
@@ -7,8 +7,8 @@
FLOPPYBASE= sysinst
FLOPPYSIZE= 2400
-FLOPPYMETAFILE!=printf "USTAR.volsize.%o" ${FLOPPYSIZE}
-FLOPPYFILES= boot ${FLOPPYMETAFILE} netbsd
+BOOTNAME!= printf "USTAR.volsize.%o" ${FLOPPYSIZE}
+FLOPPYFILES= ${BOOTNAME} netbsd
FLOPPYSUFFIX= .fs
FLOPPY_RELEASEDIR= installation/floppy
@@ -16,10 +16,14 @@
MDEC= ${DESTDIR}/usr/mdec
KERNOBJ!= cd ${.CURDIR}/../instkernel && ${PRINTOBJDIR}
FLOPPY_NETBSD= ${KERNOBJ}/netbsd.INSTALL.gz
-FLOPPY_BOOT= ${MDEC}/boot
# XXXDISTRIB: use MI installboot
FLOPPYINSTBOOT=\
"dd if=${MDEC}/fdboot_ustar of=@IMAGE@ bs=8k count=1 conv=sync,notrunc"
+
+${BOOTNAME}: ${MDEC}/boot
+ @echo "Copying ${.ALLSRC} to ${.TARGET}"
+ @rm -f ${.TARGET}
+ @cp ${.ALLSRC} ${.TARGET}
.include "${DISTRIBDIR}/common/Makefile.tarfloppy"