Module Name: src
Committed By: ast
Date: Sat Sep 14 12:51:27 UTC 2013
Modified Files:
src/distrib/utils/embedded: mkimage
src/distrib/utils/embedded/conf: beagleboard.conf rpi.conf
rpi_inst.conf
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/embedded/conf/beagleboard.conf
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/embedded/conf/rpi.conf
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/rpi_inst.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.43 src/distrib/utils/embedded/mkimage:1.44
--- src/distrib/utils/embedded/mkimage:1.43 Thu Jun 27 14:51:30 2013
+++ src/distrib/utils/embedded/mkimage Sat Sep 14 12:51:27 2013
@@ -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 @@ PROG="$(basename "$0")"
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 @@ fi
if $compress; then
echo ${bar} Compressing image ${bar}
rm -f "${image}.gz"
- ${GZIP} -9 ${image}
+ ${GZIP_CMD} -9 ${image}
image="${image}.gz"
fi
Index: src/distrib/utils/embedded/conf/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.15 src/distrib/utils/embedded/conf/beagleboard.conf:1.16
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.15 Wed Aug 21 22:52:28 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Sat Sep 14 12:51:27 2013
@@ -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 @@ EOF
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 @@ EOF
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}"
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.21 src/distrib/utils/embedded/conf/rpi.conf:1.22
--- src/distrib/utils/embedded/conf/rpi.conf:1.21 Thu Aug 1 10:45:21 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Sat Sep 14 12:51:27 2013
@@ -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
Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.2 src/distrib/utils/embedded/conf/rpi_inst.conf:1.3
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.2 Wed Mar 20 14:47:20 2013
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Sat Sep 14 12:51:27 2013
@@ -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 @@ EOF
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
