Put secondary boot loader correctly.

patch from Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
This commit is contained in:
isaki 2002-05-19 08:12:05 +00:00
parent 691d519c66
commit 4aa2c0e5c6
2 changed files with 16 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2002/05/13 01:04:19 lukem Exp $
# $NetBSD: Makefile,v 1.5 2002/05/19 08:12:05 isaki Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@ -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,11 +16,15 @@ FLOPPY_RELEASEDIR= installation/floppy
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"
.include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2002/05/13 01:04:19 lukem Exp $
# $NetBSD: Makefile,v 1.10 2002/05/19 08:12:06 isaki Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@ -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,11 +16,15 @@ FLOPPY_RELEASEDIR= installation/floppy
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"
.include <bsd.prog.mk>