[src/trunk]: src/distrib use ${CDIMAGE} instead of ${CDBASE}.iso

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d49f0a8b6c8b
branches:  trunk
changeset: 772777:d49f0a8b6c8b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jan 15 22:34:33 2012 +0000

description:
use ${CDIMAGE} instead of ${CDBASE}.iso

diffstat:

 distrib/alpha/cdroms/installcd/Makefile   |   4 ++--
 distrib/emips/cdroms/installcd/Makefile   |   4 ++--
 distrib/pmax/cdroms/installcd/Makefile    |   4 ++--
 distrib/prep/cdroms/installcd/Makefile    |   6 +++---
 distrib/sgimips/cdroms/installcd/Makefile |  18 +++++++++---------
 distrib/sparc/cdroms/installcd/Makefile   |   4 ++--
 distrib/sparc64/cdroms/installcd/Makefile |   4 ++--
 distrib/sun3/cdroms/installcd/Makefile    |   4 ++--
 distrib/vax/cdroms/installcd/Makefile     |   4 ++--
 9 files changed, 26 insertions(+), 26 deletions(-)

diffs (174 lines):

diff -r 2e4b5624487b -r d49f0a8b6c8b distrib/alpha/cdroms/installcd/Makefile
--- a/distrib/alpha/cdroms/installcd/Makefile   Sun Jan 15 20:43:24 2012 +0000
+++ b/distrib/alpha/cdroms/installcd/Makefile   Sun Jan 15 22:34:33 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2007/03/06 21:56:49 bouyer Exp $
+#      $NetBSD: Makefile,v 1.2 2012/01/15 22:34:33 jmcneill Exp $
 CDBASE=                alphacd         # gives ${CDBASE}.iso
 CDINSTKERNEL=  ../../instkernel/instkernel
 CDKERNELS=     netbsd netbsd
@@ -6,7 +6,7 @@
 
 #make the CD bootable
 image_md_post:
-       ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDBASE}.iso bootxx.${MACHINE}
+       ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDIMAGE} bootxx.${MACHINE}
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
 
diff -r 2e4b5624487b -r d49f0a8b6c8b distrib/emips/cdroms/installcd/Makefile
--- a/distrib/emips/cdroms/installcd/Makefile   Sun Jan 15 20:43:24 2012 +0000
+++ b/distrib/emips/cdroms/installcd/Makefile   Sun Jan 15 22:34:33 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2011/01/26 01:18:44 pooka Exp $
+#      $NetBSD: Makefile,v 1.2 2012/01/15 22:34:33 jmcneill Exp $
 CDBASE=                emipscd                 # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 CDKERNELS=     netbsd-INSTALL.gz netbsd
@@ -6,6 +6,6 @@
 
 #make the CD bootable
 image_md_post:
-       ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDBASE}.iso bootxx.${MACHINE}
+       ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDIMAGE} bootxx.${MACHINE}
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff -r 2e4b5624487b -r d49f0a8b6c8b distrib/pmax/cdroms/installcd/Makefile
--- a/distrib/pmax/cdroms/installcd/Makefile    Sun Jan 15 20:43:24 2012 +0000
+++ b/distrib/pmax/cdroms/installcd/Makefile    Sun Jan 15 22:34:33 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2007/03/06 21:57:16 bouyer Exp $
+#      $NetBSD: Makefile,v 1.2 2012/01/15 22:34:33 jmcneill Exp $
 CDBASE=                pmaxcd                  # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 CDKERNELS=     netbsd-INSTALL.gz netbsd
@@ -6,6 +6,6 @@
 
 #make the CD bootable
 image_md_post:
-       ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDBASE}.iso bootxx.${MACHINE}
+       ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDIMAGE} bootxx.${MACHINE}
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff -r 2e4b5624487b -r d49f0a8b6c8b distrib/prep/cdroms/installcd/Makefile
--- a/distrib/prep/cdroms/installcd/Makefile    Sun Jan 15 20:43:24 2012 +0000
+++ b/distrib/prep/cdroms/installcd/Makefile    Sun Jan 15 22:34:33 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2008/04/30 08:08:32 garbled Exp $
+#      $NetBSD: Makefile,v 1.3 2012/01/15 22:34:33 jmcneill Exp $
 CDBASE=                prepcd          # gives ${CDBASE}.iso
 CDRELEASE=     true            # include $RELEASEDIR/$MACHINE
 CDMAKEFSOPTIONS=bootimage=powerpc;cdrom/prep/installation/floppy/sysinst_com0.fs
@@ -8,7 +8,7 @@
 # it.
 
 image_md_post:
