Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the new common/Makefile.bootcd to make i386 and amd64 bootable ISO 

images. amd64 gets a single kernel; i386 images gets 3 kernels:
- netbsd, copy from netbsd-INSTALL_LARGE.gz, loaded by default
- nbsd-l, copy from netbsd-INSTALL_LAPTOP.gz
- nbsd-i, copy from netbsd-INSTALL.gz for those who want the traditionnal
  non-ACPI kernel
- drop the bootcd-laptop image
both gets an installcd image, which is the same as bootcd but with the
binary sets in addition to kernels.
This commit is contained in:
bouyer 2007-03-06 21:52:44 +00:00
parent ff6bcd05a5
commit 04825266e6
16 changed files with 60 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distrib/amd64/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2006/06/02 22:35:21 hubertf Exp $
# $NetBSD: Makefile,v 1.4 2007/03/06 21:52:44 bouyer Exp $
SUBDIR=
SUBDIR+= ramdisks
@ -7,6 +7,9 @@ SUBDIR+= instkernel
SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= floppies
TARGETS+= release
TARGETS+= release
iso_image:
${MAKEDIRTARGET} cdroms iso_image
.include <bsd.subdir.mk>

6
distrib/amd64/cdroms/Makefile
View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.2 2006/10/29 17:58:16 hubertf Exp $
# $NetBSD: Makefile,v 1.3 2007/03/06 21:52:44 bouyer Exp $
SUBDIR=
SUBDIR+= bootcd
SUBDIR+= bootcd-com
#SUBDIR+= installcd
SUBDIR+= installcd
TARGETS+= release
TARGETS+= release iso_image
.include <bsd.subdir.mk>

4
distrib/amd64/cdroms/Makefile.cdrom Normal file
View File

@ -0,0 +1,4 @@
# $NetBSD: Makefile.cdrom,v 1.1 2007/03/06 21:52:44 bouyer Exp $
CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot
CDINSTKERNEL= ../../instkernel

6
distrib/amd64/cdroms/bootcd-com/Makefile
View File

@ -1,8 +1,10 @@
# $NetBSD: Makefile,v 1.1 2006/06/02 22:35:22 hubertf Exp $
# $NetBSD: Makefile,v 1.2 2007/03/06 21:52:45 bouyer Exp $
#
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= boot-com # gives ${CDBASE}.iso
CDKERNEL= netbsd-INSTALL.gz # from ../instkernel
CDKERNELS= netbsd-INSTALL.gz netbsd # from ../instkernel
CDBOOTOPTIONS= -o console=com0
.include "${.CURDIR}/../../../common/Makefile.bootcd"

6
distrib/amd64/cdroms/bootcd/Makefile
View File

@ -1,7 +1,9 @@
# $NetBSD: Makefile,v 1.1 2006/06/02 22:35:22 hubertf Exp $
# $NetBSD: Makefile,v 1.2 2007/03/06 21:52:45 bouyer Exp $
#
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= boot # gives ${CDBASE}.iso
CDKERNEL= netbsd-INSTALL.gz # from ../instkernel
CDKERNELS= netbsd-INSTALL.gz netbsd # from ../instkernel
.include "${.CURDIR}/../../../common/Makefile.bootcd"

8
distrib/amd64/cdroms/installcd/Makefile
View File

@ -1,8 +1,10 @@
# $NetBSD: Makefile,v 1.1 2006/10/29 17:58:16 hubertf Exp $
# $NetBSD: Makefile,v 1.2 2007/03/06 21:52:45 bouyer Exp $
#
CDBASE= boot # gives ${CDBASE}.iso
CDKERNEL= netbsd-INSTALL.gz # from ../instkernel
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= amd64cd # gives ${CDBASE}.iso
CDKERNELS= netbsd-INSTALL.gz netbsd # from ../instkernel
CDRELEASE= true # include $RELEASEDIR/$MACHINE
.include "${.CURDIR}/../../../common/Makefile.bootcd"

3
distrib/amd64/floppies/Makefile
View File

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.2 2006/06/02 22:11:52 hubertf Exp $
# $NetBSD: Makefile,v 1.3 2007/03/06 21:52:45 bouyer Exp $
SUBDIR=
SUBDIR+= bootfloppy
SUBDIR+= bootfloppy-big
SUBDIR+= bootfloppy-com
TARGETS+= release

4
distrib/amd64/floppies/bootfloppy-com/Makefile
View File

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.4 2004/09/13 22:35:05 fvdl Exp $
# $NetBSD: Makefile,v 1.5 2007/03/06 21:52:45 bouyer Exp $
FLOPPYBASE= boot-com
FLOPPYMAX= 2
FLOPPYMAX= 3
FLOPPYKERNEL= netbsd-INSTALL.gz
FLOPPYBOOTOPTIONS= -o console=com0

