[src/netbsd-3]: src/etc/etc.sgimips Pull up following revision(s) (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/2eff9db1fd07
branches:  netbsd-3
changeset: 577316:2eff9db1fd07
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Oct 06 11:43:49 2005 +0000

description:
Pull up following revision(s) (requested by martin in ticket #862):
        etc/etc.sgimips/Makefile.inc: revision 1.13
Tweak the iso-image support: avoid arbitrary hardcoded sizes - use awk to
estimate the real size and round up a bit instead. Doesn't matter much, but
produces a "better" sgi volume header.
While there, simplify a few bits and avoid grep|awk pipes.

diffstat:

 etc/etc.sgimips/Makefile.inc |  16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r fb2f64d8f6f5 -r 2eff9db1fd07 etc/etc.sgimips/Makefile.inc
--- a/etc/etc.sgimips/Makefile.inc      Thu Oct 06 11:43:12 2005 +0000
+++ b/etc/etc.sgimips/Makefile.inc      Thu Oct 06 11:43:49 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.11.2.1 2005/10/06 11:43:12 tron Exp $
+#      $NetBSD: Makefile.inc,v 1.11.2.2 2005/10/06 11:43:49 tron Exp $
 #
 #      etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
 #
@@ -14,15 +14,19 @@
                        installation/diskimage
 
 iso-image-md-pre:
-       gzip -d -c ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-INSTALL32_IP2x.gz > ${RELEASEDIR}/ip2x
-       gzip -d -c ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-INSTALL32_IP3x.gz > ${RELEASEDIR}/ip3x
+       cp ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-INSTALL32_IP2x.gz ${RELEASEDIR}/ip2x
+       cp ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-INSTALL32_IP3x.gz ${RELEASEDIR}/ip3x
        echo "ip2x=${RELEASEDIR}/ip2x" >> ${CDROM.pathlist}
        echo "ip3x=${RELEASEDIR}/ip3x" >> ${CDROM.pathlist}
 
 SGI.image= ${RELEASEDIR}/${MACHINE}/installation/cdrom/netbsd-sgimips.img
 
 iso-image-md-post:
-       dd if=/dev/zero of=${SGI.image} bs=1024k count=120
+       EST=`ls -l ${CDROM.image} ${DESTDIR}/usr/mdec/aoutboot \
+               ${DESTDIR}/usr/mdec/ip2xboot  ${DESTDIR}/usr/mdec/ip3xboot \
+               | awk '{ s += $$5} END { print int(s/1024/1024/32+1)*32 }'` ; \
+               echo "Estimated image size: $${EST} MB"; \
+               dd if=/dev/zero of=${SGI.image} bs=1024k count=$${EST}
        ${TOOLDIR}/bin/nbsgivol -f -i ${SGI.image}
        ${TOOLDIR}/bin/nbsgivol -f -w aoutboot ${DESTDIR}/usr/mdec/aoutboot \
                ${SGI.image}
@@ -31,8 +35,8 @@
        ${TOOLDIR}/bin/nbsgivol -f -w ip3xboot ${DESTDIR}/usr/mdec/ip3xboot \
                ${SGI.image}
 # Don't hardcode this. Pick it up from bootblock.h
-       SEEK=`egrep SGI_BOOT_BLOCK_SIZE_VOLHDR \
-               ${DESTDIR}/usr/include/sys/bootblock.h | sed -e 's/[^0-9]*//'`; \
+       SEEK=`awk '/SGI_BOOT_BLOCK_SIZE_VOLHDR/{print $$3}' \
+               ${DESTDIR}/usr/include/sys/bootblock.h` ; \
                dd if=${CDROM.image} of=${SGI.image} bs=512 seek=$${SEEK}
        mv ${SGI.image} ${CDROM.image}
        rm -f ${RELEASEDIR}/ip2x ${RELEASEDIR}/ip3x