[src/trunk]: src/distrib/utils/embedded Fix build release of evbarm which had...

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

details:   https://anonhg.NetBSD.org/src/rev/75582f503231
branches:  trunk
changeset: 789965:75582f503231
user:      ast <ast%NetBSD.org@localhost>
date:      Sat Sep 14 12:51:27 2013 +0000

description:
Fix build release of evbarm which had been failing in mkimage
beagleboard_smp with the elusive message:

    "gzip: can't stat: gzip: No such file or directory"

This was due to GZIP=gzip being defined in mkimage; we now use:

    GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)

as distrib/sets/sets.subr already does in these files as well:

    distrib/utils/embedded/mkimage
    distrib/utils/embedded/conf/beagleboard.conf
    distrib/utils/embedded/conf/rpi.conf
    distrib/utils/embedded/conf/rpi_inst.conf

diffstat:

 distrib/utils/embedded/conf/beagleboard.conf |  8 +++++---
 distrib/utils/embedded/conf/rpi.conf         |  4 +++-
 distrib/utils/embedded/conf/rpi_inst.conf    |  6 ++++--
 distrib/utils/embedded/mkimage               |  6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diffs (106 lines):

diff -r da2c9eadcc2e -r 75582f503231 distrib/utils/embedded/conf/beagleboard.conf
--- a/distrib/utils/embedded/conf/beagleboard.conf      Sat Sep 14 12:44:17 2013 +0000
+++ b/distrib/utils/embedded/conf/beagleboard.conf      Sat Sep 14 12:51:27 2013 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: beagleboard.conf,v 1.15 2013/08/21 22:52:28 jmcneill Exp $
+# $NetBSD: beagleboard.conf,v 1.16 2013/09/14 12:51:27 ast Exp $
 # BeagleBoard customization script used by mkimage
 #
 board=beagleboard
 
+GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
+
 . ${DIR}/conf/evbarm.conf
 
 bboard_kernelimg=bboard.ub
@@ -48,7 +50,7 @@
        echo "${bar} installing ${bboard_kernel} to /boot/${bboard_kernelimg} ${bar}"
        case "${bboard_kernel}" in
        *.gz)
-               gzip -dc "${bboard_kernel}" > "${mnt}/boot/${bboard_kernelimg}"
+               ${GZIP_CMD} -dc "${bboard_kernel}" > "${mnt}/boot/${bboard_kernelimg}"
                ;;
        *)
                cp "${bboard_kernel}" "${mnt}/boot/${bboard_kernelimg}"
@@ -58,7 +60,7 @@
        echo "${bar} installing ${bbone_kernel} to /boot/${bbone_kernelimg} ${bar}"
        case "${bbone_kernel}" in
        *.gz)
-               gzip -dc "${bbone_kernel}" > "${mnt}/boot/${bbone_kernelimg}"
+               ${GZIP_CMD} -dc "${bbone_kernel}" > "${mnt}/boot/${bbone_kernelimg}"
                ;;
        *)
                cp "${bbone_kernel}" "${mnt}/boot/${bbone_kernelimg}"
diff -r da2c9eadcc2e -r 75582f503231 distrib/utils/embedded/conf/rpi.conf
--- a/distrib/utils/embedded/conf/rpi.conf      Sat Sep 14 12:44:17 2013 +0000
+++ b/distrib/utils/embedded/conf/rpi.conf      Sat Sep 14 12:51:27 2013 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: rpi.conf,v 1.21 2013/08/01 10:45:21 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.22 2013/09/14 12:51:27 ast Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
 board=rpi
 kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI.bin
 
+GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
+
 . ${DIR}/conf/evbarm.conf
 
 firmwaredir=$src/external/broadcom/rpi-firmware/dist
diff -r da2c9eadcc2e -r 75582f503231 distrib/utils/embedded/conf/rpi_inst.conf
--- a/distrib/utils/embedded/conf/rpi_inst.conf Sat Sep 14 12:44:17 2013 +0000
+++ b/distrib/utils/embedded/conf/rpi_inst.conf Sat Sep 14 12:51:27 2013 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: rpi_inst.conf,v 1.2 2013/03/20 14:47:20 garbled Exp $
+# $NetBSD: rpi_inst.conf,v 1.3 2013/09/14 12:51:27 ast Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
 board=rpi_inst
 kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI_INSTALL.bin
 
+GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
+
 image=$HOME/${board}.img
 
 specialdirs="/kern /proc"
@@ -105,7 +107,7 @@
        echo "${bar} installing kernel ${bar}"
        case ${kernel} in
        *.gz)
-               gzip -dc ${kernel} > ${mnt}/boot/kernel.img
+               ${GZIP_CMD} -dc ${kernel} > ${mnt}/boot/kernel.img
                ;;
        *)
                cp ${kernel} ${mnt}/boot/kernel.img
diff -r da2c9eadcc2e -r 75582f503231 distrib/utils/embedded/mkimage
--- a/distrib/utils/embedded/mkimage    Sat Sep 14 12:44:17 2013 +0000
+++ b/distrib/utils/embedded/mkimage    Sat Sep 14 12:51:27 2013 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkimage,v 1.43 2013/06/27 14:51:30 christos Exp $
+# $NetBSD: mkimage,v 1.44 2013/09/14 12:51:27 ast Exp $
 #
 # Copyright (c) 2013 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,9 +39,9 @@
 
 DISKLABEL=${TOOL_DISKLABEL:-disklabel}
 FDISK=${TOOL_FDISK:-fdisk}
-GZIP=${TOOL_GZIP:-gzip}
 MAKEFS=${TOOL_MAKEFS:-makefs}
 MTREE=${TOOL_MTREE:-mtree}
+GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
 
 src="/usr/src"
 release="/usr/obj/evbarm/release"
@@ -200,7 +200,7 @@
 if $compress; then
        echo ${bar} Compressing image ${bar}
        rm -f "${image}.gz"
-       ${GZIP} -9 ${image}
+       ${GZIP_CMD} -9 ${image}
        image="${image}.gz"
 fi