Module Name: src
Committed By: jakllsch
Date: Sun Jun 16 13:47:43 UTC 2013
Modified Files:
src/distrib/utils/embedded: mkimage
src/etc/etc.evbarm: Makefile.inc
Log Message:
Use TOOL_GZIP in mkimage, and pass the TOOL_GZIP into it.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.51 -r1.52 src/etc/etc.evbarm/Makefile.inc
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.39 src/distrib/utils/embedded/mkimage:1.40
--- src/distrib/utils/embedded/mkimage:1.39 Mon May 20 19:27:17 2013
+++ src/distrib/utils/embedded/mkimage Sun Jun 16 13:47:42 2013
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.39 2013/05/20 19:27:17 christos Exp $
+# $NetBSD: mkimage,v 1.40 2013/06/16 13:47:42 jakllsch Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,6 +39,7 @@ PROG="$(basename "$0")"
DISKLABEL=${TOOL_DISKLABEL:-disklabel}
FDISK=${TOOL_FDISK:-fdisk}
+GZIP=${TOOL_GZIP:-gzip}
MAKEFS=${TOOL_MAKEFS:-makefs}
MTREE=${TOOL_MTREE:-mtree}
@@ -199,7 +200,7 @@ fi
if $compress; then
echo ${bar} Compressing image ${bar}
rm -f "${image}.gz"
- gzip -9 ${image}
+ ${GZIP} -9 ${image}
image="${image}.gz"
fi
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.51 src/etc/etc.evbarm/Makefile.inc:1.52
--- src/etc/etc.evbarm/Makefile.inc:1.51 Sat Mar 23 11:51:47 2013
+++ src/etc/etc.evbarm/Makefile.inc Sun Jun 16 13:47:42 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.51 2013/03/23 11:51:47 he Exp $
+# $NetBSD: Makefile.inc,v 1.52 2013/06/16 13:47:42 jakllsch Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -26,6 +26,7 @@ __mkimage: .USE
TOOL_MAKEFS=${TOOL_MAKEFS} \
TOOL_DISKLABEL=${TOOL_DISKLABEL} \
TOOL_FDISK=${TOOL_FDISK} \
+ TOOL_GZIP=${TOOL_GZIP} \
TOOL_MKNOD=${TOOL_MKNOD} \
TOOL_PAX=${TOOL_PAX} \
TOOL_MTREE=${TOOL_MTREE} \
