summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbouyer <bouyer@NetBSD.org>2007-03-06 21:56:47 +0000
committerbouyer <bouyer@NetBSD.org>2007-03-06 21:56:47 +0000
commitfee07bcfd46712df4999afae96be21baa7762e08 (patch)
tree3ee23a740ca70df7caeb30c96c6e5f5403e833f1
parent04825266e642e8e44449b11d8a14890fd7c96e7b (diff)
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.
-rw-r--r--Makefile3
-rw-r--r--distrib/Makefile3
-rw-r--r--distrib/Makefile.inc4
-rw-r--r--distrib/acorn26/Makefile7
-rw-r--r--distrib/acorn26/cdroms/Makefile6
-rw-r--r--distrib/acorn26/cdroms/installcd/Makefile5
-rw-r--r--distrib/acorn32/Makefile7
-rw-r--r--distrib/acorn32/cdroms/Makefile6
-rw-r--r--distrib/acorn32/cdroms/installcd/Makefile5
-rw-r--r--distrib/alpha/Makefile7
-rw-r--r--distrib/alpha/cdroms/Makefile6
-rw-r--r--distrib/alpha/cdroms/installcd/Makefile12
-rw-r--r--distrib/amiga/Makefile7
-rw-r--r--distrib/amiga/cdroms/Makefile6
-rw-r--r--distrib/amiga/cdroms/installcd/Makefile5
-rw-r--r--distrib/arc/Makefile7
-rw-r--r--distrib/arc/cdroms/Makefile6
-rw-r--r--distrib/arc/cdroms/installcd/Makefile5
-rw-r--r--distrib/atari/Makefile7
-rw-r--r--distrib/atari/cdroms/Makefile6
-rw-r--r--distrib/atari/cdroms/installcd/Makefile5
-rw-r--r--distrib/cats/Makefile7
-rw-r--r--distrib/cats/cdroms/Makefile6
-rw-r--r--distrib/cats/cdroms/installcd/Makefile7
-rw-r--r--distrib/dreamcast/Makefile7
-rw-r--r--distrib/dreamcast/cdroms/Makefile6
-rw-r--r--distrib/dreamcast/cdroms/installcd/Makefile5
-rw-r--r--distrib/evbarm/Makefile7
-rw-r--r--distrib/evbarm/cdroms/Makefile6
-rw-r--r--distrib/evbarm/cdroms/installcd/Makefile5
-rw-r--r--distrib/evbmips/Makefile7
-rw-r--r--distrib/evbmips/cdroms/Makefile6
-rw-r--r--distrib/evbmips/cdroms/installcd/Makefile5
-rw-r--r--distrib/evbppc/Makefile7
-rw-r--r--distrib/evbppc/cdroms/Makefile6
-rw-r--r--distrib/evbppc/cdroms/installcd/Makefile5
-rw-r--r--distrib/ews4800mips/Makefile5
-rw-r--r--distrib/ews4800mips/cdroms/Makefile6
-rw-r--r--distrib/ews4800mips/cdroms/installcd/Makefile5
-rw-r--r--distrib/hp300/Makefile7
-rw-r--r--distrib/hp300/cdroms/Makefile6
-rw-r--r--distrib/hp300/cdroms/installcd/Makefile5
-rw-r--r--distrib/hp700/Makefile7
-rw-r--r--distrib/hp700/cdroms/Makefile6
-rw-r--r--distrib/hp700/cdroms/installcd/Makefile5
-rw-r--r--distrib/hpcarm/Makefile10
-rw-r--r--distrib/hpcarm/cdroms/Makefile6
-rw-r--r--distrib/hpcarm/cdroms/installcd/Makefile5
-rw-r--r--distrib/hpcmips/Makefile9
-rw-r--r--distrib/hpcmips/cdroms/Makefile6
-rw-r--r--distrib/hpcmips/cdroms/installcd/Makefile5
-rw-r--r--distrib/hpcsh/Makefile9
-rw-r--r--distrib/hpcsh/cdroms/Makefile6
-rw-r--r--distrib/hpcsh/cdroms/installcd/Makefile5
-rw-r--r--distrib/ibmnws/Makefile7
-rw-r--r--distrib/ibmnws/cdroms/Makefile6
-rw-r--r--distrib/ibmnws/cdroms/installcd/Makefile5
-rw-r--r--distrib/macppc/Makefile7
-rw-r--r--distrib/macppc/cdroms/Makefile6
-rw-r--r--distrib/macppc/cdroms/installcd/Makefile5
-rw-r--r--distrib/mipsco/Makefile7
-rw-r--r--distrib/mipsco/cdroms/Makefile6
-rw-r--r--distrib/mipsco/cdroms/installcd/Makefile5
-rw-r--r--distrib/mvme68k/Makefile7
-rw-r--r--distrib/mvme68k/cdroms/Makefile6
-rw-r--r--distrib/mvme68k/cdroms/installcd/Makefile5
-rw-r--r--distrib/mvmeppc/Makefile8
-rw-r--r--distrib/mvmeppc/cdroms/Makefile6
-rw-r--r--distrib/mvmeppc/cdroms/installcd/Makefile5
-rw-r--r--distrib/news68k/Makefile7
-rw-r--r--distrib/news68k/cdroms/Makefile6
-rw-r--r--distrib/news68k/cdroms/installcd/Makefile5
-rw-r--r--distrib/newsmips/Makefile7
-rw-r--r--distrib/newsmips/cdroms/Makefile6
-rw-r--r--distrib/newsmips/cdroms/installcd/Makefile5
-rw-r--r--distrib/ofppc/Makefile8
-rw-r--r--distrib/ofppc/cdroms/Makefile6
-rw-r--r--distrib/ofppc/cdroms/installcd/Makefile5
-rw-r--r--distrib/pc532/Makefile6
-rw-r--r--distrib/pc532/cdroms/Makefile6
-rw-r--r--distrib/pc532/cdroms/installcd/Makefile5
-rw-r--r--distrib/playstation2/Makefile10
-rw-r--r--distrib/playstation2/cdroms/Makefile6
-rw-r--r--distrib/playstation2/cdroms/installcd/Makefile5
-rw-r--r--distrib/pmax/Makefile7
-rw-r--r--distrib/pmax/cdroms/Makefile6
-rw-r--r--distrib/pmax/cdroms/installcd/Makefile11
-rw-r--r--distrib/pmppc/Makefile7
-rw-r--r--distrib/pmppc/cdroms/Makefile6
-rw-r--r--distrib/pmppc/cdroms/installcd/Makefile5
-rw-r--r--distrib/prep/Makefile7
-rw-r--r--distrib/prep/cdroms/Makefile6
-rw-r--r--distrib/prep/cdroms/installcd/Makefile5
-rw-r--r--distrib/sandpoint/Makefile7
-rw-r--r--distrib/sandpoint/cdroms/Makefile6
-rw-r--r--distrib/sandpoint/cdroms/installcd/Makefile5
-rw-r--r--distrib/sgimips/Makefile7
-rw-r--r--distrib/sgimips/cdroms/Makefile6
-rw-r--r--distrib/sgimips/cdroms/installcd/Makefile22
-rw-r--r--distrib/shark/Makefile7
-rw-r--r--distrib/shark/cdroms/Makefile6
-rw-r--r--distrib/shark/cdroms/installcd/Makefile5
-rw-r--r--distrib/sparc/Makefile7
-rw-r--r--distrib/sparc/cdroms/Makefile6
-rw-r--r--distrib/sparc/cdroms/installcd/Makefile17
-rw-r--r--distrib/sparc64/Makefile7
-rw-r--r--distrib/sparc64/cdroms/Makefile6
-rw-r--r--distrib/sparc64/cdroms/installcd/Makefile17
-rw-r--r--distrib/sun2/Makefile7
-rw-r--r--distrib/sun2/cdroms/Makefile6
-rw-r--r--distrib/sun2/cdroms/installcd/Makefile5
-rw-r--r--distrib/sun3/Makefile7
-rw-r--r--distrib/sun3/cdroms/Makefile6
-rw-r--r--distrib/sun3/cdroms/installcd/Makefile18
-rw-r--r--distrib/vax/Makefile7
-rw-r--r--distrib/vax/cdroms/Makefile6
-rw-r--r--distrib/vax/cdroms/installcd/Makefile17
-rw-r--r--distrib/x68k/Makefile7
-rw-r--r--distrib/x68k/cdroms/Makefile6
-rw-r--r--distrib/x68k/cdroms/installcd/Makefile5
120 files changed, 726 insertions, 76 deletions
diff --git a/Makefile b/Makefile
index 994b0336274..83ea530b15e 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 0c335217df9..129d4fe104a 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 <bsd.own.mk>
@@ -17,5 +17,6 @@ SUBDIR+= utils
.endif
TARGETS+=release
+TARGETS+=iso_image
.include <bsd.subdir.mk>
diff --git a/distrib/Makefile.inc b/distrib/Makefile.inc
index 8c9991e79a0..830d548a029 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 b167657c75e..603038c2901 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 <bsd.subdir.mk>
diff --git a/distrib/acorn26/cdroms/Makefile b/distrib/acorn26/cdroms/Makefile
new file mode 100644
index 00000000000..5b5bd35335a
--- /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 <bsd.subdir.mk>
diff --git a/distrib/acorn26/cdroms/installcd/Makefile b/distrib/acorn26/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..9db079ea3cf
--- /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 58dfa25a485..3658996a494 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 <bsd.own.mk>
.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 <bsd.subdir.mk>
diff --git a/distrib/acorn32/cdroms/Makefile b/distrib/acorn32/cdroms/Makefile
new file mode 100644
index 00000000000..a1dfc8efc26
--- /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 <bsd.subdir.mk>
diff --git a/distrib/acorn32/cdroms/installcd/Makefile b/distrib/acorn32/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..9db079ea3cf
--- /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 fccc8476bec..21ce68c44d3 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 <bsd.own.mk>
.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 <bsd.subdir.mk>
diff --git a/distrib/alpha/cdroms/Makefile b/distrib/alpha/cdroms/Makefile
new file mode 100644
index 00000000000..1d65eb0574e
--- /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 <bsd.subdir.mk>
diff --git a/distrib/alpha/cdroms/installcd/Makefile b/distrib/alpha/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..9a227dac4c6
--- /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 9fc6864a451..279162d57af 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 <bsd.subdir.mk>
diff --git a/distrib/amiga/cdroms/Makefile b/distrib/amiga/cdroms/Makefile
new file mode 100644
index 00000000000..881f12eec5d
--- /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 <bsd.subdir.mk>
diff --git a/distrib/amiga/cdroms/installcd/Makefile b/distrib/amiga/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..bdbf5642dbe
--- /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 285d2c627d2..70aeca842b3 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 <bsd.subdir.mk>
diff --git a/distrib/arc/cdroms/Makefile b/distrib/arc/cdroms/Makefile
new file mode 100644
index 00000000000..c3ca0e53ec5
--- /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 <bsd.subdir.mk>
diff --git a/distrib/arc/cdroms/installcd/Makefile b/distrib/arc/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..576c76be590
--- /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 23e2b54f595..a126909e92f 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 <bsd.subdir.mk>
diff --git a/distrib/atari/cdroms/Makefile b/distrib/atari/cdroms/Makefile
new file mode 100644
index 00000000000..871169251d5
--- /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 <bsd.subdir.mk>
diff --git a/distrib/atari/cdroms/installcd/Makefile b/distrib/atari/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..41165d52300
--- /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 17d5e7ca24e..23d7355e9da 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 <bsd.subdir.mk>
diff --git a/distrib/cats/cdroms/Makefile b/distrib/cats/cdroms/Makefile
new file mode 100644
index 00000000000..871169251d5
--- /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 <bsd.subdir.mk>
diff --git a/distrib/cats/cdroms/installcd/Makefile b/distrib/cats/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..769a898a1fc
--- /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 c5c6bece559..ef0061e2fbf 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 <bsd.subdir.mk>
diff --git a/distrib/dreamcast/cdroms/Makefile b/distrib/dreamcast/cdroms/Makefile
new file mode 100644
index 00000000000..e6a7d8c1fba
--- /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 <bsd.subdir.mk>
diff --git a/distrib/dreamcast/cdroms/installcd/Makefile b/distrib/dreamcast/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..33c6323e88b
--- /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 6245e947080..42bf4f1f22d 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 <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-SUBDIR= gzboot instkernel
+SUBDIR= gzboot instkernel cdroms
TARGETS+= release
+iso_image:
+ ${MAKEDIRTARGET} cdroms iso_image
+
.include <bsd.subdir.mk>
diff --git a/distrib/evbarm/cdroms/Makefile b/distrib/evbarm/cdroms/Makefile
new file mode 100644
index 00000000000..4a4dbfdf392
--- /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 <bsd.subdir.mk>
diff --git a/distrib/evbarm/cdroms/installcd/Makefile b/distrib/evbarm/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..15c97d6a1ef
--- /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 64f4bf6df7d..df1095678a7 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 <bsd.own.mk>
.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 <bsd.subdir.mk>
diff --git a/distrib/evbmips/cdroms/Makefile b/distrib/evbmips/cdroms/Makefile
new file mode 100644
index 00000000000..a984dc47fba
--- /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 <bsd.subdir.mk>
diff --git a/distrib/evbmips/cdroms/installcd/Makefile b/distrib/evbmips/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..8c1e8049b1c
--- /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 e6c7376f341..7edada157ff 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 <bsd.subdir.mk>
diff --git a/distrib/evbppc/cdroms/Makefile b/distrib/evbppc/cdroms/Makefile
new file mode 100644
index 00000000000..13aee6f9b4f
--- /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 <bsd.subdir.mk>
diff --git a/distrib/evbppc/cdroms/installcd/Makefile b/distrib/evbppc/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..8422c6c5b66
--- /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 b198fe258a3..242e2c5f7b0 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 <bsd.subdir.mk>
diff --git a/distrib/ews4800mips/cdroms/Makefile b/distrib/ews4800mips/cdroms/Makefile
new file mode 100644
index 00000000000..13aee6f9b4f
--- /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 <bsd.subdir.mk>
diff --git a/distrib/ews4800mips/cdroms/installcd/Makefile b/distrib/ews4800mips/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..4f16454615e
--- /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 bd8b588444d..0b17890c736 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 <bsd.own.mk>
.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 <bsd.subdir.mk>
diff --git a/distrib/hp300/cdroms/Makefile b/distrib/hp300/cdroms/Makefile
new file mode 100644
index 00000000000..ded8074f409
--- /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 <bsd.subdir.mk>
diff --git a/distrib/hp300/cdroms/installcd/Makefile b/distrib/hp300/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..94e963c99d3
--- /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 df56a939190..716d344996a 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 <bsd.subdir.mk>
diff --git a/distrib/hp700/cdroms/Makefile b/distrib/hp700/cdroms/Makefile
new file mode 100644
index 00000000000..9e13c3458f7
--- /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 <bsd.subdir.mk>
diff --git a/distrib/hp700/cdroms/installcd/Makefile b/distrib/hp700/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..39c012ab3ac
--- /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 e1d11afbf8a..a612276c980 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 <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+SUBDIR= cdroms
+
+iso_image:
+ ${MAKEDIRTARGET} cdroms iso_image
+
+.include <bsd.subdir.mk>
.include <bsd.kernobj.mk>
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 <bsd.files.mk>
.include <bsd.prog.mk>
-
diff --git a/distrib/hpcarm/cdroms/Makefile b/distrib/hpcarm/cdroms/Makefile
new file mode 100644
index 00000000000..43a116abdb8
--- /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 <bsd.subdir.mk>
diff --git a/distrib/hpcarm/cdroms/installcd/Makefile b/distrib/hpcarm/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..56a3098c846
--- /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 d222ac50320..dda5270dadf 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 <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+SUBDIR= cdroms
+
+iso_image:
+ ${MAKEDIRTARGET} cdroms iso_image
+
+.include <bsd.subdir.mk>
.include <bsd.kernobj.mk>
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 00000000000..e9b54a30919
--- /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 <bsd.subdir.mk>
diff --git a/distrib/hpcmips/cdroms/installcd/Makefile b/distrib/hpcmips/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..cc19be831a1
--- /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 e2646dbed81..08343b4d4c8 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 <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+SUBDIR= cdroms
+
+iso_image:
+ ${MAKEDIRTARGET} cdroms iso_image
+
+.include <bsd.subdir.mk>
.include <bsd.kernobj.mk>
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 00000000000..24b2a9c32dc
--- /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 <bsd.subdir.mk>
diff --git a/distrib/hpcsh/cdroms/installcd/Makefile b/distrib/hpcsh/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..7a9d5fa1a38
--- /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 9fa8729273b..4a384bcff54 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 <bsd.subdir.mk>
diff --git a/distrib/ibmnws/cdroms/Makefile b/distrib/ibmnws/cdroms/Makefile
new file mode 100644
index 00000000000..24b2a9c32dc
--- /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 <bsd.subdir.mk>
diff --git a/distrib/ibmnws/cdroms/installcd/Makefile b/distrib/ibmnws/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..fe491809ec5
--- /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 5345073cf87..6c0d0439c96 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 <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
-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 <bsd.subdir.mk>
diff --git a/distrib/macppc/cdroms/Makefile b/distrib/macppc/cdroms/Makefile
new file mode 100644
index 00000000000..cbe4963ec62
--- /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 <bsd.subdir.mk>
diff --git a/distrib/macppc/cdroms/installcd/Makefile b/distrib/macppc/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..c1e9decba5b
--- /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 1c351cf881b..05f309643ab 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 <bsd.subdir.mk>
diff --git a/distrib/mipsco/cdroms/Makefile b/distrib/mipsco/cdroms/Makefile
new file mode 100644
index 00000000000..344824a8256
--- /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 <bsd.subdir.mk>
diff --git a/distrib/mipsco/cdroms/installcd/Makefile b/distrib/mipsco/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..e6c5779af45
--- /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 46fe85cfbd3..ee868cd3d1a 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 <bsd.subdir.mk>
diff --git a/distrib/mvme68k/cdroms/Makefile b/distrib/mvme68k/cdroms/Makefile
new file mode 100644
index 00000000000..fee43cf5f94
--- /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 <bsd.subdir.mk>
diff --git a/distrib/mvme68k/cdroms/installcd/Makefile b/distrib/mvme68k/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..d2e886070a7
--- /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 7a9301250e5..1cd2f36eaa4 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 <bsd.subdir.mk>
diff --git a/distrib/mvmeppc/cdroms/Makefile b/distrib/mvmeppc/cdroms/Makefile
new file mode 100644
index 00000000000..fee43cf5f94
--- /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 <bsd.subdir.mk>
diff --git a/distrib/mvmeppc/cdroms/installcd/Makefile b/distrib/mvmeppc/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..2ff8f3d359a
--- /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 3ee9a372be5..dfc29f9e2a5 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 <bsd.subdir.mk>
diff --git a/distrib/news68k/cdroms/Makefile b/distrib/news68k/cdroms/Makefile
new file mode 100644
index 00000000000..99c32cc5496
--- /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 <bsd.subdir.mk>
diff --git a/distrib/news68k/cdroms/installcd/Makefile b/distrib/news68k/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..6e3c1889e2e
--- /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 8d94ce421ee..b5ce1b42e23 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 <bsd.subdir.mk>
diff --git a/distrib/newsmips/cdroms/Makefile b/distrib/newsmips/cdroms/Makefile
new file mode 100644
index 00000000000..88da1560a5c
--- /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 <bsd.subdir.mk>
diff --git a/distrib/newsmips/cdroms/installcd/Makefile b/distrib/newsmips/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..efaecdd35ab
--- /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 41447974f66..5eb70597fe0 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 <bsd.subdir.mk>
diff --git a/distrib/ofppc/cdroms/Makefile b/distrib/ofppc/cdroms/Makefile
new file mode 100644
index 00000000000..88da1560a5c
--- /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 <bsd.subdir.mk>
diff --git a/distrib/ofppc/cdroms/installcd/Makefile b/distrib/ofppc/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..f796e2a7827
--- /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 5f84e2ff3ba..31ebcd09e97 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 <bsd.subdir.mk>
diff --git a/distrib/pc532/cdroms/Makefile b/distrib/pc532/cdroms/Makefile
new file mode 100644
index 00000000000..f5158d4cf87
--- /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 <bsd.subdir.mk>
diff --git a/distrib/pc532/cdroms/installcd/Makefile b/distrib/pc532/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..8f158a84987
--- /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 0477d4ad9d4..c3e88806279 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 <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,3 +12,11 @@ MDSET_RELEASEDIR= installation
.include "${DISTRIBDIR}/common/Makefile.mdset"
.include <bsd.prog.mk>
+
+SUBDIR= cdroms
+TARGETS+= release
+
+iso_image:
+ ${MAKEDIRTARGET} cdroms iso_image
+
+.include <bsd.subdir.mk>
diff --git a/distrib/playstation2/cdroms/Makefile b/distrib/playstation2/cdroms/Makefile
new file mode 100644
index 00000000000..a54b2c52f21
--- /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 <bsd.subdir.mk>
diff --git a/distrib/playstation2/cdroms/installcd/Makefile b/distrib/playstation2/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..414a55351cb
--- /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 30f9028d3a1..7f0aae7785e 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 <bsd.subdir.mk>
diff --git a/distrib/pmax/cdroms/Makefile b/distrib/pmax/cdroms/Makefile
new file mode 100644
index 00000000000..8231f972470
--- /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 <bsd.subdir.mk>
diff --git a/distrib/pmax/cdroms/installcd/Makefile b/distrib/pmax/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..85b8827d88f
--- /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 c4acb0b15c2..2c679b35f04 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 <bsd.subdir.mk>
diff --git a/distrib/pmppc/cdroms/Makefile b/distrib/pmppc/cdroms/Makefile
new file mode 100644
index 00000000000..73391561308
--- /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 <bsd.subdir.mk>
diff --git a/distrib/pmppc/cdroms/installcd/Makefile b/distrib/pmppc/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..bc83f27b156
--- /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 699b78bdb95..173def26aa5 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 <bsd.subdir.mk>
diff --git a/distrib/prep/cdroms/Makefile b/distrib/prep/cdroms/Makefile
new file mode 100644
index 00000000000..73391561308
--- /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 <bsd.subdir.mk>
diff --git a/distrib/prep/cdroms/installcd/Makefile b/distrib/prep/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..2a2a583f1a3
--- /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 52b0763e0b6..516ed330984 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 <bsd.subdir.mk>
diff --git a/distrib/sandpoint/cdroms/Makefile b/distrib/sandpoint/cdroms/Makefile
new file mode 100644
index 00000000000..5c34e1ef698
--- /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 <bsd.subdir.mk>
diff --git a/distrib/sandpoint/cdroms/installcd/Makefile b/distrib/sandpoint/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..d90016c0a52
--- /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 e01031f47d6..2455a204430 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 <bsd.subdir.mk>
diff --git a/distrib/sgimips/cdroms/Makefile b/distrib/sgimips/cdroms/Makefile
new file mode 100644
index 00000000000..a30f310b09a
--- /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 <bsd.subdir.mk>
diff --git a/distrib/sgimips/cdroms/installcd/Makefile b/distrib/sgimips/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..61eea7fda9b
--- /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 6dd84185afa..f5537aa6935 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 <bsd.subdir.mk>
diff --git a/distrib/shark/cdroms/Makefile b/distrib/shark/cdroms/Makefile
new file mode 100644
index 00000000000..78a5db88f64
--- /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 <bsd.subdir.mk>
diff --git a/distrib/shark/cdroms/installcd/Makefile b/distrib/shark/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..6dd25cbaaab
--- /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 c328ee928d9..076990be0b9 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 <bsd.subdir.mk>
diff --git a/distrib/sparc/cdroms/Makefile b/distrib/sparc/cdroms/Makefile
new file mode 100644
index 00000000000..5e48d1d2f1f
--- /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 <bsd.subdir.mk>
diff --git a/distrib/sparc/cdroms/installcd/Makefile b/distrib/sparc/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..4f033d4082a
--- /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 <bsd.own.mk>
+
+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 dbbafd5801a..ddcb230d00a 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 <bsd.subdir.mk>
diff --git a/distrib/sparc64/cdroms/Makefile b/distrib/sparc64/cdroms/Makefile
new file mode 100644
index 00000000000..ee4833e6d95
--- /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 <bsd.subdir.mk>
diff --git a/distrib/sparc64/cdroms/installcd/Makefile b/distrib/sparc64/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..475e2a81975
--- /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 <bsd.own.mk>
+
+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 f17963f2580..10bceb527f8 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 <bsd.own.mk>
@@ -16,4 +16,7 @@ release: check_RELEASEDIR .WAIT \
${.CURDIR}/MakeBootTape ${.CURDIR}/MakeInstTape \
${RELEASEDIR}/${MACHINE}/installation/tapeimage
+iso_image:
+ ${MAKEDIRTARGET} cdroms iso_image
+
.include <bsd.subdir.mk>
diff --git a/distrib/sun2/cdroms/Makefile b/distrib/sun2/cdroms/Makefile
new file mode 100644
index 00000000000..3cb64f73494
--- /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 <bsd.subdir.mk>
diff --git a/distrib/sun2/cdroms/installcd/Makefile b/distrib/sun2/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..c3bf2523159
--- /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 830be3008fc..62f94b91bad 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 <bsd.own.mk>
@@ -19,4 +19,7 @@ release: check_RELEASEDIR .WAIT \
${.CURDIR}/MakeBootTape ${.CURDIR}/MakeInstTape \
${RELEASEDIR}/${MACHINE}/installation/tapeimage
+iso_image:
+ ${MAKEDIRTARGET} cdroms iso_image
+
.include <bsd.subdir.mk>
diff --git a/distrib/sun3/cdroms/Makefile b/distrib/sun3/cdroms/Makefile
new file mode 100644
index 00000000000..a869ed869ba
--- /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 <bsd.subdir.mk>
diff --git a/distrib/sun3/cdroms/installcd/Makefile b/distrib/sun3/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..a71f8473c46
--- /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 <bsd.own.mk>
+
+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 ab50cff26e0..9b5c5b017ab 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 <bsd.own.mk>
.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 <bsd.subdir.mk>
diff --git a/distrib/vax/cdroms/Makefile b/distrib/vax/cdroms/Makefile
new file mode 100644
index 00000000000..6c834c22592
--- /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 <bsd.subdir.mk>
diff --git a/distrib/vax/cdroms/installcd/Makefile b/distrib/vax/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..5b1afee5311
--- /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 80fe57524b9..6679da4399a 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 <bsd.subdir.mk>
diff --git a/distrib/x68k/cdroms/Makefile b/distrib/x68k/cdroms/Makefile
new file mode 100644
index 00000000000..6c834c22592
--- /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 <bsd.subdir.mk>
diff --git a/distrib/x68k/cdroms/installcd/Makefile b/distrib/x68k/cdroms/installcd/Makefile
new file mode 100644
index 00000000000..a65e4283622
--- /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"