4
distrib/amd64/floppies/bootfloppy/Makefile
View File

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.3 2004/09/13 22:35:05 fvdl Exp $
# $NetBSD: Makefile,v 1.4 2007/03/06 21:52:45 bouyer Exp $
FLOPPYBASE= boot
FLOPPYMAX= 2
FLOPPYMAX= 3
FLOPPYKERNEL= netbsd-INSTALL.gz
.include "${.CURDIR}/../common/Makefile.bootfloppy"

5
distrib/i386/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2006/06/02 22:35:22 hubertf Exp $
# $NetBSD: Makefile,v 1.5 2007/03/06 21:52:45 bouyer Exp $
SUBDIR=
SUBDIR+= ramdisks
@ -9,4 +9,7 @@ SUBDIR+= cdroms
SUBDIR+= floppies
TARGETS+= release
iso_image:
${MAKEDIRTARGET} cdroms iso_image
.include <bsd.subdir.mk>

7
distrib/i386/cdroms/Makefile
View File

@ -1,11 +1,10 @@
# $NetBSD: Makefile,v 1.3 2006/11/18 20:15:59 dsl Exp $
# $NetBSD: Makefile,v 1.4 2007/03/06 21:52:45 bouyer Exp $
SUBDIR=
SUBDIR+= bootcd
SUBDIR+= bootcd-com
SUBDIR+= bootcd-laptop
#SUBDIR+= installcd
SUBDIR+= installcd
TARGETS+= release
TARGETS+= release iso_image
.include <bsd.subdir.mk>

4
distrib/i386/cdroms/Makefile.cdrom Normal file
View File

@ -0,0 +1,4 @@
# $NetBSD: Makefile.cdrom,v 1.1 2007/03/06 21:52:45 bouyer Exp $
CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot
CDINSTKERNEL= ../../instkernel

8
distrib/i386/cdroms/bootcd-com/Makefile
View File

@ -1,8 +1,12 @@
# $NetBSD: Makefile,v 1.1 2006/06/02 22:35:22 hubertf Exp $
# $NetBSD: Makefile,v 1.2 2007/03/06 21:52:46 bouyer Exp $
#
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= boot-com # gives ${CDBASE}.iso
CDKERNEL= netbsd-INSTALL.gz # from ../instkernel
CDKERNELS= netbsd-INSTALL_LARGE.gz netbsd # from ../instkernel
CDKERNELS+= netbsd-INSTALL_LAPTOP.gz nbsd-l
CDKERNELS+= netbsd-INSTALL.gz nbsd-i
CDBOOTOPTIONS= -o console=com0
.include "${.CURDIR}/../../../common/Makefile.bootcd"

7
distrib/i386/cdroms/bootcd-laptop/Makefile
View File

@ -1,7 +0,0 @@
# $NetBSD: Makefile,v 1.1 2006/06/02 22:35:22 hubertf Exp $
#
CDBASE= boot-laptop # gives ${CDBASE}.iso
CDKERNEL= netbsd-INSTALL_LAPTOP.gz # from ../instkernel
.include "${.CURDIR}/../../../common/Makefile.bootcd"

8
distrib/i386/cdroms/bootcd/Makefile
View File

@ -1,7 +1,11 @@
# $NetBSD: Makefile,v 1.1 2006/06/02 22:35:22 hubertf Exp $
# $NetBSD: Makefile,v 1.2 2007/03/06 21:52:46 bouyer Exp $
#
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= boot # gives ${CDBASE}.iso
CDKERNEL= netbsd-INSTALL.gz # from ../instkernel
CDKERNELS= netbsd-INSTALL_LARGE.gz netbsd # from ../instkernel
CDKERNELS+= netbsd-INSTALL_LAPTOP.gz nbsd-l
CDKERNELS+= netbsd-INSTALL.gz nbsd-i
.include "${.CURDIR}/../../../common/Makefile.bootcd"

10
distrib/i386/cdroms/installcd/Makefile
View File

@ -1,11 +1,15 @@
# $NetBSD: Makefile,v 1.1 2006/10/29 17:58:15 hubertf Exp $
# $NetBSD: Makefile,v 1.2 2007/03/06 21:52:46 bouyer Exp $
#
# Install CD, to be made after 'build.sh release'
# Requires populated $RELEASEDIR/${MACHINE}
CDBASE= boot # gives ${CDBASE}.iso
CDKERNEL= netbsd-INSTALL.gz # from ../instkernel
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= i386cd # gives ${CDBASE}.iso
CDKERNELS= netbsd-INSTALL_LARGE.gz netbsd # from ../instkernel
CDKERNELS+= netbsd-INSTALL_LAPTOP.gz nbsd-l
CDKERNELS+= netbsd-INSTALL.gz nbsd-i
CDRELEASE= true # include $RELEASEDIR/$MACHINE
.include "${.CURDIR}/../../../common/Makefile.bootcd"