From cc25cbe9b006c00a1c20e8ff9e7343203486d48b Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 17 Dec 2007 13:47:29 +0000 Subject: [PATCH] Don't hardcode limits for the floppy number on amd64. Just let it use as many floppies as necessary. --- distrib/amd64/floppies/bootfloppy-big/Makefile | 3 +-- distrib/amd64/floppies/bootfloppy-com/Makefile | 3 +-- distrib/amd64/floppies/bootfloppy/Makefile | 3 +-- distrib/amd64/floppies/common/Makefile.bootfloppy | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/distrib/amd64/floppies/bootfloppy-big/Makefile b/distrib/amd64/floppies/bootfloppy-big/Makefile index 7f094d9df1bc..c0a82bb956fd 100644 --- a/distrib/amd64/floppies/bootfloppy-big/Makefile +++ b/distrib/amd64/floppies/bootfloppy-big/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/04/24 19:00:30 snj Exp $ +# $NetBSD: Makefile,v 1.3 2007/12/17 13:47:29 joerg Exp $ # This Makefile builds a boot image on a 2.88M-sized image. # @@ -15,7 +15,6 @@ # be used to burn a CD. FLOPPYBASE= boot-big -FLOPPYSIZE= 5760 FLOPPYPAD= 1 FLOPPYKERNEL= netbsd-INSTALL.gz diff --git a/distrib/amd64/floppies/bootfloppy-com/Makefile b/distrib/amd64/floppies/bootfloppy-com/Makefile index 36e26252c190..2a07bcbd4ad9 100644 --- a/distrib/amd64/floppies/bootfloppy-com/Makefile +++ b/distrib/amd64/floppies/bootfloppy-com/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2007/03/06 21:52:45 bouyer Exp $ +# $NetBSD: Makefile,v 1.6 2007/12/17 13:47:30 joerg Exp $ FLOPPYBASE= boot-com -FLOPPYMAX= 3 FLOPPYKERNEL= netbsd-INSTALL.gz FLOPPYBOOTOPTIONS= -o console=com0 diff --git a/distrib/amd64/floppies/bootfloppy/Makefile b/distrib/amd64/floppies/bootfloppy/Makefile index bd3962817fbc..203739345eec 100644 --- a/distrib/amd64/floppies/bootfloppy/Makefile +++ b/distrib/amd64/floppies/bootfloppy/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2007/03/06 21:52:45 bouyer Exp $ +# $NetBSD: Makefile,v 1.5 2007/12/17 13:47:29 joerg Exp $ FLOPPYBASE= boot -FLOPPYMAX= 3 FLOPPYKERNEL= netbsd-INSTALL.gz .include "${.CURDIR}/../common/Makefile.bootfloppy" diff --git a/distrib/amd64/floppies/common/Makefile.bootfloppy b/distrib/amd64/floppies/common/Makefile.bootfloppy index bb03ab496cc9..7cb4c365a2c9 100644 --- a/distrib/amd64/floppies/common/Makefile.bootfloppy +++ b/distrib/amd64/floppies/common/Makefile.bootfloppy @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootfloppy,v 1.7 2006/06/02 22:11:52 hubertf Exp $ +# $NetBSD: Makefile.bootfloppy,v 1.8 2007/12/17 13:47:30 joerg Exp $ # # Makefile snippet to create a set of USTAR floppies # @@ -18,7 +18,6 @@ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" -FLOPPYMAX?= 1 FLOPPYSIZE?= 2880 .if defined(FLOPPYSIZE) && (${FLOPPYSIZE} != 2880) FLOPPYMETAFILE!= printf "USTAR.volsize.%o" ${FLOPPYSIZE}