[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20091220100344.GA6614@merkur.ravnborg.org>
Date: Sun, 20 Dec 2009 11:03:44 +0100
From: Sam Ravnborg <sam@...nborg.org>
To: Michal Marek <mmarek@...e.cz>, Michael Guntsche <mike@...loops.com>
Cc: Oliver Hartkopp <oliver@...tkopp.net>,
linux-kernel <linux-kernel@...r.kernel.org>, mjt@....msk.ru
Subject: [PATCH] kbuild: correct size calculation of bzImgae / fix x86 boot
We use ... printf \x ... when calculating the size of the
compressed kernel.
Unfortunately dash built-in printf does not support this notation
resulting in a non-bootable kernel.
Fix this by always using the external version of printf.
The commit that introduced this bug was:
4a2ff67c88211026afcbdbc190c13f705dae1b59: "kbuild: fix bzImage
build for x86"
Reported-by: Michael Guntsche <mike@...loops.com>
Cc: Oliver Hartkopp <oliver@...tkopp.net>
Cc: Johannes Stezenbach <js@...21.net>
Signed-off-by: Sam Ravnborg <sam@...nborg.org>
---
This should fix it but it would be great if it is tested.
Michal Marek, I think this needs to go upstream pretty quickly.
Sam
scripts/Makefile.lib | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index cd815ac..bd201d9 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -213,13 +213,14 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \
# Bzip2 and LZMA do not include size in file... so we have to fake that;
# append the size as a 32-bit littleendian number as gzip does.
+# Note: dash built-in printf does not support \x so use /usr/bin version
size_append = printf $(shell \
dec_size=0; \
for F in $1; do \
fsize=$$(stat -c "%s" $$F); \
dec_size=$$(expr $$dec_size + $$fsize); \
done; \
-printf "%08x" $$dec_size | \
+/usr/bin/printf "%08x" $$dec_size | \
sed 's/\(..\)\(..\)\(..\)\(..\)/\\\\x\4\\\\x\3\\\\x\2\\\\x\1/g' \
)
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists