Commit e4a42c82 authored by Denis Efremov's avatar Denis Efremov Committed by Masahiro Yamada
Browse files

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: 8dfb61dc ("kbuild: add variables for compression tools")
Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent fca5e949

Makefile

+5 −19
Original line number Diff line number Diff line
@@ -458,27 +458,13 @@ PYTHON = python 
PYTHON3		= python3

CHECK		= sparse

BASH		= bash

GZIP		= gzip

BZIP2		= bzip2

LZOP		= lzop

KGZIP		= gzip

KBZIP2		= bzip2

KLZOP		= lzop

LZMA		= lzma

LZ4		= lz4c

XZ		= xz



# GZIP, BZIP2, LZOP env vars are used by the tools. Support them as the command

# line interface, but use _GZIP, _BZIP2, _LZOP internally.

_GZIP          := $(GZIP)

_BZIP2         := $(BZIP2)

_LZOP          := $(LZOP)



# Reset GZIP, BZIP2, LZOP in this Makefile

override GZIP=

override BZIP2=

override LZOP=



# Reset GZIP, BZIP2, LZOP in recursive invocations

MAKEOVERRIDES += GZIP= BZIP2= LZOP=



CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)

NOSTDINC_FLAGS :=
@@ -526,7 +512,7 @@ CLANG_FLAGS := 
export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC

export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE LEX YACC AWK INSTALLKERNEL

export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX

export _GZIP _BZIP2 _LZOP LZMA LZ4 XZ

export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ

export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE



export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS
@@ -1047,7 +1033,7 @@ export mod_strip_cmd 
mod_compress_cmd = true

ifdef CONFIG_MODULE_COMPRESS

  ifdef CONFIG_MODULE_COMPRESS_GZIP

    mod_compress_cmd = $(_GZIP) -n -f

    mod_compress_cmd = $(KGZIP) -n -f

  endif # CONFIG_MODULE_COMPRESS_GZIP

  ifdef CONFIG_MODULE_COMPRESS_XZ

    mod_compress_cmd = $(XZ) -f

arch/arm/boot/deflate_xip_data.sh

+1 −1
Original line number Diff line number Diff line
@@ -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"

arch/ia64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ $(error Sorry, you need a newer version of the assember, one that is built from 
endif



quiet_cmd_gzip = GZIP    $@

cmd_gzip = cat $(real-prereqs) | $(_GZIP) -n -f -9 > $@

cmd_gzip = cat $(real-prereqs) | $(KGZIP) -n -f -9 > $@



quiet_cmd_objcopy = OBJCOPY $@

cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@

arch/m68k/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -135,10 +135,10 @@ vmlinux.gz: vmlinux 
ifndef CONFIG_KGDB

	cp vmlinux vmlinux.tmp

	$(STRIP) vmlinux.tmp

	$(_GZIP) -9c vmlinux.tmp >vmlinux.gz

	$(KGZIP) -9c vmlinux.tmp >vmlinux.gz

	rm vmlinux.tmp

else

	$(_GZIP) -9c vmlinux >vmlinux.gz

	$(KGZIP) -9c vmlinux >vmlinux.gz

endif



bzImage: vmlinux.bz2
@@ -148,10 +148,10 @@ vmlinux.bz2: vmlinux 
ifndef CONFIG_KGDB

	cp vmlinux vmlinux.tmp

	$(STRIP) vmlinux.tmp

	$(_BZIP2) -1c vmlinux.tmp >vmlinux.bz2

	$(KBZIP2) -1c vmlinux.tmp >vmlinux.bz2

	rm vmlinux.tmp

else

	$(_BZIP2) -1c vmlinux >vmlinux.bz2

	$(KBZIP2) -1c vmlinux >vmlinux.bz2

endif



archclean:

arch/parisc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ vmlinuz: bzImage 
	$(OBJCOPY) $(boot)/bzImage $@

else

vmlinuz: vmlinux

	@$(_GZIP) -cf -9 $< > $@

	@$(KGZIP) -cf -9 $< > $@

endif



install:

CRA Git | Maintained and supported by SUSTech CRA and CCSE