From fee07bcfd46712df4999afae96be21baa7762e08 Mon Sep 17 00:00:00 2001 From: bouyer Date: Tue, 6 Mar 2007 21:56:47 +0000 Subject: [PATCH] Add an iso_image target (iso-image as a target name doesn't play well with bsd.subdirs.mk) in distrib/makefile, which builds an iso image for $MACHINE with binary sets, stored in ${RELEASEDIR}/iso. The image is bootable for: alpha, amd64, cats, i386, pmax, sgimips, sparc, sparc64, sun3, vax. mac68k/macppc no there yet because of missing feature in makefs. call iso_image in distrib/ for iso-image in the top Makefile. --- Makefile | 3 ++- distrib/Makefile | 3 ++- distrib/Makefile.inc | 4 +++- distrib/acorn26/Makefile | 7 ++++-- distrib/acorn26/cdroms/Makefile | 6 +++++ distrib/acorn26/cdroms/installcd/Makefile | 5 +++++ distrib/acorn32/Makefile | 7 ++++-- distrib/acorn32/cdroms/Makefile | 6 +++++ distrib/acorn32/cdroms/installcd/Makefile | 5 +++++ distrib/alpha/Makefile | 7 ++++-- distrib/alpha/cdroms/Makefile | 6 +++++ distrib/alpha/cdroms/installcd/Makefile | 12 ++++++++++ distrib/amiga/Makefile | 7 ++++-- distrib/amiga/cdroms/Makefile | 6 +++++ distrib/amiga/cdroms/installcd/Makefile | 5 +++++ distrib/arc/Makefile | 7 ++++-- distrib/arc/cdroms/Makefile | 6 +++++ distrib/arc/cdroms/installcd/Makefile | 5 +++++ distrib/atari/Makefile | 7 ++++-- distrib/atari/cdroms/Makefile | 6 +++++ distrib/atari/cdroms/installcd/Makefile | 5 +++++ distrib/cats/Makefile | 7 ++++-- distrib/cats/cdroms/Makefile | 6 +++++ distrib/cats/cdroms/installcd/Makefile | 7 ++++++ distrib/dreamcast/Makefile | 7 ++++-- distrib/dreamcast/cdroms/Makefile | 6 +++++ distrib/dreamcast/cdroms/installcd/Makefile | 5 +++++ distrib/evbarm/Makefile | 7 ++++-- distrib/evbarm/cdroms/Makefile | 6 +++++ distrib/evbarm/cdroms/installcd/Makefile | 5 +++++ distrib/evbmips/Makefile | 7 ++++-- distrib/evbmips/cdroms/Makefile | 6 +++++ distrib/evbmips/cdroms/installcd/Makefile | 5 +++++ distrib/evbppc/Makefile | 7 ++++-- distrib/evbppc/cdroms/Makefile | 6 +++++ distrib/evbppc/cdroms/installcd/Makefile | 5 +++++ distrib/ews4800mips/Makefile | 5 ++++- distrib/ews4800mips/cdroms/Makefile | 6 +++++ distrib/ews4800mips/cdroms/installcd/Makefile | 5 +++++ distrib/hp300/Makefile | 7 ++++-- distrib/hp300/cdroms/Makefile | 6 +++++ distrib/hp300/cdroms/installcd/Makefile | 5 +++++ distrib/hp700/Makefile | 7 ++++-- distrib/hp700/cdroms/Makefile | 6 +++++ distrib/hp700/cdroms/installcd/Makefile | 5 +++++ distrib/hpcarm/Makefile | 10 +++++++-- distrib/hpcarm/cdroms/Makefile | 6 +++++ distrib/hpcarm/cdroms/installcd/Makefile | 5 +++++ distrib/hpcmips/Makefile | 9 +++++++- distrib/hpcmips/cdroms/Makefile | 6 +++++ distrib/hpcmips/cdroms/installcd/Makefile | 5 +++++ distrib/hpcsh/Makefile | 9 +++++++- distrib/hpcsh/cdroms/Makefile | 6 +++++ distrib/hpcsh/cdroms/installcd/Makefile | 5 +++++ distrib/ibmnws/Makefile | 7 ++++-- distrib/ibmnws/cdroms/Makefile | 6 +++++ distrib/ibmnws/cdroms/installcd/Makefile | 5 +++++ distrib/macppc/Makefile | 7 ++++-- distrib/macppc/cdroms/Makefile | 6 +++++ distrib/macppc/cdroms/installcd/Makefile | 5 +++++ distrib/mipsco/Makefile | 7 ++++-- distrib/mipsco/cdroms/Makefile | 6 +++++ distrib/mipsco/cdroms/installcd/Makefile | 5 +++++ distrib/mvme68k/Makefile | 7 ++++-- distrib/mvme68k/cdroms/Makefile | 6 +++++ distrib/mvme68k/cdroms/installcd/Makefile | 5 +++++ distrib/mvmeppc/Makefile | 8 +++++-- distrib/mvmeppc/cdroms/Makefile | 6 +++++ distrib/mvmeppc/cdroms/installcd/Makefile | 5 +++++ distrib/news68k/Makefile | 7 ++++-- distrib/news68k/cdroms/Makefile | 6 +++++ distrib/news68k/cdroms/installcd/Makefile | 5 +++++ distrib/newsmips/Makefile | 7 ++++-- distrib/newsmips/cdroms/Makefile | 6 +++++ distrib/newsmips/cdroms/installcd/Makefile | 5 +++++ distrib/ofppc/Makefile | 8 +++++-- distrib/ofppc/cdroms/Makefile | 6 +++++ distrib/ofppc/cdroms/installcd/Makefile | 5 +++++ distrib/pc532/Makefile | 6 ++++- distrib/pc532/cdroms/Makefile | 6 +++++ distrib/pc532/cdroms/installcd/Makefile | 5 +++++ distrib/playstation2/Makefile | 10 ++++++++- distrib/playstation2/cdroms/Makefile | 6 +++++ .../playstation2/cdroms/installcd/Makefile | 5 +++++ distrib/pmax/Makefile | 7 ++++-- distrib/pmax/cdroms/Makefile | 6 +++++ distrib/pmax/cdroms/installcd/Makefile | 11 ++++++++++ distrib/pmppc/Makefile | 7 ++++-- distrib/pmppc/cdroms/Makefile | 6 +++++ distrib/pmppc/cdroms/installcd/Makefile | 5 +++++ distrib/prep/Makefile | 7 ++++-- distrib/prep/cdroms/Makefile | 6 +++++ distrib/prep/cdroms/installcd/Makefile | 5 +++++ distrib/sandpoint/Makefile | 7 ++++-- distrib/sandpoint/cdroms/Makefile | 6 +++++ distrib/sandpoint/cdroms/installcd/Makefile | 5 +++++ distrib/sgimips/Makefile | 7 ++++-- distrib/sgimips/cdroms/Makefile | 6 +++++ distrib/sgimips/cdroms/installcd/Makefile | 22 +++++++++++++++++++ distrib/shark/Makefile | 7 ++++-- distrib/shark/cdroms/Makefile | 6 +++++ distrib/shark/cdroms/installcd/Makefile | 5 +++++ distrib/sparc/Makefile | 7 ++++-- distrib/sparc/cdroms/Makefile | 6 +++++ distrib/sparc/cdroms/installcd/Makefile | 17 ++++++++++++++ distrib/sparc64/Makefile | 7 ++++-- distrib/sparc64/cdroms/Makefile | 6 +++++ distrib/sparc64/cdroms/installcd/Makefile | 17 ++++++++++++++ distrib/sun2/Makefile | 7 ++++-- distrib/sun2/cdroms/Makefile | 6 +++++ distrib/sun2/cdroms/installcd/Makefile | 5 +++++ distrib/sun3/Makefile | 7 ++++-- distrib/sun3/cdroms/Makefile | 6 +++++ distrib/sun3/cdroms/installcd/Makefile | 18 +++++++++++++++ distrib/vax/Makefile | 7 ++++-- distrib/vax/cdroms/Makefile | 6 +++++ distrib/vax/cdroms/installcd/Makefile | 17 ++++++++++++++ distrib/x68k/Makefile | 7 ++++-- distrib/x68k/cdroms/Makefile | 6 +++++ distrib/x68k/cdroms/installcd/Makefile | 5 +++++ 120 files changed, 726 insertions(+), 76 deletions(-) create mode 100644 distrib/acorn26/cdroms/Makefile create mode 100644 distrib/acorn26/cdroms/installcd/Makefile create mode 100644 distrib/acorn32/cdroms/Makefile create mode 100644 distrib/acorn32/cdroms/installcd/Makefile create mode 100644 distrib/alpha/cdroms/Makefile create mode 100644 distrib/alpha/cdroms/installcd/Makefile create mode 100644 distrib/amiga/cdroms/Makefile create mode 100644 distrib/amiga/cdroms/installcd/Makefile create mode 100644 distrib/arc/cdroms/Makefile create mode 100644 distrib/arc/cdroms/installcd/Makefile create mode 100644 distrib/atari/cdroms/Makefile create mode 100644 distrib/atari/cdroms/installcd/Makefile create mode 100644 distrib/cats/cdroms/Makefile create mode 100644 distrib/cats/cdroms/installcd/Makefile create mode 100644 distrib/dreamcast/cdroms/Makefile create mode 100644 distrib/dreamcast/cdroms/installcd/Makefile create mode 100644 distrib/evbarm/cdroms/Makefile create mode 100644 distrib/evbarm/cdroms/installcd/Makefile create mode 100644 distrib/evbmips/cdroms/Makefile create mode 100644 distrib/evbmips/cdroms/installcd/Makefile create mode 100644 distrib/evbppc/cdroms/Makefile create mode 100644 distrib/evbppc/cdroms/installcd/Makefile create mode 100644 distrib/ews4800mips/cdroms/Makefile create mode 100644 distrib/ews4800mips/cdroms/installcd/Makefile create mode 100644 distrib/hp300/cdroms/Makefile create mode 100644 distrib/hp300/cdroms/installcd/Makefile create mode 100644 distrib/hp700/cdroms/Makefile create mode 100644 distrib/hp700/cdroms/installcd/Makefile create mode 100644 distrib/hpcarm/cdroms/Makefile create mode 100644 distrib/hpcarm/cdroms/installcd/Makefile create mode 100644 distrib/hpcmips/cdroms/Makefile create mode 100644 distrib/hpcmips/cdroms/installcd/Makefile create mode 100644 distrib/hpcsh/cdroms/Makefile create mode 100644 distrib/hpcsh/cdroms/installcd/Makefile create mode 100644 distrib/ibmnws/cdroms/Makefile create mode 100644 distrib/ibmnws/cdroms/installcd/Makefile create mode 100644 distrib/macppc/cdroms/Makefile create mode 100644 distrib/macppc/cdroms/installcd/Makefile create mode 100644 distrib/mipsco/cdroms/Makefile create mode 100644 distrib/mipsco/cdroms/installcd/Makefile create mode 100644 distrib/mvme68k/cdroms/Makefile create mode 100644 distrib/mvme68k/cdroms/installcd/Makefile create mode 100644 distrib/mvmeppc/cdroms/Makefile create mode 100644 distrib/mvmeppc/cdroms/installcd/Makefile create mode 100644 distrib/news68k/cdroms/Makefile create mode 100644 distrib/news68k/cdroms/installcd/Makefile create mode 100644 distrib/newsmips/cdroms/Makefile create mode 100644 distrib/newsmips/cdroms/installcd/Makefile create mode 100644 distrib/ofppc/cdroms/Makefile create mode 100644 distrib/ofppc/cdroms/installcd/Makefile create mode 100644 distrib/pc532/cdroms/Makefile create mode 100644 distrib/pc532/cdroms/installcd/Makefile create mode 100644 distrib/playstation2/cdroms/Makefile create mode 100644 distrib/playstation2/cdroms/installcd/Makefile create mode 100644 distrib/pmax/cdroms/Makefile create mode 100644 distrib/pmax/cdroms/installcd/Makefile create mode 100644 distrib/pmppc/cdroms/Makefile create mode 100644 distrib/pmppc/cdroms/installcd/Makefile create mode 100644 distrib/prep/cdroms/Makefile create mode 100644 distrib/prep/cdroms/installcd/Makefile create mode 100644 distrib/sandpoint/cdroms/Makefile create mode 100644 distrib/sandpoint/cdroms/installcd/Makefile create mode 100644 distrib/sgimips/cdroms/Makefile create mode 100644 distrib/sgimips/cdroms/installcd/Makefile create mode 100644 distrib/shark/cdroms/Makefile create mode 100644 distrib/shark/cdroms/installcd/Makefile create mode 100644 distrib/sparc/cdroms/Makefile create mode 100644 distrib/sparc/cdroms/installcd/Makefile create mode 100644 distrib/sparc64/cdroms/Makefile create mode 100644 distrib/sparc64/cdroms/installcd/Makefile create mode 100644 distrib/sun2/cdroms/Makefile create mode 100644 distrib/sun2/cdroms/installcd/Makefile create mode 100644 distrib/sun3/cdroms/Makefile create mode 100644 distrib/sun3/cdroms/installcd/Makefile create mode 100644 distrib/vax/cdroms/Makefile create mode 100644 distrib/vax/cdroms/installcd/Makefile create mode 100644 distrib/x68k/cdroms/Makefile create mode 100644 distrib/x68k/cdroms/installcd/Makefile diff --git a/Makefile b/Makefile index 994b03362749..83ea530b15ef 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.246 2006/09/07 03:51:44 dbj Exp $ +# $NetBSD: Makefile,v 1.247 2007/03/06 21:56:47 bouyer Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -314,6 +314,7 @@ release snapshot: .PHONY .MAKE # iso-image: .PHONY + ${MAKEDIRTARGET} distrib iso_image ${MAKEDIRTARGET} etc iso-image @echo "make ${.TARGET} started at: ${START_TIME}" @printf "make ${.TARGET} finished at: " && date diff --git a/distrib/Makefile b/distrib/Makefile index 0c335217df99..129d4fe104a1 100644 --- a/distrib/Makefile +++ b/distrib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/05/12 16:56:41 cl Exp $ +# $NetBSD: Makefile,v 1.14 2007/03/06 21:56:47 bouyer Exp $ .include @@ -17,5 +17,6 @@ SUBDIR+= utils .endif TARGETS+=release +TARGETS+=iso_image .include diff --git a/distrib/Makefile.inc b/distrib/Makefile.inc index 8c9991e79a02..830d548a0292 100644 --- a/distrib/Makefile.inc +++ b/distrib/Makefile.inc @@ -1,3 +1,5 @@ -# $NetBSD: Makefile.inc,v 1.8 2002/05/02 18:02:14 lukem Exp $ +# $NetBSD: Makefile.inc,v 1.9 2007/03/06 21:56:47 bouyer Exp $ .include "../Makefile.inc" + +iso_image: .PHONY diff --git a/distrib/acorn26/Makefile b/distrib/acorn26/Makefile index b167657c75e3..603038c2901d 100644 --- a/distrib/acorn26/Makefile +++ b/distrib/acorn26/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2002/05/02 18:02:16 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2007/03/06 21:56:47 bouyer Exp $ -SUBDIR= instkernel +SUBDIR= instkernel cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/acorn26/cdroms/Makefile b/distrib/acorn26/cdroms/Makefile new file mode 100644 index 000000000000..5b5bd35335ac --- /dev/null +++ b/distrib/acorn26/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:47 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/acorn26/cdroms/installcd/Makefile b/distrib/acorn26/cdroms/installcd/Makefile new file mode 100644 index 000000000000..9db079ea3cfa --- /dev/null +++ b/distrib/acorn26/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:48 bouyer Exp $ +CDBASE= acorn26cd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/acorn32/Makefile b/distrib/acorn32/Makefile index 58dfa25a485a..3658996a494f 100644 --- a/distrib/acorn32/Makefile +++ b/distrib/acorn32/Makefile @@ -1,13 +1,16 @@ -# $NetBSD: Makefile,v 1.17 2003/01/03 15:34:31 lukem Exp $ +# $NetBSD: Makefile,v 1.18 2007/03/06 21:56:48 bouyer Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" -SUBDIR= ramdisk .WAIT kernels stand +SUBDIR= ramdisk .WAIT kernels stand cdroms TARGETS+= release release: check_RELEASEDIR ${RELEASE_INSTALL} ${DISTRIBDIR}/notes/acorn32/prep.RISCOS \ ${RELEASEDIR}/${MACHINE}/ +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/acorn32/cdroms/Makefile b/distrib/acorn32/cdroms/Makefile new file mode 100644 index 000000000000..a1dfc8efc261 --- /dev/null +++ b/distrib/acorn32/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:48 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/acorn32/cdroms/installcd/Makefile b/distrib/acorn32/cdroms/installcd/Makefile new file mode 100644 index 000000000000..9db079ea3cfa --- /dev/null +++ b/distrib/acorn32/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:48 bouyer Exp $ +CDBASE= acorn26cd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/alpha/Makefile b/distrib/alpha/Makefile index fccc8476bec3..21ce68c44d38 100644 --- a/distrib/alpha/Makefile +++ b/distrib/alpha/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.21 2003/01/03 15:34:31 lukem Exp $ +# $NetBSD: Makefile,v 1.22 2007/03/06 21:56:49 bouyer Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" -SUBDIR= instkernel # floppy-GENERIC +SUBDIR= instkernel cdroms # floppy-GENERIC TARGETS+= release release: check_RELEASEDIR .WAIT README.files @@ -12,4 +12,7 @@ release: check_RELEASEDIR .WAIT README.files ${RELEASEDIR}/${MACHINE}/installation/$i .endfor +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/alpha/cdroms/Makefile b/distrib/alpha/cdroms/Makefile new file mode 100644 index 000000000000..1d65eb0574e8 --- /dev/null +++ b/distrib/alpha/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:49 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/alpha/cdroms/installcd/Makefile b/distrib/alpha/cdroms/installcd/Makefile new file mode 100644 index 000000000000..9a227dac4c67 --- /dev/null +++ b/distrib/alpha/cdroms/installcd/Makefile @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:49 bouyer Exp $ +CDBASE= alphacd # gives ${CDBASE}.iso +CDINSTKERNEL= ../../instkernel/instkernel +CDKERNELS= netbsd netbsd +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +#make the CD bootable +image_md_post: + ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDBASE}.iso bootxx.${MACHINE} + +.include "${.CURDIR}/../../../common/Makefile.bootcd" + diff --git a/distrib/amiga/Makefile b/distrib/amiga/Makefile index 9fc6864a4515..279162d57afa 100644 --- a/distrib/amiga/Makefile +++ b/distrib/amiga/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2004/06/30 03:26:27 jmc Exp $ +# $NetBSD: Makefile,v 1.3 2007/03/06 21:56:49 bouyer Exp $ -SUBDIR= stand +SUBDIR= stand cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/amiga/cdroms/Makefile b/distrib/amiga/cdroms/Makefile new file mode 100644 index 000000000000..881f12eec5dd --- /dev/null +++ b/distrib/amiga/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:50 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/amiga/cdroms/installcd/Makefile b/distrib/amiga/cdroms/installcd/Makefile new file mode 100644 index 000000000000..bdbf5642dbe3 --- /dev/null +++ b/distrib/amiga/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:50 bouyer Exp $ +CDBASE= amigacd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/arc/Makefile b/distrib/arc/Makefile index 285d2c627d20..70aeca842b3b 100644 --- a/distrib/arc/Makefile +++ b/distrib/arc/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2002/05/02 18:02:24 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2007/03/06 21:56:54 bouyer Exp $ -SUBDIR= ramdisk .WAIT instkernel +SUBDIR= ramdisk .WAIT instkernel .WAIT cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/arc/cdroms/Makefile b/distrib/arc/cdroms/Makefile new file mode 100644 index 000000000000..c3ca0e53ec55 --- /dev/null +++ b/distrib/arc/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:54 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/arc/cdroms/installcd/Makefile b/distrib/arc/cdroms/installcd/Makefile new file mode 100644 index 000000000000..576c76be5908 --- /dev/null +++ b/distrib/arc/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:54 bouyer Exp $ +CDBASE= arccd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/atari/Makefile b/distrib/atari/Makefile index 23e2b54f5954..a126909e92fc 100644 --- a/distrib/atari/Makefile +++ b/distrib/atari/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2004/12/12 08:25:59 jmc Exp $ +# $NetBSD: Makefile,v 1.6 2007/03/06 21:56:55 bouyer Exp $ -SUBDIR= floppies misc +SUBDIR= floppies misc cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/atari/cdroms/Makefile b/distrib/atari/cdroms/Makefile new file mode 100644 index 000000000000..871169251d54 --- /dev/null +++ b/distrib/atari/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:55 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/atari/cdroms/installcd/Makefile b/distrib/atari/cdroms/installcd/Makefile new file mode 100644 index 000000000000..41165d523000 --- /dev/null +++ b/distrib/atari/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:55 bouyer Exp $ +CDBASE= ataricd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/cats/Makefile b/distrib/cats/Makefile index 17d5e7ca24ed..23d7355e9daf 100644 --- a/distrib/cats/Makefile +++ b/distrib/cats/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2002/04/11 22:54:01 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2007/03/06 21:56:55 bouyer Exp $ -SUBDIR= ramdisk .WAIT instkernel +SUBDIR= ramdisk .WAIT instkernel .WAIT cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/cats/cdroms/Makefile b/distrib/cats/cdroms/Makefile new file mode 100644 index 000000000000..871169251d54 --- /dev/null +++ b/distrib/cats/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:55 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/cats/cdroms/installcd/Makefile b/distrib/cats/cdroms/installcd/Makefile new file mode 100644 index 000000000000..769a898a1fca --- /dev/null +++ b/distrib/cats/cdroms/installcd/Makefile @@ -0,0 +1,7 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:56 bouyer Exp $ +CDBASE= catscd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE +CDKERNELS= netbsd.aout-INSTALL netbsd +CDINSTKERNEL= ../../instkernel + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/dreamcast/Makefile b/distrib/dreamcast/Makefile index c5c6bece5596..ef0061e2fbf1 100644 --- a/distrib/dreamcast/Makefile +++ b/distrib/dreamcast/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2002/10/30 12:42:24 tsutsui Exp $ +# $NetBSD: Makefile,v 1.2 2007/03/06 21:56:56 bouyer Exp $ -SUBDIR= ramdisk .WAIT instkernel +SUBDIR= ramdisk .WAIT instkernel cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/dreamcast/cdroms/Makefile b/distrib/dreamcast/cdroms/Makefile new file mode 100644 index 000000000000..e6a7d8c1fbae --- /dev/null +++ b/distrib/dreamcast/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:56 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/dreamcast/cdroms/installcd/Makefile b/distrib/dreamcast/cdroms/installcd/Makefile new file mode 100644 index 000000000000..33c6323e88b3 --- /dev/null +++ b/distrib/dreamcast/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:56 bouyer Exp $ +CDBASE= dreamcastcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/evbarm/Makefile b/distrib/evbarm/Makefile index 6245e947080c..42bf4f1f22dc 100644 --- a/distrib/evbarm/Makefile +++ b/distrib/evbarm/Makefile @@ -1,9 +1,12 @@ -# $NetBSD: Makefile,v 1.7 2002/05/02 18:02:31 lukem Exp $ +# $NetBSD: Makefile,v 1.8 2007/03/06 21:56:58 bouyer Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" -SUBDIR= gzboot instkernel +SUBDIR= gzboot instkernel cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/evbarm/cdroms/Makefile b/distrib/evbarm/cdroms/Makefile new file mode 100644 index 000000000000..4a4dbfdf3925 --- /dev/null +++ b/distrib/evbarm/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:58 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/evbarm/cdroms/installcd/Makefile b/distrib/evbarm/cdroms/installcd/Makefile new file mode 100644 index 000000000000..15c97d6a1efb --- /dev/null +++ b/distrib/evbarm/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:58 bouyer Exp $ +CDBASE= evbarmcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/evbmips/Makefile b/distrib/evbmips/Makefile index 64f4bf6df7d0..df1095678a76 100644 --- a/distrib/evbmips/Makefile +++ b/distrib/evbmips/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/09/11 06:12:23 riz Exp $ +# $NetBSD: Makefile,v 1.3 2007/03/06 21:56:59 bouyer Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -6,6 +6,9 @@ .if ${MACHINE_ARCH} == "mipsel" SUBDIR= instkernel .endif -TARGETS+= release +TARGETS+= release cdroms + +iso_image: + ${MAKEDIRTARGET} cdroms iso_image .include diff --git a/distrib/evbmips/cdroms/Makefile b/distrib/evbmips/cdroms/Makefile new file mode 100644 index 000000000000..a984dc47fbac --- /dev/null +++ b/distrib/evbmips/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:59 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/evbmips/cdroms/installcd/Makefile b/distrib/evbmips/cdroms/installcd/Makefile new file mode 100644 index 000000000000..8c1e8049b1c5 --- /dev/null +++ b/distrib/evbmips/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:59 bouyer Exp $ +CDBASE= evbmips-${MACHINE_ARCH}cd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/evbppc/Makefile b/distrib/evbppc/Makefile index e6c7376f3419..7edada157ff9 100644 --- a/distrib/evbppc/Makefile +++ b/distrib/evbppc/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2002/12/09 14:20:53 scw Exp $ +# $NetBSD: Makefile,v 1.2 2007/03/06 21:56:59 bouyer Exp $ -SUBDIR= ramdisk .WAIT md-kernel +SUBDIR= ramdisk .WAIT md-kernel cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/evbppc/cdroms/Makefile b/distrib/evbppc/cdroms/Makefile new file mode 100644 index 000000000000..13aee6f9b4ff --- /dev/null +++ b/distrib/evbppc/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:00 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/evbppc/cdroms/installcd/Makefile b/distrib/evbppc/cdroms/installcd/Makefile new file mode 100644 index 000000000000..8422c6c5b66b --- /dev/null +++ b/distrib/evbppc/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:00 bouyer Exp $ +CDBASE= evbppccd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/ews4800mips/Makefile b/distrib/ews4800mips/Makefile index b198fe258a34..242e2c5f7b02 100644 --- a/distrib/ews4800mips/Makefile +++ b/distrib/ews4800mips/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2005/12/29 16:01:30 tsutsui Exp $ +# $NetBSD: Makefile,v 1.2 2007/03/06 21:57:00 bouyer Exp $ SUBDIR= floppies TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/ews4800mips/cdroms/Makefile b/distrib/ews4800mips/cdroms/Makefile new file mode 100644 index 000000000000..13aee6f9b4ff --- /dev/null +++ b/distrib/ews4800mips/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:00 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/ews4800mips/cdroms/installcd/Makefile b/distrib/ews4800mips/cdroms/installcd/Makefile new file mode 100644 index 000000000000..4f16454615e5 --- /dev/null +++ b/distrib/ews4800mips/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:01 bouyer Exp $ +CDBASE= ews4800mipscd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/hp300/Makefile b/distrib/hp300/Makefile index bd8b588444d4..0b17890c7363 100644 --- a/distrib/hp300/Makefile +++ b/distrib/hp300/Makefile @@ -1,13 +1,16 @@ -# $NetBSD: Makefile,v 1.16 2003/01/03 15:34:33 lukem Exp $ +# $NetBSD: Makefile,v 1.17 2007/03/06 21:57:01 bouyer Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" -SUBDIR= ramdisk .WAIT instkernel +SUBDIR= ramdisk .WAIT instkernel cdroms TARGETS+= release release: check_RELEASEDIR .WAIT HP-IB.geometry ${RELEASE_INSTALL} ${.CURDIR}/HP-IB.geometry \ ${RELEASEDIR}/${MACHINE}/installation/misc +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/hp300/cdroms/Makefile b/distrib/hp300/cdroms/Makefile new file mode 100644 index 000000000000..ded8074f4094 --- /dev/null +++ b/distrib/hp300/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:01 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/hp300/cdroms/installcd/Makefile b/distrib/hp300/cdroms/installcd/Makefile new file mode 100644 index 000000000000..94e963c99d3f --- /dev/null +++ b/distrib/hp300/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:01 bouyer Exp $ +CDBASE= hp300cd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/hp700/Makefile b/distrib/hp700/Makefile index df56a9391905..716d344996af 100644 --- a/distrib/hp700/Makefile +++ b/distrib/hp700/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2005/05/18 14:04:26 chs Exp $ +# $NetBSD: Makefile,v 1.2 2007/03/06 21:57:02 bouyer Exp $ -SUBDIR= ramdisk .WAIT kernel +SUBDIR= ramdisk .WAIT kernel cdroms TARGETS+=release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/hp700/cdroms/Makefile b/distrib/hp700/cdroms/Makefile new file mode 100644 index 000000000000..9e13c3458f7a --- /dev/null +++ b/distrib/hp700/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:02 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/hp700/cdroms/installcd/Makefile b/distrib/hp700/cdroms/installcd/Makefile new file mode 100644 index 000000000000..39c012ab3ac6 --- /dev/null +++ b/distrib/hp700/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:02 bouyer Exp $ +CDBASE= hp700cd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/hpcarm/Makefile b/distrib/hpcarm/Makefile index e1d11afbf8a4..a612276c9805 100644 --- a/distrib/hpcarm/Makefile +++ b/distrib/hpcarm/Makefile @@ -1,8 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2005/12/30 11:48:15 rjs Exp $ +# $NetBSD: Makefile,v 1.3 2007/03/06 21:57:02 bouyer Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" +SUBDIR= cdroms + +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + +.include .include MINIROOTOBJ!= cd ${.CURDIR}/../miniroot && ${PRINTOBJDIR} @@ -22,10 +28,10 @@ UUDECODE_FILES_RENAME_${HPCBOOT}= ${HPCBOOT} .include "${DISTRIBDIR}/common/Makefile.mdset" release:: check_RELEASEDIR .WAIT ${HPCBOOT} + ${MAKEDIRTARGET} cdroms release ${INSTALL} -c -m ${NONBINMODE} \ hpcboot.exe ${RELEASEDIR}/${MACHINE}/installation ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation '*.gz' '*.exe' .include .include - diff --git a/distrib/hpcarm/cdroms/Makefile b/distrib/hpcarm/cdroms/Makefile new file mode 100644 index 000000000000..43a116abdb80 --- /dev/null +++ b/distrib/hpcarm/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:03 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/hpcarm/cdroms/installcd/Makefile b/distrib/hpcarm/cdroms/installcd/Makefile new file mode 100644 index 000000000000..56a3098c846e --- /dev/null +++ b/distrib/hpcarm/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:03 bouyer Exp $ +CDBASE= hpcarmcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/hpcmips/Makefile b/distrib/hpcmips/Makefile index d222ac503203..dda5270dadf8 100644 --- a/distrib/hpcmips/Makefile +++ b/distrib/hpcmips/Makefile @@ -1,8 +1,14 @@ -# $NetBSD: Makefile,v 1.27 2005/07/04 08:17:00 he Exp $ +# $NetBSD: Makefile,v 1.28 2007/03/06 21:57:03 bouyer Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" +SUBDIR= cdroms + +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + +.include .include MINIROOTOBJ!= cd ${.CURDIR}/../miniroot && ${PRINTOBJDIR} @@ -26,6 +32,7 @@ UUDECODE_FILES_RENAME_${HPCBOOT}= ${HPCBOOT} .include "${DISTRIBDIR}/common/Makefile.mdset" release:: check_RELEASEDIR .WAIT ${PBSDBOOT1} ${PBSDBOOT} ${HPCBOOT} + ${MAKEDIRTARGET} cdroms release ${INSTALL} -c -m ${NONBINMODE} \ pbsdboot1.exe ${RELEASEDIR}/${MACHINE}/installation ${INSTALL} -c -m ${NONBINMODE} \ diff --git a/distrib/hpcmips/cdroms/Makefile b/distrib/hpcmips/cdroms/Makefile new file mode 100644 index 000000000000..e9b54a30919a --- /dev/null +++ b/distrib/hpcmips/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:04 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/hpcmips/cdroms/installcd/Makefile b/distrib/hpcmips/cdroms/installcd/Makefile new file mode 100644 index 000000000000..cc19be831a19 --- /dev/null +++ b/distrib/hpcmips/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:04 bouyer Exp $ +CDBASE= hpcmipscd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/hpcsh/Makefile b/distrib/hpcsh/Makefile index e2646dbed812..08343b4d4c8a 100644 --- a/distrib/hpcsh/Makefile +++ b/distrib/hpcsh/Makefile @@ -1,8 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2004/03/19 08:07:28 jmc Exp $ +# $NetBSD: Makefile,v 1.6 2007/03/06 21:57:04 bouyer Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" +SUBDIR= cdroms + +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + +.include .include MINIROOTOBJ!= cd ${.CURDIR}/../miniroot && ${PRINTOBJDIR} @@ -27,6 +33,7 @@ hpcboot-sh4.exe.uue: cp ${HPCBOOT_SH4}/hpcboot.exe.uue hpcboot-sh4.exe.uue release:: check_RELEASEDIR .WAIT hpcboot-sh3.exe hpcboot-sh4.exe + ${MAKEDIRTARGET} cdroms release cp hpcboot-sh3.exe ${RELEASEDIR}/${MACHINE}/installation; \ chmod ${NONBINMODE} ${RELEASEDIR}/${MACHINE}/installation/hpcboot-sh3.exe cp hpcboot-sh4.exe ${RELEASEDIR}/${MACHINE}/installation; \ diff --git a/distrib/hpcsh/cdroms/Makefile b/distrib/hpcsh/cdroms/Makefile new file mode 100644 index 000000000000..24b2a9c32dc7 --- /dev/null +++ b/distrib/hpcsh/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:05 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/hpcsh/cdroms/installcd/Makefile b/distrib/hpcsh/cdroms/installcd/Makefile new file mode 100644 index 000000000000..7a9d5fa1a381 --- /dev/null +++ b/distrib/hpcsh/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:05 bouyer Exp $ +CDBASE= hpcshcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/ibmnws/Makefile b/distrib/ibmnws/Makefile index 9fa8729273b6..4a384bcff541 100644 --- a/distrib/ibmnws/Makefile +++ b/distrib/ibmnws/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2003/10/19 03:37:16 matt Exp $ +# $NetBSD: Makefile,v 1.2 2007/03/06 21:57:05 bouyer Exp $ -SUBDIR= netboot +SUBDIR= netboot cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/ibmnws/cdroms/Makefile b/distrib/ibmnws/cdroms/Makefile new file mode 100644 index 000000000000..24b2a9c32dc7 --- /dev/null +++ b/distrib/ibmnws/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:05 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/ibmnws/cdroms/installcd/Makefile b/distrib/ibmnws/cdroms/installcd/Makefile new file mode 100644 index 000000000000..fe491809ec58 --- /dev/null +++ b/distrib/ibmnws/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:06 bouyer Exp $ +CDBASE= ibmnwscd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/macppc/Makefile b/distrib/macppc/Makefile index 5345073cf874..6c0d0439c966 100644 --- a/distrib/macppc/Makefile +++ b/distrib/macppc/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.14 2003/01/03 15:34:33 lukem Exp $ +# $NetBSD: Makefile,v 1.15 2007/03/06 21:57:06 bouyer Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" .include -SUBDIR= floppies +SUBDIR= floppies cdroms TARGETS+= release BOOTOBJ!= cd ${KERNSRCDIR}/arch/macppc/stand/ofwboot && ${PRINTOBJDIR} @@ -14,4 +14,7 @@ OFWBOOTERS= ${BOOTOBJ}/ofwboot.elf ${BOOTOBJ}/ofwboot.xcf release: check_RELEASEDIR .WAIT ${OWFBOOTERS} ${RELEASE_INSTALL} ${OFWBOOTERS} ${RELEASEDIR}/${MACHINE}/installation +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/macppc/cdroms/Makefile b/distrib/macppc/cdroms/Makefile new file mode 100644 index 000000000000..cbe4963ec623 --- /dev/null +++ b/distrib/macppc/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:06 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/macppc/cdroms/installcd/Makefile b/distrib/macppc/cdroms/installcd/Makefile new file mode 100644 index 000000000000..c1e9decba5b4 --- /dev/null +++ b/distrib/macppc/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:07 bouyer Exp $ +CDBASE= macppccd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/mipsco/Makefile b/distrib/mipsco/Makefile index 1c351cf881ba..05f309643ab7 100644 --- a/distrib/mipsco/Makefile +++ b/distrib/mipsco/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2002/04/12 00:32:38 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2007/03/06 21:57:07 bouyer Exp $ -SUBDIR= ramdisk .WAIT instkernel +SUBDIR= ramdisk .WAIT instkernel cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/mipsco/cdroms/Makefile b/distrib/mipsco/cdroms/Makefile new file mode 100644 index 000000000000..344824a82560 --- /dev/null +++ b/distrib/mipsco/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:07 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/mipsco/cdroms/installcd/Makefile b/distrib/mipsco/cdroms/installcd/Makefile new file mode 100644 index 000000000000..e6c5779af454 --- /dev/null +++ b/distrib/mipsco/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:07 bouyer Exp $ +CDBASE= mipscocd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/mvme68k/Makefile b/distrib/mvme68k/Makefile index 46fe85cfbd3c..ee868cd3d1a3 100644 --- a/distrib/mvme68k/Makefile +++ b/distrib/mvme68k/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2002/04/12 13:58:08 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2007/03/06 21:57:10 bouyer Exp $ -SUBDIR= ramdisk .WAIT instkernel +SUBDIR= ramdisk .WAIT instkernel cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/mvme68k/cdroms/Makefile b/distrib/mvme68k/cdroms/Makefile new file mode 100644 index 000000000000..fee43cf5f947 --- /dev/null +++ b/distrib/mvme68k/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:10 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/mvme68k/cdroms/installcd/Makefile b/distrib/mvme68k/cdroms/installcd/Makefile new file mode 100644 index 000000000000..d2e886070a75 --- /dev/null +++ b/distrib/mvme68k/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:10 bouyer Exp $ +CDBASE= mvme68kcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/mvmeppc/Makefile b/distrib/mvmeppc/Makefile index 7a9301250e5f..1cd2f36eaa46 100644 --- a/distrib/mvmeppc/Makefile +++ b/distrib/mvmeppc/Makefile @@ -1,7 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2002/04/09 16:46:16 bjh21 Exp $ +# $NetBSD: Makefile,v 1.3 2007/03/06 21:57:10 bouyer Exp $ # No install stuff yet. -release: +SUBDIR= cdroms +TARGETS+= release + +iso_image: + ${MAKEDIRTARGET} cdroms iso_image .include diff --git a/distrib/mvmeppc/cdroms/Makefile b/distrib/mvmeppc/cdroms/Makefile new file mode 100644 index 000000000000..fee43cf5f947 --- /dev/null +++ b/distrib/mvmeppc/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:10 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/mvmeppc/cdroms/installcd/Makefile b/distrib/mvmeppc/cdroms/installcd/Makefile new file mode 100644 index 000000000000..2ff8f3d359a9 --- /dev/null +++ b/distrib/mvmeppc/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:11 bouyer Exp $ +CDBASE= mvmeppccd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/news68k/Makefile b/distrib/news68k/Makefile index 3ee9a372be5e..dfc29f9e2a5c 100644 --- a/distrib/news68k/Makefile +++ b/distrib/news68k/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2002/05/02 18:02:43 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2007/03/06 21:57:11 bouyer Exp $ -SUBDIR= floppies +SUBDIR= floppies cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/news68k/cdroms/Makefile b/distrib/news68k/cdroms/Makefile new file mode 100644 index 000000000000..99c32cc54966 --- /dev/null +++ b/distrib/news68k/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:11 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/news68k/cdroms/installcd/Makefile b/distrib/news68k/cdroms/installcd/Makefile new file mode 100644 index 000000000000..6e3c1889e2ec --- /dev/null +++ b/distrib/news68k/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:11 bouyer Exp $ +CDBASE= news68kcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/newsmips/Makefile b/distrib/newsmips/Makefile index 8d94ce421ee7..b5ce1b42e23d 100644 --- a/distrib/newsmips/Makefile +++ b/distrib/newsmips/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2002/05/02 18:02:45 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2007/03/06 21:57:12 bouyer Exp $ -SUBDIR= floppies +SUBDIR= floppies cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/newsmips/cdroms/Makefile b/distrib/newsmips/cdroms/Makefile new file mode 100644 index 000000000000..88da1560a5ce --- /dev/null +++ b/distrib/newsmips/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:12 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/newsmips/cdroms/installcd/Makefile b/distrib/newsmips/cdroms/installcd/Makefile new file mode 100644 index 000000000000..efaecdd35ab2 --- /dev/null +++ b/distrib/newsmips/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:12 bouyer Exp $ +CDBASE= newsmipscd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/ofppc/Makefile b/distrib/ofppc/Makefile index 41447974f66f..5eb70597fe0f 100644 --- a/distrib/ofppc/Makefile +++ b/distrib/ofppc/Makefile @@ -1,6 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2002/09/21 01:44:11 chs Exp $ +# $NetBSD: Makefile,v 1.2 2007/03/06 21:57:12 bouyer Exp $ -#SUBDIR= ramdisk .WAIT instkernel +#SUBDIR= ramdisk .WAIT instkernel cdroms +SUBDIR= cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/ofppc/cdroms/Makefile b/distrib/ofppc/cdroms/Makefile new file mode 100644 index 000000000000..88da1560a5ce --- /dev/null +++ b/distrib/ofppc/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:12 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/ofppc/cdroms/installcd/Makefile b/distrib/ofppc/cdroms/installcd/Makefile new file mode 100644 index 000000000000..f796e2a7827d --- /dev/null +++ b/distrib/ofppc/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:14 bouyer Exp $ +CDBASE= ofppccd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/pc532/Makefile b/distrib/pc532/Makefile index 5f84e2ff3ba8..31ebcd09e97f 100644 --- a/distrib/pc532/Makefile +++ b/distrib/pc532/Makefile @@ -1,5 +1,9 @@ -# $NetBSD: Makefile,v 1.3 1999/04/11 13:22:10 jonb Exp $ +# $NetBSD: Makefile,v 1.4 2007/03/06 21:57:14 bouyer Exp $ SUBDIR= floppies +TARGETS+= release + +iso_image: + ${MAKEDIRTARGET} cdroms iso_image .include diff --git a/distrib/pc532/cdroms/Makefile b/distrib/pc532/cdroms/Makefile new file mode 100644 index 000000000000..f5158d4cf87b --- /dev/null +++ b/distrib/pc532/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:14 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/pc532/cdroms/installcd/Makefile b/distrib/pc532/cdroms/installcd/Makefile new file mode 100644 index 000000000000..8f158a849873 --- /dev/null +++ b/distrib/pc532/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:14 bouyer Exp $ +CDBASE= pc532cd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/playstation2/Makefile b/distrib/playstation2/Makefile index 0477d4ad9d45..c3e888062792 100644 --- a/distrib/playstation2/Makefile +++ b/distrib/playstation2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/05/08 21:44:58 lukem Exp $ +# $NetBSD: Makefile,v 1.13 2007/03/06 21:57:15 bouyer Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -12,3 +12,11 @@ MDSET_RELEASEDIR= installation .include "${DISTRIBDIR}/common/Makefile.mdset" .include + +SUBDIR= cdroms +TARGETS+= release + +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + +.include diff --git a/distrib/playstation2/cdroms/Makefile b/distrib/playstation2/cdroms/Makefile new file mode 100644 index 000000000000..a54b2c52f21d --- /dev/null +++ b/distrib/playstation2/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:15 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/playstation2/cdroms/installcd/Makefile b/distrib/playstation2/cdroms/installcd/Makefile new file mode 100644 index 000000000000..414a55351cb7 --- /dev/null +++ b/distrib/playstation2/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:15 bouyer Exp $ +CDBASE= playstation2cd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/pmax/Makefile b/distrib/pmax/Makefile index 30f9028d3a1b..7f0aae7785ef 100644 --- a/distrib/pmax/Makefile +++ b/distrib/pmax/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2002/04/12 05:53:50 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2007/03/06 21:57:15 bouyer Exp $ -SUBDIR= ramdisk .WAIT instkernel +SUBDIR= ramdisk .WAIT instkernel .WAIT cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/pmax/cdroms/Makefile b/distrib/pmax/cdroms/Makefile new file mode 100644 index 000000000000..8231f972470f --- /dev/null +++ b/distrib/pmax/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:16 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/pmax/cdroms/installcd/Makefile b/distrib/pmax/cdroms/installcd/Makefile new file mode 100644 index 000000000000..85b8827d88fb --- /dev/null +++ b/distrib/pmax/cdroms/installcd/Makefile @@ -0,0 +1,11 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:16 bouyer Exp $ +CDBASE= pmaxcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE +CDKERNELS= netbsd-INSTALL.gz netbsd +CDINSTKERNEL= ../../instkernel + +#make the CD bootable +image_md_post: + ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDBASE}.iso bootxx.${MACHINE} + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/pmppc/Makefile b/distrib/pmppc/Makefile index c4acb0b15c23..2c679b35f04a 100644 --- a/distrib/pmppc/Makefile +++ b/distrib/pmppc/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2002/05/30 23:51:03 augustss Exp $ +# $NetBSD: Makefile,v 1.2 2007/03/06 21:57:16 bouyer Exp $ -SUBDIR= floppies +SUBDIR= floppies cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/pmppc/cdroms/Makefile b/distrib/pmppc/cdroms/Makefile new file mode 100644 index 000000000000..73391561308d --- /dev/null +++ b/distrib/pmppc/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:17 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/pmppc/cdroms/installcd/Makefile b/distrib/pmppc/cdroms/installcd/Makefile new file mode 100644 index 000000000000..bc83f27b156b --- /dev/null +++ b/distrib/pmppc/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:17 bouyer Exp $ +CDBASE= pmppccd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/prep/Makefile b/distrib/prep/Makefile index 699b78bdb95d..173def26aa55 100644 --- a/distrib/prep/Makefile +++ b/distrib/prep/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2002/04/12 14:07:37 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2007/03/06 21:57:17 bouyer Exp $ -SUBDIR= floppies +SUBDIR= floppies cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/prep/cdroms/Makefile b/distrib/prep/cdroms/Makefile new file mode 100644 index 000000000000..73391561308d --- /dev/null +++ b/distrib/prep/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:17 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/prep/cdroms/installcd/Makefile b/distrib/prep/cdroms/installcd/Makefile new file mode 100644 index 000000000000..2a2a583f1a3e --- /dev/null +++ b/distrib/prep/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:18 bouyer Exp $ +CDBASE= prepcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/sandpoint/Makefile b/distrib/sandpoint/Makefile index 52b0763e0b65..516ed3309848 100644 --- a/distrib/sandpoint/Makefile +++ b/distrib/sandpoint/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2002/04/12 14:04:40 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2007/03/06 21:57:18 bouyer Exp $ -SUBDIR= floppies +SUBDIR= floppies cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/sandpoint/cdroms/Makefile b/distrib/sandpoint/cdroms/Makefile new file mode 100644 index 000000000000..5c34e1ef6989 --- /dev/null +++ b/distrib/sandpoint/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:18 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/sandpoint/cdroms/installcd/Makefile b/distrib/sandpoint/cdroms/installcd/Makefile new file mode 100644 index 000000000000..d90016c0a52f --- /dev/null +++ b/distrib/sandpoint/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:21 bouyer Exp $ +CDBASE= sandpointcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/sgimips/Makefile b/distrib/sgimips/Makefile index e01031f47d61..2455a204430d 100644 --- a/distrib/sgimips/Makefile +++ b/distrib/sgimips/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2002/05/21 20:54:16 rafal Exp $ +# $NetBSD: Makefile,v 1.2 2007/03/06 21:57:21 bouyer Exp $ -SUBDIR= ramdisk .WAIT instkernel +SUBDIR= ramdisk .WAIT instkernel .WAIT cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/sgimips/cdroms/Makefile b/distrib/sgimips/cdroms/Makefile new file mode 100644 index 000000000000..a30f310b09ad --- /dev/null +++ b/distrib/sgimips/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:21 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/sgimips/cdroms/installcd/Makefile b/distrib/sgimips/cdroms/installcd/Makefile new file mode 100644 index 000000000000..61eea7fda9b5 --- /dev/null +++ b/distrib/sgimips/cdroms/installcd/Makefile @@ -0,0 +1,22 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:22 bouyer Exp $ +CDBASE= sgimipscd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE +CDKERNELS= netbsd-INSTALL32_IP2x.gz ip2x +CDKERNELS+= netbsd-INSTALL32_IP3x.gz ip3x +CDINSTKERNEL= ../../instkernel + +SGIVOLHDR.size= 4096 + +image_md_post: + @echo "Prepending SGI volume header:" + mv ${CDBASE}.iso ${CDBASE}.iso.tmp + dd if=/dev/zero of=${CDBASE}.iso bs=512 count=${SGIVOLHDR.size} + dd if=${CDBASE}.iso.tmp of=${CDBASE}.iso bs=512 seek=${SGIVOLHDR.size} + ${TOOLDIR}/bin/nbsgivol -f -i -h ${SGIVOLHDR.size} ${CDBASE}.iso + ${TOOLDIR}/bin/nbsgivol -f -w aoutboot ${DESTDIR}/usr/mdec/aoutboot ${CDBASE}.iso + ${TOOLDIR}/bin/nbsgivol -f -w ip2xboot ${DESTDIR}/usr/mdec/ip2xboot ${CDBASE}.iso + ${TOOLDIR}/bin/nbsgivol -f -w ip3xboot ${DESTDIR}/usr/mdec/ip3xboot ${CDBASE}.iso + ${RM} -f ${CDBASE}.iso.tmp + +.include "${.CURDIR}/../../../common/Makefile.bootcd" + diff --git a/distrib/shark/Makefile b/distrib/shark/Makefile index 6dd84185afac..f5537aa69355 100644 --- a/distrib/shark/Makefile +++ b/distrib/shark/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2002/04/12 00:13:17 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2007/03/06 21:57:22 bouyer Exp $ -SUBDIR= instkernel +SUBDIR= instkernel cdrom TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/shark/cdroms/Makefile b/distrib/shark/cdroms/Makefile new file mode 100644 index 000000000000..78a5db88f641 --- /dev/null +++ b/distrib/shark/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:22 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/shark/cdroms/installcd/Makefile b/distrib/shark/cdroms/installcd/Makefile new file mode 100644 index 000000000000..6dd25cbaaab2 --- /dev/null +++ b/distrib/shark/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:22 bouyer Exp $ +CDBASE= sharkcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/sparc/Makefile b/distrib/sparc/Makefile index c328ee928d94..076990be0b97 100644 --- a/distrib/sparc/Makefile +++ b/distrib/sparc/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2002/05/09 11:13:52 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2007/03/06 21:57:23 bouyer Exp $ -SUBDIR= instfs ramdisk .WAIT bootfs +SUBDIR= instfs ramdisk .WAIT bootfs .WAIT cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/sparc/cdroms/Makefile b/distrib/sparc/cdroms/Makefile new file mode 100644 index 000000000000..5e48d1d2f1f0 --- /dev/null +++ b/distrib/sparc/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:23 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/sparc/cdroms/installcd/Makefile b/distrib/sparc/cdroms/installcd/Makefile new file mode 100644 index 000000000000..4f033d4082ab --- /dev/null +++ b/distrib/sparc/cdroms/installcd/Makefile @@ -0,0 +1,17 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:23 bouyer Exp $ +CDBASE= sparccd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +# for PRINTOBJDIR +.include + +CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc/bootfs && ${PRINTOBJDIR} +CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/boot.fs +SUN_BOOT_ARGS:= ${CDBOOTIMAGE} ${CDBOOTIMAGE} ${CDBOOTIMAGE} - - +image_md_post: + SUNLABEL=${TOOL_SUNLABEL:Q} \ + ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \ + ${CDBASE}.iso ${SUN_BOOT_ARGS} + + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/sparc64/Makefile b/distrib/sparc64/Makefile index dbbafd5801a8..ddcb230d00a2 100644 --- a/distrib/sparc64/Makefile +++ b/distrib/sparc64/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2002/05/20 21:50:45 eeh Exp $ +# $NetBSD: Makefile,v 1.7 2007/03/06 21:57:24 bouyer Exp $ -SUBDIR= instfs .WAIT xminiroot bootfs +SUBDIR= instfs .WAIT xminiroot bootfs .WAIT cdroms TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/sparc64/cdroms/Makefile b/distrib/sparc64/cdroms/Makefile new file mode 100644 index 000000000000..ee4833e6d950 --- /dev/null +++ b/distrib/sparc64/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:24 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/sparc64/cdroms/installcd/Makefile b/distrib/sparc64/cdroms/installcd/Makefile new file mode 100644 index 000000000000..475e2a81975c --- /dev/null +++ b/distrib/sparc64/cdroms/installcd/Makefile @@ -0,0 +1,17 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:24 bouyer Exp $ +CDBASE= sparc64cd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +# for PRINTOBJDIR +.include + +CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR} +CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/boot.fs +SUN_BOOT_ARGS:= - - - - ${CDBOOTIMAGE} +image_md_post: + SUNLABEL=${TOOL_SUNLABEL:Q} \ + ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \ + ${CDBASE}.iso ${SUN_BOOT_ARGS} + + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/sun2/Makefile b/distrib/sun2/Makefile index f17963f25800..10bceb527f8e 100644 --- a/distrib/sun2/Makefile +++ b/distrib/sun2/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2003/01/03 15:34:35 lukem Exp $ +# $NetBSD: Makefile,v 1.8 2007/03/06 21:57:24 bouyer Exp $ -SUBDIR= ramdisk miniroot +SUBDIR= ramdisk miniroot cdroms TARGETS+= release .include @@ -16,4 +16,7 @@ release: check_RELEASEDIR .WAIT \ ${.CURDIR}/MakeBootTape ${.CURDIR}/MakeInstTape \ ${RELEASEDIR}/${MACHINE}/installation/tapeimage +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/sun2/cdroms/Makefile b/distrib/sun2/cdroms/Makefile new file mode 100644 index 000000000000..3cb64f734943 --- /dev/null +++ b/distrib/sun2/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:25 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/sun2/cdroms/installcd/Makefile b/distrib/sun2/cdroms/installcd/Makefile new file mode 100644 index 000000000000..c3bf25231593 --- /dev/null +++ b/distrib/sun2/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:25 bouyer Exp $ +CDBASE= sun2cd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/sun3/Makefile b/distrib/sun3/Makefile index 830be3008fc5..62f94b91badb 100644 --- a/distrib/sun3/Makefile +++ b/distrib/sun3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2003/01/03 15:34:35 lukem Exp $ +# $NetBSD: Makefile,v 1.9 2007/03/06 21:57:25 bouyer Exp $ -SUBDIR= ramdisk miniroot +SUBDIR= ramdisk miniroot .WAIT cdroms TARGETS+= release .include @@ -19,4 +19,7 @@ release: check_RELEASEDIR .WAIT \ ${.CURDIR}/MakeBootTape ${.CURDIR}/MakeInstTape \ ${RELEASEDIR}/${MACHINE}/installation/tapeimage +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/sun3/cdroms/Makefile b/distrib/sun3/cdroms/Makefile new file mode 100644 index 000000000000..a869ed869bae --- /dev/null +++ b/distrib/sun3/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:26 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/sun3/cdroms/installcd/Makefile b/distrib/sun3/cdroms/installcd/Makefile new file mode 100644 index 000000000000..a71f8473c46f --- /dev/null +++ b/distrib/sun3/cdroms/installcd/Makefile @@ -0,0 +1,18 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:26 bouyer Exp $ +CDBASE= sun3cd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +# for PRINTOBJDIR +.include + +CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sun3/miniroot && ${PRINTOBJDIR} +CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/miniroot.fs +SUN_BOOT_ARGS:= - - - ${CDBOOTIMAGE} ${CDBOOTIMAGE} + +image_md_post: + SUNLABEL=${TOOL_SUNLABEL:Q} \ + ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \ + ${CDBASE}.iso ${SUN_BOOT_ARGS} + + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/vax/Makefile b/distrib/vax/Makefile index ab50cff26e0b..9b5c5b017abe 100644 --- a/distrib/vax/Makefile +++ b/distrib/vax/Makefile @@ -1,13 +1,16 @@ -# $NetBSD: Makefile,v 1.16 2003/01/03 15:34:35 lukem Exp $ +# $NetBSD: Makefile,v 1.17 2007/03/06 21:57:26 bouyer Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" -SUBDIR= ramdisk .WAIT ramdisk-kernel .WAIT floppy +SUBDIR= ramdisk .WAIT ramdisk-kernel .WAIT floppy cdroms TARGETS+= release release: check_RELEASEDIR .WAIT ${DESTDIR}/usr/mdec/boot ${RELEASE_INSTALL} ${DESTDIR}/usr/mdec/boot \ ${RELEASEDIR}/${MACHINE}/installation/netboot +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/vax/cdroms/Makefile b/distrib/vax/cdroms/Makefile new file mode 100644 index 000000000000..6c834c225928 --- /dev/null +++ b/distrib/vax/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:27 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/vax/cdroms/installcd/Makefile b/distrib/vax/cdroms/installcd/Makefile new file mode 100644 index 000000000000..5b1afee53119 --- /dev/null +++ b/distrib/vax/cdroms/installcd/Makefile @@ -0,0 +1,17 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:27 bouyer Exp $ +CDBASE= vaxcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE +CDKERNELS= install.ram.gz netbsd +CDINSTKERNEL= ../../ramdisk-kernel + +#make the CD bootable +prepare_md_post: + ${RM} -f cdrom/boot + ${CP} ${DESTDIR}/usr/mdec/boot cdrom/boot + ${RM} -f bootxx.${MACHINE} + ${CP} ${DESTDIR}/usr/mdec/xxboot bootxx.${MACHINE} + +image_md_post: + ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDBASE}.iso bootxx.${MACHINE} + +.include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/x68k/Makefile b/distrib/x68k/Makefile index 80fe57524b92..6679da4399ad 100644 --- a/distrib/x68k/Makefile +++ b/distrib/x68k/Makefile @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2002/11/03 02:13:20 isaki Exp $ +# $NetBSD: Makefile,v 1.5 2007/03/06 21:57:27 bouyer Exp $ -SUBDIR= floppies stand +SUBDIR= floppies stand cdrom TARGETS+= release +iso_image: + ${MAKEDIRTARGET} cdroms iso_image + .include diff --git a/distrib/x68k/cdroms/Makefile b/distrib/x68k/cdroms/Makefile new file mode 100644 index 000000000000..6c834c225928 --- /dev/null +++ b/distrib/x68k/cdroms/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:27 bouyer Exp $ + +SUBDIR= installcd +TARGETS+= release iso_image + +.include diff --git a/distrib/x68k/cdroms/installcd/Makefile b/distrib/x68k/cdroms/installcd/Makefile new file mode 100644 index 000000000000..a65e4283622d --- /dev/null +++ b/distrib/x68k/cdroms/installcd/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:28 bouyer Exp $ +CDBASE= x68kcd # gives ${CDBASE}.iso +CDRELEASE= true # include $RELEASEDIR/$MACHINE + +.include "${.CURDIR}/../../../common/Makefile.bootcd"