Use ${TOOL_INSTALLBOOT} - it does work on ustarfs filesytems.

Pass correct option to installboot for bootfloppy-com (serial bootfloppy).
This commit is contained in:
dsl 2003-07-26 08:26:07 +00:00
parent 34f6042f4f
commit ebaaf5a296
2 changed files with 6 additions and 5 deletions

View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.4 2002/11/18 12:39:45 lukem Exp $
# $NetBSD: Makefile,v 1.5 2003/07/26 08:26:07 dsl Exp $
FLOPPYBASE= boot-com
FLOPPYMAX= 2
FLOPPYKERNEL= netbsd-INSTALL.gz
FLOPPY_BOOT= ${DESTDIR}/usr/mdec/biosboot_com0.sym # Serial output
FLOPPYBOOTOPTIONS= -o console=com0
.include "${.CURDIR}/../common/Makefile.bootfloppy"

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.bootfloppy,v 1.15 2003/07/25 21:19:48 dsl Exp $
# $NetBSD: Makefile.bootfloppy,v 1.16 2003/07/26 08:26:08 dsl Exp $
#
# Makefile snippet to create a set of USTAR floppies
#
@ -11,7 +11,8 @@
#
# Optional variables:
# FLOPPYKERNDIR ${FLOPPYKERNEL} is from ${.CURDIR}/../${FLOPPYKERNDIR}
# FLOPPY_BOOT Bootstrap to use. [${DESTDIR}/usr/mdec/biosboot.sym]
# FLOPPY_BOOT Bootstrap to use. [${DESTDIR}/usr/mdec/biosboot]
# FLOPPYBOOTOPTIONS Options for installboot, eg -o console=com0
#
.include <bsd.own.mk>
@ -27,7 +28,7 @@ FLOPPYSIZE= 2880
FLOPPYKERNDIR?= instkernel
FLOPPYSUFFIX?= .fs
MDEC= ${DESTDIR}/usr/mdec
FLOPPYINSTBOOT= "dd conv=notrunc if=${MDEC}/bootxx_ustarfs of=@IMAGE@"
FLOPPYINSTBOOT= "${TOOL_INSTALLBOOT} ${FLOPPYBOOTOPTIONS} -m${MACHINE} @IMAGE@ ${MDEC}/bootxx_ustarfs"
FLOPPYKERNOBJ!= cd ${.CURDIR}/../${FLOPPYKERNDIR} && ${PRINTOBJDIR}
FLOPPY_BOOT?= ${MDEC}/biosboot