-       ${TOOL_FDISK} -F -f -b 1/255/16065 -0 -s 65/80/2799 -i ${CDBASE}.iso
-       ${TOOL_FDISK} -F -f -b 1/255/16065 -0 -s 65/80/2799 -u ${CDBASE}.iso
+       ${TOOL_FDISK} -F -f -b 1/255/16065 -0 -s 65/80/2799 -i ${CDIMAGE}
+       ${TOOL_FDISK} -F -f -b 1/255/16065 -0 -s 65/80/2799 -u ${CDIMAGE}
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff -r 2e4b5624487b -r d49f0a8b6c8b distrib/sgimips/cdroms/installcd/Makefile
--- a/distrib/sgimips/cdroms/installcd/Makefile Sun Jan 15 20:43:24 2012 +0000
+++ b/distrib/sgimips/cdroms/installcd/Makefile Sun Jan 15 22:34:33 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2007/03/06 21:57:22 bouyer Exp $
+#      $NetBSD: Makefile,v 1.2 2012/01/15 22:34:34 jmcneill Exp $
 CDBASE=                sgimipscd               # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 CDKERNELS=     netbsd-INSTALL32_IP2x.gz ip2x
@@ -9,14 +9,14 @@
 
 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
+       mv ${CDIMAGE} ${CDIMAGE}.tmp
+       dd if=/dev/zero of=${CDIMAGE} bs=512 count=${SGIVOLHDR.size}
+       dd if=${CDIMAGE}.tmp of=${CDIMAGE} bs=512 seek=${SGIVOLHDR.size}
+       ${TOOLDIR}/bin/nbsgivol -f -i -h ${SGIVOLHDR.size} ${CDIMAGE}
+       ${TOOLDIR}/bin/nbsgivol -f -w aoutboot ${DESTDIR}/usr/mdec/aoutboot ${CDIMAGE}
+       ${TOOLDIR}/bin/nbsgivol -f -w ip2xboot ${DESTDIR}/usr/mdec/ip2xboot ${CDIMAGE}
+       ${TOOLDIR}/bin/nbsgivol -f -w ip3xboot ${DESTDIR}/usr/mdec/ip3xboot ${CDIMAGE}
+       ${RM} -f ${CDIMAGE}.tmp
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
 
diff -r 2e4b5624487b -r d49f0a8b6c8b distrib/sparc/cdroms/installcd/Makefile
--- a/distrib/sparc/cdroms/installcd/Makefile   Sun Jan 15 20:43:24 2012 +0000
+++ b/distrib/sparc/cdroms/installcd/Makefile   Sun Jan 15 22:34:33 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2007/03/06 21:57:23 bouyer Exp $
+#      $NetBSD: Makefile,v 1.2 2012/01/15 22:34:34 jmcneill Exp $
 CDBASE=                sparccd         # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 
@@ -11,7 +11,7 @@
 image_md_post:
        SUNLABEL=${TOOL_SUNLABEL:Q} \
                ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \
-               ${CDBASE}.iso ${SUN_BOOT_ARGS}
+               ${CDIMAGE} ${SUN_BOOT_ARGS}
        
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff -r 2e4b5624487b -r d49f0a8b6c8b distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Sun Jan 15 20:43:24 2012 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Sun Jan 15 22:34:33 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2011/06/22 14:05:38 martin Exp $
+#      $NetBSD: Makefile,v 1.14 2012/01/15 22:34:34 jmcneill Exp $
 CDBASE=                sparc64cd               # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 
@@ -80,7 +80,7 @@
 image_md_post:
        SUNLABEL=${TOOL_SUNLABEL:Q} \
                ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \
-               ${CDBASE}.iso ${SUN_BOOT_ARGS}
+               ${CDIMAGE} ${SUN_BOOT_ARGS}
        
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff -r 2e4b5624487b -r d49f0a8b6c8b distrib/sun3/cdroms/installcd/Makefile
--- a/distrib/sun3/cdroms/installcd/Makefile    Sun Jan 15 20:43:24 2012 +0000
+++ b/distrib/sun3/cdroms/installcd/Makefile    Sun Jan 15 22:34:33 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2007/03/06 21:57:26 bouyer Exp $
+#      $NetBSD: Makefile,v 1.2 2012/01/15 22:34:34 jmcneill Exp $
 CDBASE=                sun3cd                  # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 
@@ -12,7 +12,7 @@
 image_md_post:
        SUNLABEL=${TOOL_SUNLABEL:Q} \
                ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \
-               ${CDBASE}.iso ${SUN_BOOT_ARGS}
+               ${CDIMAGE} ${SUN_BOOT_ARGS}
        
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"
diff -r 2e4b5624487b -r d49f0a8b6c8b distrib/vax/cdroms/installcd/Makefile
--- a/distrib/vax/cdroms/installcd/Makefile     Sun Jan 15 20:43:24 2012 +0000
+++ b/distrib/vax/cdroms/installcd/Makefile     Sun Jan 15 22:34:33 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2007/03/06 21:57:27 bouyer Exp $
+#      $NetBSD: Makefile,v 1.2 2012/01/15 22:34:34 jmcneill Exp $
 CDBASE=                vaxcd                   # gives ${CDBASE}.iso
 CDRELEASE=     true                    # include $RELEASEDIR/$MACHINE
 CDKERNELS=     install.ram.gz netbsd
@@ -12,6 +12,6 @@
        ${CP} ${DESTDIR}/usr/mdec/xxboot bootxx.${MACHINE}
 
 image_md_post:
-       ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDBASE}.iso bootxx.${MACHINE}
+       ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDIMAGE} bootxx.${MACHINE}
 
 .include "${.CURDIR}/../../../common/Makefile.bootcd"