Merge branch 'for-2.6.33' into for-2.6.34

1 files changed, 12 insertions, 2 deletions

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index cd815ac2a50b..f9bdf264473d 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   $@
@@ -235,3 +240,8 @@ quiet_cmd_lzma = LZMA    $@
 cmd_lzma = (cat $(filter-out FORCE,$^) | \
         lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
         (rm -f $@ ; false)
+
+quiet_cmd_lzo = LZO    $@
+cmd_lzo = (cat $(filter-out FORCE,$^) | \
+        lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+        (rm -f $@ ; false)