diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-13 16:09:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-13 16:09:59 -0800 |
| commit | 04e9e5c7659ee07f0387ddb663913fadcca88d5f (patch) | |
| tree | 0fb68ca3fee5759675c44577de32cbbf922eed20 | |
| parent | cedabed49b39b4319bccc059a63344b6232b619c (diff) | |
| parent | 07105202bdebf6e9a4c72c634cf90398abfad870 (diff) | |
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
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | arch/sh/tools/Makefile | 2 | ||||
| -rw-r--r-- | scripts/Makefile.lib | 9 |
3 files changed, 9 insertions, 5 deletions
@@ -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. diff --git a/arch/sh/tools/Makefile b/arch/sh/tools/Makefile index 558a56bcc7c..2082af1f3fe 100644 --- a/arch/sh/tools/Makefile +++ b/arch/sh/tools/Makefile @@ -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; } diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 0fe48cd91ff..f9bdf264473 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -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 $@ |