From 6bc6b7aae656ef8134a7bacf99d993d3692c16d3 Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 15 Jan 2012 17:36:55 +0000 Subject: [PATCH] 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=... --- 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(-) diff --git a/etc/Makefile b/etc/Makefile index 5bfd9472c6b0..02560c8efb7b 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 @@ release snapshot: .PHONY .MAKE check_DESTDIR check_RELEASEDIR snap_md_post # 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 @@ iso-image: .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 @@ iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre 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 --git a/etc/etc.sgimips/Makefile.inc b/etc/etc.sgimips/Makefile.inc index eca310e16724..ce5c27d6471d 100644 --- a/etc/etc.sgimips/Makefile.inc +++ b/etc/etc.sgimips/Makefile.inc @@ -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 @@ SGI.image= ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom/netbsd-sgimips. 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 @@ iso-image-md-post: ${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 --git a/etc/etc.sparc/Makefile.inc b/etc/etc.sparc/Makefile.inc index d4bce362261b..5761e2b7b452 100644 --- a/etc/etc.sparc/Makefile.inc +++ b/etc/etc.sparc/Makefile.inc @@ -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 @@ CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/boot.fs 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 --git a/etc/etc.sparc64/Makefile.inc b/etc/etc.sparc64/Makefile.inc index 188c9fbcac16..d7607b7b9b5f 100644 --- a/etc/etc.sparc64/Makefile.inc +++ b/etc/etc.sparc64/Makefile.inc @@ -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 @@ ISOBOOTFILE?= ${ISOBOOTFILEDIR}/boot.fs iso-image-md-post: SUNLABEL=${TOOL_SUNLABEL:Q} \ ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \ - ${CDROM.image} - - - - ${ISOBOOTFILE} + ${CDROM_IMAGE} - - - - ${ISOBOOTFILE} diff --git a/etc/etc.vax/Makefile.inc b/etc/etc.vax/Makefile.inc index 4153f3c7d118..8bb15cd5e386 100644 --- a/etc/etc.vax/Makefile.inc +++ b/etc/etc.vax/Makefile.inc @@ -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 @@ iso-image-md-pre: 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