Commit 1373411a authored Dec 28, 2009 by Jonathan Nieder Committed by Michal Marek Jan 13, 2010

kbuild: really fix bzImage build with non-bash sh



In an x86 build with CONFIG_KERNEL_LZMA enabled and dash as sh,
arch/x86/boot/compressed/vmlinux.bin.lzma ends with
'\xf0\x7d\x39\x00' (16 bytes) instead of the 4 bytes intended and
the resulting vmlinuz fails to boot.  This improves on the
previous behavior, in which the file contained the characters
'-ne ' as well, but not by much.

Previous commits replaced "echo -ne" first with "/bin/echo -ne",
then "printf" in the hope of improving portability, but none of
these commands is guaranteed to support hexadecimal escapes on
POSIX systems.  So use the shell to convert from hexadecimal to
octal.

With this change, an LZMA-compressed kernel built with dash as sh
boots correctly again.

Reported-by: Sebastian Dalfuß <sd@sedf.de>
Reported-by: Oliver Hartkopp <oliver@hartkopp.net>
Reported-by: Michael Guntsche <mike@it-loops.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Cc: Alek Du <alek.du@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>

parent 7284ce6c

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 $@

Admin message