Commit 04e9e5c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-33' of git://repo.or.cz/linux-kbuild 

* 'for-33' of git://repo.or.cz/linux-kbuild:
  Makefile: do not override LC_CTYPE
  kbuild: really fix bzImage build with non-bash sh
parents cedabed4 07105202

Makefile

+1 −2
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ MAKEFLAGS += -rR --no-print-directory 


# Avoid funny character set dependencies

unexport LC_ALL

LC_CTYPE=C

LC_COLLATE=C

LC_NUMERIC=C

export LC_CTYPE LC_COLLATE LC_NUMERIC

export LC_COLLATE LC_NUMERIC



# We are using a recursive build, so we need to do a little thinking

# to get the ordering right.

arch/sh/tools/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,4 +13,4 @@ 
include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types

	@echo '  Generating $@'

	$(Q)mkdir -p $(dir $@)

	$(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
 
	$(Q)LC_ALL=C $(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }

scripts/Makefile.lib

+7 −2
Original line number Diff line number Diff line
@@ -219,8 +219,13 @@ for F in $1; do \ 
	fsize=$$(stat -c "%s" $$F);					\

	dec_size=$$(expr $$dec_size + $$fsize);				\

done;									\

printf "%08x" $$dec_size |						\

	sed 's/\(..\)\(..\)\(..\)\(..\)/\\\\x\4\\\\x\3\\\\x\2\\\\x\1/g'	\

printf "%08x\n" $$dec_size |						\

	sed 's/\(..\)/\1 /g' | {					\

		read ch0 ch1 ch2 ch3;					\

		for ch in $$ch3 $$ch2 $$ch1 $$ch0; do			\

			printf '%s%03o' '\\' $$((0x$$ch)); 		\

		done;							\

	}								\

)



quiet_cmd_bzip2 = BZIP2   $@