[src/trunk]: src/etc Now that the name of the ISO image is no longer stable, ...

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

details:   https://anonhg.NetBSD.org/src/rev/90532d38a896
branches:  trunk
changeset: 772773:90532d38a896
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Jan 15 17:36:55 2012 +0000

description:
Now that the name of the ISO image is no longer stable, rename the
variable to make it possible to overwrite the default with
build.sh -V CDROM_IMAGE=...

diffstat:

 etc/Makefile                 |  8 ++++----
 etc/etc.sgimips/Makefile.inc |  8 ++++----
 etc/etc.sparc/Makefile.inc   |  4 ++--
 etc/etc.sparc64/Makefile.inc |  4 ++--
 etc/etc.vax/Makefile.inc     |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diffs (108 lines):

diff -r 76b89adf5a5b -r 90532d38a896 etc/Makefile
--- a/etc/Makefile      Sun Jan 15 17:33:23 2012 +0000
+++ b/etc/Makefile      Sun Jan 15 17:36:55 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.394 2012/01/14 22:56:31 jmcneill Exp $
+#      $NetBSD: Makefile,v 1.395 2012/01/15 17:36:55 joerg Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -423,7 +423,7 @@
 #      Note: At least mkisofs 2.0 should be used.
 #
 CDROM_NAME_ADD?=
-CDROM.image?=${RELEASEDIR}/iso/NetBSD-${DISTRIBVER}-${MACHINE}.iso
+CDROM_IMAGE?=${RELEASEDIR}/iso/NetBSD-${DISTRIBVER}-${MACHINE}.iso
 CDROM.dir=     ${.OBJDIR}/cdrom.dir
 CDROM.pathlist=        ${.OBJDIR}/cdrom.pathlist
 
@@ -432,7 +432,7 @@
 .if ${MKISOFS} != true
 do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post
        ${MAKESUMS} -t ${RELEASEDIR}/iso/ '*.iso'
-       @echo "iso-image created as: ${CDROM.image}"
+       @echo "iso-image created as: ${CDROM_IMAGE}"
 .else
 do-iso-image:
        @echo iso-image: mkisofs not found
@@ -458,7 +458,7 @@
                false; \
        fi
        ${MKISOFS} ${MKISOFS_FLAGS} -graft-points -path-list ${CDROM.pathlist} \
-           -o ${CDROM.image} ${CDROM.dir}
+           -o ${CDROM_IMAGE} ${CDROM.dir}
 
 # iso-image-md-pre --
 #      Setup ${CDROM.dir} to produce a bootable CD image.
diff -r 76b89adf5a5b -r 90532d38a896 etc/etc.sgimips/Makefile.inc
--- a/etc/etc.sgimips/Makefile.inc      Sun Jan 15 17:33:23 2012 +0000
+++ b/etc/etc.sgimips/Makefile.inc      Sun Jan 15 17:36:55 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.21 2010/12/27 03:38:53 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.22 2012/01/15 17:36:55 joerg Exp $
 #
 #      etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
 #
@@ -36,7 +36,7 @@
 iso-image-md-post:
        @SEEK=$$(${TOOL_AWK} '/SGI_BOOT_BLOCK_SIZE_VOLHDR/{print $$3}' \
                ${DESTDIR}/usr/include/sys/bootblock.h) ; \
-       EST=$$(ls -l ${CDROM.image} \
+       EST=$$(ls -l ${CDROM_IMAGE} \
                | ${TOOL_AWK} '{ s += $$5 } \
                        END { print int(('$${SEEK}'*512+s)/1024/1024/32+1)*32 \
                        }') ; \
@@ -49,6 +49,6 @@
                ${SGI.image}; \
        ${TOOLDIR}/bin/nbsgivol -f -w ip3xboot ${DESTDIR}/usr/mdec/ip3xboot \
                ${SGI.image}; \
-       dd if=${CDROM.image} of=${SGI.image} bs=512 seek=$${SEEK}
-       mv ${SGI.image} ${CDROM.image}
+       dd if=${CDROM_IMAGE} of=${SGI.image} bs=512 seek=$${SEEK}
+       mv ${SGI.image} ${CDROM_IMAGE}
        rm -f ${RELEASEDIR}/ip2x ${RELEASEDIR}/ip3x
diff -r 76b89adf5a5b -r 90532d38a896 etc/etc.sparc/Makefile.inc
--- a/etc/etc.sparc/Makefile.inc        Sun Jan 15 17:33:23 2012 +0000
+++ b/etc/etc.sparc/Makefile.inc        Sun Jan 15 17:36:55 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.41 2008/03/18 04:20:37 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.42 2012/01/15 17:36:55 joerg Exp $
 #
 #      etc.sparc/Makefile.inc -- sparc-specific etc Makefile targets
 #
@@ -53,4 +53,4 @@
 iso-image-md-post:
        SUNLABEL=${TOOL_SUNLABEL:Q} \
            ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \
-           ${CDROM.image} ${CDBOOTIMAGE} ${CDBOOTIMAGE} ${CDBOOTIMAGE}
+           ${CDROM_IMAGE} ${CDBOOTIMAGE} ${CDBOOTIMAGE} ${CDBOOTIMAGE}
diff -r 76b89adf5a5b -r 90532d38a896 etc/etc.sparc64/Makefile.inc
--- a/etc/etc.sparc64/Makefile.inc      Sun Jan 15 17:33:23 2012 +0000
+++ b/etc/etc.sparc64/Makefile.inc      Sun Jan 15 17:36:55 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.31 2010/03/13 08:36:06 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.32 2012/01/15 17:36:55 joerg Exp $
 #
 #      etc.sparc64/Makefile.inc -- sparc64-specific etc Makefile targets
 #
@@ -79,4 +79,4 @@
 iso-image-md-post:
        SUNLABEL=${TOOL_SUNLABEL:Q} \
            ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \
-           ${CDROM.image} - - - - ${ISOBOOTFILE}
+           ${CDROM_IMAGE} - - - - ${ISOBOOTFILE}
diff -r 76b89adf5a5b -r 90532d38a896 etc/etc.vax/Makefile.inc
--- a/etc/etc.vax/Makefile.inc  Sun Jan 15 17:33:23 2012 +0000
+++ b/etc/etc.vax/Makefile.inc  Sun Jan 15 17:36:55 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.23 2008/03/18 04:20:37 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.24 2012/01/15 17:36:55 joerg Exp $
 #
 #      etc.vax/Makefile.inc -- vax-specific etc Makefile targets
 #
@@ -20,4 +20,4 @@
        cp -f ${DESTDIR}/usr/mdec/boot ${CDROM.dir}
 
 iso-image-md-post:
-       ${TOOL_INSTALLBOOT} -m ${MACHINE} ${CDROM.image} ${DESTDIR}/usr/mdec/xxboot
+       ${TOOL_INSTALLBOOT} -m ${MACHINE} ${CDROM_IMAGE} ${DESTDIR}/usr/mdec/xxboot