Module Name: src Committed By: msaitoh Date: Sat Nov 8 12:27:25 UTC 2014
Modified Files: src/distrib/alpha/cdroms/installcd [netbsd-5-1]: Makefile src/distrib/pmax/cdroms/installcd [netbsd-5-1]: Makefile src/distrib/prep/cdroms/installcd [netbsd-5-1]: Makefile src/distrib/sgimips/cdroms/installcd [netbsd-5-1]: Makefile src/distrib/sparc/cdroms/installcd [netbsd-5-1]: Makefile src/distrib/sparc64/cdroms/installcd [netbsd-5-1]: Makefile src/distrib/sun3/cdroms/installcd [netbsd-5-1]: Makefile src/distrib/vax/cdroms/installcd [netbsd-5-1]: Makefile Log Message: Pullup follwing revisions to fix build break of ticket 1931 on some archs: distrib/alpha/cdroms/installcd/Makefile 1.2 distrib/pmax/cdroms/installcd/Makefile 1.2 distrib/prep/cdroms/installcd/Makefile 1.3 distrib/sgimips/cdroms/installcd/Makefile 1.2 distrib/sparc/cdroms/installcd/Makefile 1.2 distrib/sparc64/cdroms/installcd/Makefile 1.14 distrib/sun3/cdroms/installcd/Makefile 1.2 distrib/vax/cdroms/installcd/Makefile 1.2 Use ${CDIMAGE} instead of ${CDBASE}.iso. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.30.1 src/distrib/alpha/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.1.30.1 src/distrib/pmax/cdroms/installcd/Makefile cvs rdiff -u -r1.2 -r1.2.12.1 src/distrib/prep/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.1.30.1 src/distrib/sgimips/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.1.30.1 src/distrib/sparc/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.1.30.1 src/distrib/sparc64/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.1.30.1 src/distrib/sun3/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.1.30.1 src/distrib/vax/cdroms/installcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/alpha/cdroms/installcd/Makefile diff -u src/distrib/alpha/cdroms/installcd/Makefile:1.1 src/distrib/alpha/cdroms/installcd/Makefile:1.1.30.1 --- src/distrib/alpha/cdroms/installcd/Makefile:1.1 Tue Mar 6 21:56:49 2007 +++ src/distrib/alpha/cdroms/installcd/Makefile Sat Nov 8 12:27:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2007/03/06 21:56:49 bouyer Exp $ +# $NetBSD: Makefile,v 1.1.30.1 2014/11/08 12:27:25 msaitoh Exp $ CDBASE= alphacd # gives ${CDBASE}.iso CDINSTKERNEL= ../../instkernel/instkernel CDKERNELS= netbsd netbsd @@ -6,7 +6,7 @@ CDRELEASE= true # include $RELEASEDIR/ #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" Index: src/distrib/pmax/cdroms/installcd/Makefile diff -u src/distrib/pmax/cdroms/installcd/Makefile:1.1 src/distrib/pmax/cdroms/installcd/Makefile:1.1.30.1 --- src/distrib/pmax/cdroms/installcd/Makefile:1.1 Tue Mar 6 21:57:16 2007 +++ src/distrib/pmax/cdroms/installcd/Makefile Sat Nov 8 12:27:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:16 bouyer Exp $ +# $NetBSD: Makefile,v 1.1.30.1 2014/11/08 12:27:25 msaitoh Exp $ CDBASE= pmaxcd # gives ${CDBASE}.iso CDRELEASE= true # include $RELEASEDIR/$MACHINE CDKERNELS= netbsd-INSTALL.gz netbsd @@ -6,6 +6,6 @@ CDINSTKERNEL= ../../instkernel #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" Index: src/distrib/prep/cdroms/installcd/Makefile diff -u src/distrib/prep/cdroms/installcd/Makefile:1.2 src/distrib/prep/cdroms/installcd/Makefile:1.2.12.1 --- src/distrib/prep/cdroms/installcd/Makefile:1.2 Wed Apr 30 08:08:32 2008 +++ src/distrib/prep/cdroms/installcd/Makefile Sat Nov 8 12:27:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/04/30 08:08:32 garbled Exp $ +# $NetBSD: Makefile,v 1.2.12.1 2014/11/08 12:27:25 msaitoh 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 @@ CDMAKEFSOPTIONS=bootimage=powerpc;cdrom/ # 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" Index: src/distrib/sgimips/cdroms/installcd/Makefile diff -u src/distrib/sgimips/cdroms/installcd/Makefile:1.1 src/distrib/sgimips/cdroms/installcd/Makefile:1.1.30.1 --- src/distrib/sgimips/cdroms/installcd/Makefile:1.1 Tue Mar 6 21:57:22 2007 +++ src/distrib/sgimips/cdroms/installcd/Makefile Sat Nov 8 12:27:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:22 bouyer Exp $ +# $NetBSD: Makefile,v 1.1.30.1 2014/11/08 12:27:25 msaitoh Exp $ CDBASE= sgimipscd # gives ${CDBASE}.iso CDRELEASE= true # include $RELEASEDIR/$MACHINE CDKERNELS= netbsd-INSTALL32_IP2x.gz ip2x @@ -9,14 +9,14 @@ 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 + 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" Index: src/distrib/sparc/cdroms/installcd/Makefile diff -u src/distrib/sparc/cdroms/installcd/Makefile:1.1 src/distrib/sparc/cdroms/installcd/Makefile:1.1.30.1 --- src/distrib/sparc/cdroms/installcd/Makefile:1.1 Tue Mar 6 21:57:23 2007 +++ src/distrib/sparc/cdroms/installcd/Makefile Sat Nov 8 12:27:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:23 bouyer Exp $ +# $NetBSD: Makefile,v 1.1.30.1 2014/11/08 12:27:25 msaitoh Exp $ CDBASE= sparccd # gives ${CDBASE}.iso CDRELEASE= true # include $RELEASEDIR/$MACHINE @@ -11,7 +11,7 @@ SUN_BOOT_ARGS:= ${CDBOOTIMAGE} ${CDBOOTI 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" Index: src/distrib/sparc64/cdroms/installcd/Makefile diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.1 src/distrib/sparc64/cdroms/installcd/Makefile:1.1.30.1 --- src/distrib/sparc64/cdroms/installcd/Makefile:1.1 Tue Mar 6 21:57:24 2007 +++ src/distrib/sparc64/cdroms/installcd/Makefile Sat Nov 8 12:27:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:24 bouyer Exp $ +# $NetBSD: Makefile,v 1.1.30.1 2014/11/08 12:27:25 msaitoh Exp $ CDBASE= sparc64cd # gives ${CDBASE}.iso CDRELEASE= true # include $RELEASEDIR/$MACHINE @@ -11,7 +11,7 @@ SUN_BOOT_ARGS:= - - - - ${CDBOOTIMAGE} 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" Index: src/distrib/sun3/cdroms/installcd/Makefile diff -u src/distrib/sun3/cdroms/installcd/Makefile:1.1 src/distrib/sun3/cdroms/installcd/Makefile:1.1.30.1 --- src/distrib/sun3/cdroms/installcd/Makefile:1.1 Tue Mar 6 21:57:26 2007 +++ src/distrib/sun3/cdroms/installcd/Makefile Sat Nov 8 12:27:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:26 bouyer Exp $ +# $NetBSD: Makefile,v 1.1.30.1 2014/11/08 12:27:25 msaitoh Exp $ CDBASE= sun3cd # gives ${CDBASE}.iso CDRELEASE= true # include $RELEASEDIR/$MACHINE @@ -12,7 +12,7 @@ SUN_BOOT_ARGS:= - - - ${CDBOOTIMAGE} ${C 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" Index: src/distrib/vax/cdroms/installcd/Makefile diff -u src/distrib/vax/cdroms/installcd/Makefile:1.1 src/distrib/vax/cdroms/installcd/Makefile:1.1.30.1 --- src/distrib/vax/cdroms/installcd/Makefile:1.1 Tue Mar 6 21:57:27 2007 +++ src/distrib/vax/cdroms/installcd/Makefile Sat Nov 8 12:27:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:27 bouyer Exp $ +# $NetBSD: Makefile,v 1.1.30.1 2014/11/08 12:27:25 msaitoh Exp $ CDBASE= vaxcd # gives ${CDBASE}.iso CDRELEASE= true # include $RELEASEDIR/$MACHINE CDKERNELS= install.ram.gz netbsd @@ -12,6 +12,6 @@ prepare_md_post: ${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"