[src/netbsd-3]: src/distrib/cdrom Pull up following revision(s) (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/f8a5919d00b0
branches:  netbsd-3
changeset: 577318:f8a5919d00b0
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Oct 06 11:45:59 2005 +0000

description:
Pull up following revision(s) (requested by martin in ticket #862):
        distrib/cdrom/Makefile: revision 1.25
        distrib/cdrom/NetBSD-current.mk: revision 1.3
Make sgimipscd.iso bootable.

diffstat:

 distrib/cdrom/Makefile          |  21 ++++++++++++++++++++-
 distrib/cdrom/NetBSD-current.mk |  13 ++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diffs (76 lines):

diff -r 9ab9bf3b59fa -r f8a5919d00b0 distrib/cdrom/Makefile
--- a/distrib/cdrom/Makefile    Thu Oct 06 11:45:26 2005 +0000
+++ b/distrib/cdrom/Makefile    Thu Oct 06 11:45:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/01/20 08:05:55 jmc Exp $
+# $NetBSD: Makefile,v 1.24.2.1 2005/10/06 11:45:59 tron Exp $
 #
 # Consult "*.conf" for the configuration variables; this Makefile is typically
 # not edited for basic configuration changes.
@@ -365,6 +365,11 @@
 .if !empty(BASE_PORTS.${image}:Mmacppc)
 size-${image}: all-macppc_installboot
 .endif
+.if !empty(BASE_PORTS.${image}:Msgimips)
+SGIVOLHDR.size != ( fgrep SGI_BOOT_BLOCK_SIZE_VOLHDR \
+               ${EXTFILEDIR}/sgimips.bootblock.h | \
+                sed -e 's/[^0-9]*//' )
+.endif
 
 size-${image}: stage-${image} extfileprep fileprep-${image}
        @size=$$((`cd ${STAGEDIR}/${image} && ${MKISOFS} ${MKISOFS_ARGS} ${MKISOFS_ARGS.${image}} -print-size . 2>&1 | tee /dev/stderr | sed '/=/!d;s/^[^=]*=//'` * 2048)) && \
@@ -385,6 +390,9 @@
        if [ "${BASE_PORTS.${image}:Mvax}" != "" ]; then \
                size=$$(($$size + $$(($$((`ls -l ${BOOTFILE.vax} | awk '{print $$5}'` + 511)) / 512 * 512)))); \
        fi && \
+       if [ "${BASE_PORTS.${image}:Msgimips}" != "" ]; then \
+               size=$$(($$size + ${SGIVOLHDR.size} * 512)); \
+       fi && \
        size=$$(($$(($$size + 16383)) / 16384 * 16384 + 32768)) && \
        sizek=$$(($$size / 1024)) && \
        echo "Projected size of ${image}.iso: $$size bytes ($${sizek}K)." && \
@@ -418,6 +426,17 @@
 .if !empty(BASE_PORTS.${image}:Malpha)
        ${ALPHA_IBOOT} $@ ${BOOTFILE.alpha}
 .endif
+.if !empty(BASE_PORTS.${image}:Msgimips)
+       @echo "Prepending SGI volume header"
+       cp $@ $@.tmp
+       dd if=/dev/zero bs=512 count=${SGIVOLHDR.size} >> $@
+       ${TOOLDIR}/bin/nbsgivol -f -i $@
+       ${TOOLDIR}/bin/nbsgivol -f -w aoutboot ${STAGEDIR}/sgimipscd/aoutboot $@
+       ${TOOLDIR}/bin/nbsgivol -f -w ip2xboot ${STAGEDIR}/sgimipscd/ip2xboot $@
+       ${TOOLDIR}/bin/nbsgivol -f -w ip3xboot ${STAGEDIR}/sgimipscd/ip3xboot $@
+       dd if=$@.tmp of=$@ bs=512 seek=${SGIVOLHDR.size}
+       rm -f $@.tmp
+.endif
        @echo Rounding up to 32k boundary and padding 32k....
        @size=`ls -l $@ | awk '{print $$5}'` && \
        newsize=$$(($$(($$size + 32767)) / 32768 * 32768)) && \
diff -r 9ab9bf3b59fa -r f8a5919d00b0 distrib/cdrom/NetBSD-current.mk
--- a/distrib/cdrom/NetBSD-current.mk   Thu Oct 06 11:45:26 2005 +0000
+++ b/distrib/cdrom/NetBSD-current.mk   Thu Oct 06 11:45:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD-current.mk,v 1.2 2004/12/06 20:05:10 jmc Exp $
+# $NetBSD: NetBSD-current.mk,v 1.2.2.1 2005/10/06 11:45:59 tron Exp $
 #
 # Configuration file for NetBSD-current.
 
@@ -33,6 +33,17 @@
 INTFILES.pmax=         netbsd.pmax:pmax/binary/kernel/netbsd-INSTALL.gz,link \
                        boot.pmax:pmax/binary/sets/base.tgz,./usr/mdec/boot.pmax
 
+# sgimips needs the compressed kernels with short names in /, the various
+# boot files that go into the volume header and the bootblock.h file
+# to grep for the volume header size
+EXTFILES.sgimips=      sgimips.bootblock.h:sgimips/binary/sets/comp.tgz,./usr/include/sys/bootblock.h
+INTFILES.sgimips=      aoutboot:sgimips/binary/sets/base.tgz,./usr/mdec/aoutboot \
+                       ip2xboot:sgimips/binary/sets/base.tgz,./usr/mdec/ip2xboot \
+                       ip3xboot:sgimips/binary/sets/base.tgz,./usr/mdec/ip3xboot \
+                       ip2x:sgimips/binary/kernel/netbsd-INSTALL32_IP2x.gz,link \
+                       ip3x:sgimips/binary/kernel/netbsd-INSTALL32_IP3x.gz,link
+
+
 # BOOTFILE.sparc is absolute
 BOOTFILE.sparc=                ${EXTFILEDIR}/sparc-boot.fs
 EXTFILES.sparc=                sparc-boot.fs:sparc/installation/bootfs/boot.fs.gz