Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that the name of the ISO image is no longer stable, rename the

Browse Source 
variable to make it possible to overwrite the default with
build.sh -V CDROM_IMAGE=...
This commit is contained in:
joerg 2012-01-15 17:36:55 +00:00
parent e5f626f9f7
commit 6bc6b7aae6
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/Makefile
View File

@ -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 # from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values: # 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. # Note: At least mkisofs 2.0 should be used.
# #
CDROM_NAME_ADD?= 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.dir= ${.OBJDIR}/cdrom.dir
CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist
@ -432,7 +432,7 @@ iso-image:
.if ${MKISOFS} != true .if ${MKISOFS} != true
do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post
${MAKESUMS} -t ${RELEASEDIR}/iso/ '*.iso' ${MAKESUMS} -t ${RELEASEDIR}/iso/ '*.iso'
@echo "iso-image created as: ${CDROM.image}" @echo "iso-image created as: ${CDROM_IMAGE}"
.else .else
do-iso-image: do-iso-image:
@echo iso-image: mkisofs not found @echo iso-image: mkisofs not found
@ -458,7 +458,7 @@ iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre
false; \ false; \
fi fi
${MKISOFS} ${MKISOFS_FLAGS} -graft-points -path-list ${CDROM.pathlist} \ ${MKISOFS} ${MKISOFS_FLAGS} -graft-points -path-list ${CDROM.pathlist} \
-o ${CDROM.image} ${CDROM.dir} -o ${CDROM_IMAGE} ${CDROM.dir}
# iso-image-md-pre -- # iso-image-md-pre --
# Setup ${CDROM.dir} to produce a bootable CD image. # Setup ${CDROM.dir} to produce a bootable CD image.

8
etc/etc.sgimips/Makefile.inc
View File

@ -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 # 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: iso-image-md-post:
@SEEK=$$(${TOOL_AWK} '/SGI_BOOT_BLOCK_SIZE_VOLHDR/{print $$3}' \ @SEEK=$$(${TOOL_AWK} '/SGI_BOOT_BLOCK_SIZE_VOLHDR/{print $$3}' \
${DESTDIR}/usr/include/sys/bootblock.h) ; \ ${DESTDIR}/usr/include/sys/bootblock.h) ; \
EST=$$(ls -l ${CDROM.image} \ EST=$$(ls -l ${CDROM_IMAGE} \
| ${TOOL_AWK} '{ s += $$5 } \ | ${TOOL_AWK} '{ s += $$5 } \
END { print int(('$${SEEK}'*512+s)/1024/1024/32+1)*32 \ END { print int(('$${SEEK}'*512+s)/1024/1024/32+1)*32 \
}') ; \ }') ; \
@ -49,6 +49,6 @@ iso-image-md-post:
${SGI.image}; \ ${SGI.image}; \
${TOOLDIR}/bin/nbsgivol -f -w ip3xboot ${DESTDIR}/usr/mdec/ip3xboot \ ${TOOLDIR}/bin/nbsgivol -f -w ip3xboot ${DESTDIR}/usr/mdec/ip3xboot \
${SGI.image}; \ ${SGI.image}; \
dd if=${CDROM.image} of=${SGI.image} bs=512 seek=$${SEEK} dd if=${CDROM_IMAGE} of=${SGI.image} bs=512 seek=$${SEEK}
mv ${SGI.image} ${CDROM.image} mv ${SGI.image} ${CDROM_IMAGE}
rm -f ${RELEASEDIR}/ip2x ${RELEASEDIR}/ip3x rm -f ${RELEASEDIR}/ip2x ${RELEASEDIR}/ip3x

4
etc/etc.sparc/Makefile.inc
View File

@ -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 # etc.sparc/Makefile.inc -- sparc-specific etc Makefile targets
# #
@ -53,4 +53,4 @@ CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/boot.fs
iso-image-md-post: iso-image-md-post:
SUNLABEL=${TOOL_SUNLABEL:Q} \ SUNLABEL=${TOOL_SUNLABEL:Q} \
${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \ ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \
${CDROM.image} ${CDBOOTIMAGE} ${CDBOOTIMAGE} ${CDBOOTIMAGE} ${CDROM_IMAGE} ${CDBOOTIMAGE} ${CDBOOTIMAGE} ${CDBOOTIMAGE}

4
etc/etc.sparc64/Makefile.inc
View File

@ -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 # etc.sparc64/Makefile.inc -- sparc64-specific etc Makefile targets
# #
@ -79,4 +79,4 @@ ISOBOOTFILE?= ${ISOBOOTFILEDIR}/boot.fs
iso-image-md-post: iso-image-md-post:
SUNLABEL=${TOOL_SUNLABEL:Q} \ SUNLABEL=${TOOL_SUNLABEL:Q} \
${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \ ${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \
${CDROM.image} - - - - ${ISOBOOTFILE} ${CDROM_IMAGE} - - - - ${ISOBOOTFILE}

4
etc/etc.vax/Makefile.inc
View File

@ -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 # 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} cp -f ${DESTDIR}/usr/mdec/boot ${CDROM.dir}
iso-image-md-post: iso-image-md-post:
${TOOL_INSTALLBOOT} -m ${MACHINE} ${CDROM.image} ${DESTDIR}/usr/mdec/xxboot ${TOOL_INSTALLBOOT} -m ${MACHINE} ${CDROM_IMAGE} ${DESTDIR}/usr/mdec/xxboot