summaryrefslogtreecommitdiff
path: root/arch/arm/boot/deflate_xip_data.sh
diff options
context:
space:
mode:
authorDenis Efremov <efremov@linux.com>2020-06-08 12:59:44 +0300
committerMasahiro Yamada <masahiroy@kernel.org>2020-06-11 20:14:41 +0900
commite4a42c82e943b97ce124539fcd7a47445b43fa0d (patch)
tree826932be982b8aec4aafc0c7ab7132d5fbebad0a /arch/arm/boot/deflate_xip_data.sh
parentfca5e94921d50d13ee8720ce58a352e7fc0228bf (diff)
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
Redefine GZIP, BZIP2, LZOP variables as KGZIP, KBZIP2, KLZOP resp. GZIP, BZIP2, LZOP env variables are reserved by the tools. The original attempt to redefine them internally doesn't work in makefiles/scripts intercall scenarios, e.g., "make GZIP=gzip bindeb-pkg" and results in broken builds. There can be other broken build commands because of this, so the universal solution is to use non-reserved env variables for the compression tools. Fixes: 8dfb61dcbace ("kbuild: add variables for compression tools") Signed-off-by: Denis Efremov <efremov@linux.com> Tested-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'arch/arm/boot/deflate_xip_data.sh')
-rwxr-xr-xarch/arm/boot/deflate_xip_data.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/deflate_xip_data.sh b/arch/arm/boot/deflate_xip_data.sh
index 739f0464321e..304495c3c2c5 100755
--- a/arch/arm/boot/deflate_xip_data.sh
+++ b/arch/arm/boot/deflate_xip_data.sh
@@ -56,7 +56,7 @@ trap 'rm -f "$XIPIMAGE.tmp"; exit 1' 1 2 3
# substitute the data section by a compressed version
$DD if="$XIPIMAGE" count=$data_start iflag=count_bytes of="$XIPIMAGE.tmp"
$DD if="$XIPIMAGE" skip=$data_start iflag=skip_bytes |
-$_GZIP -9 >> "$XIPIMAGE.tmp"
+$KGZIP -9 >> "$XIPIMAGE.tmp"
# replace kernel binary
mv -f "$XIPIMAGE.tmp" "$XIPIMAGE"