[8.09] [package] busybox: add 2 upstream fixes
[openwrt/svn-archive/archive.git] / target / linux / rdc / patches-2.6.24 / 600-x86_lzma.patch
1 diff -urN linux-2.6.19.2/scripts/Makefile.lib linux-2.6.19.2.new/scripts/Makefile.lib
2 --- linux-2.6.19.2/scripts/Makefile.lib 2007-01-10 20:10:37.000000000 +0100
3 +++ linux-2.6.19.2.new/scripts/Makefile.lib 2007-04-15 23:51:54.000000000 +0200
4 @@ -162,4 +162,9 @@
5 quiet_cmd_gzip = GZIP $@
6 cmd_gzip = gzip -f -9 < $< > $@
7
8 -
9 +# LZMA
10 +#
11 +quiet_cmd_lzma = LZMA $@
12 +cmd_lzma = bash -e scripts/lzma_kern $< $@ -lc7 -lp0 -pb0
13 +# to use lzmacomp,
14 +# cmd_lzma = lzmacomp $< 700 > $@
15 diff -u linux/scripts/lzma_kern linux/scripts/lzma_kern
16 --- linux/scripts/lzma_kern 2007-07-27 20:18:17.013014750 -0700
17 +++ linux/scripts/lzma_kern 2007-07-27 20:18:17.013014750 -0700
18 @@ -0,0 +1,4 @@
19 +get-size() { echo "$5" ;}
20 +printf -v len '%.8x' "$(get-size $(ls -l "$1"))"
21 +lzma e "$@"
22 +echo -ne "\x$(echo $len | cut -c 7,8)\x$(echo $len | cut -c 5,6)\x$(echo $len | cut -c 3,4)\x$(echo $len | cut -c 1,2)" >> "$2"
23 diff -urN linux-2.6.24/arch/x86/boot/compressed/Makefile_32 linux-2.6.24.new/arch/x86/boot/compressed/Makefile_32
24 --- linux-2.6.24/arch/x86/boot/compressed/Makefile_32 2008-01-24 23:58:37.000000000 +0100
25 +++ linux-2.6.24.new/arch/x86/boot/compressed/Makefile_32 2008-02-13 15:21:03.000000000 +0100
26 @@ -4,8 +4,8 @@
27 # create a compressed vmlinux image from the original vmlinux
28 #
29
30 -targets := vmlinux vmlinux.bin vmlinux.bin.gz head_32.o misc_32.o piggy.o \
31 - vmlinux.bin.all vmlinux.relocs
32 +targets := vmlinux vmlinux.bin vmlinux.bin.lzma head_32.o piggy.o \
33 + vmlinux.bin.all vmlinux.relocs lzma_misc.o
34 EXTRA_AFLAGS := -traditional
35
36 LDFLAGS_vmlinux := -T
37 @@ -17,7 +17,7 @@
38 $(call cc-option,-fno-stack-protector)
39 LDFLAGS := -m elf_i386
40
41 -$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head_32.o $(obj)/misc_32.o $(obj)/piggy.o FORCE
42 +$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head_32.o $(obj)/lzma_misc.o $(obj)/piggy.o FORCE
43 $(call if_changed,ld)
44 @:
45
46 @@ -37,14 +37,14 @@
47 $(call if_changed,relocbin)
48
49 ifdef CONFIG_RELOCATABLE
50 -$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin.all FORCE
51 - $(call if_changed,gzip)
52 +$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin.all FORCE
53 + $(call if_changed,lzma)
54 else
55 -$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
56 - $(call if_changed,gzip)
57 +$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
58 + $(call if_changed,lzma)
59 endif
60
61 LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T
62
63 -$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.gz FORCE
64 +$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.lzma FORCE
65 $(call if_changed,ld)