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

+9 -5
+1 -2
Makefile
··· 18 18 19 19 # Avoid funny character set dependencies 20 20 unexport LC_ALL 21 - LC_CTYPE=C 22 21 LC_COLLATE=C 23 22 LC_NUMERIC=C 24 - export LC_CTYPE LC_COLLATE LC_NUMERIC 23 + export LC_COLLATE LC_NUMERIC 25 24 26 25 # We are using a recursive build, so we need to do a little thinking 27 26 # to get the ordering right.
+1 -1
arch/sh/tools/Makefile
··· 13 13 include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types 14 14 @echo ' Generating $@' 15 15 $(Q)mkdir -p $(dir $@) 16 - $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } 16 + $(Q)LC_ALL=C $(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
+7 -2
scripts/Makefile.lib
··· 219 219 fsize=$$(stat -c "%s" $$F); \ 220 220 dec_size=$$(expr $$dec_size + $$fsize); \ 221 221 done; \ 222 - printf "%08x" $$dec_size | \ 223 - sed 's/\(..\)\(..\)\(..\)\(..\)/\\\\x\4\\\\x\3\\\\x\2\\\\x\1/g' \ 222 + printf "%08x\n" $$dec_size | \ 223 + sed 's/\(..\)/\1 /g' | { \ 224 + read ch0 ch1 ch2 ch3; \ 225 + for ch in $$ch3 $$ch2 $$ch1 $$ch0; do \ 226 + printf '%s%03o' '\\' $$((0x$$ch)); \ 227 + done; \ 228 + } \ 224 229 ) 225 230 226 231 quiet_cmd_bzip2 = BZIP2 $@