aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/rdc/patches/600-x86_lzma.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-06-17 12:57:04 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-06-17 12:57:04 +0000
commit478b3b32f429be04c317e7aa1eb44241dd3429e1 (patch)
treee74befb0c374b234d84de0bc1cc10296d19133f1 /target/linux/rdc/patches/600-x86_lzma.patch
parent14b8ea6a1a5d851cf316c38d0594f33a4263e142 (diff)
downloadupstream-478b3b32f429be04c317e7aa1eb44241dd3429e1.tar.gz
upstream-478b3b32f429be04c317e7aa1eb44241dd3429e1.tar.bz2
upstream-478b3b32f429be04c317e7aa1eb44241dd3429e1.zip
[kernel] upgrade to 2.6.25.7, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11523 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rdc/patches/600-x86_lzma.patch')
-rw-r--r--target/linux/rdc/patches/600-x86_lzma.patch29
1 files changed, 9 insertions, 20 deletions
diff --git a/target/linux/rdc/patches/600-x86_lzma.patch b/target/linux/rdc/patches/600-x86_lzma.patch
index 269340d194..8d17f0f3c2 100644
--- a/target/linux/rdc/patches/600-x86_lzma.patch
+++ b/target/linux/rdc/patches/600-x86_lzma.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.c
-===================================================================
--- /dev/null
-+++ linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.c
++++ b/arch/x86/boot/compressed/LzmaDecode.c
@@ -0,0 +1,586 @@
+/*
+ LzmaDecode.c
@@ -589,10 +587,8 @@ Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.c
+ *outSizeProcessed = nowPos;
+ return LZMA_RESULT_OK;
+}
-Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.h
-===================================================================
--- /dev/null
-+++ linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.h
++++ b/arch/x86/boot/compressed/LzmaDecode.h
@@ -0,0 +1,100 @@
+/*
+ LzmaDecode.h
@@ -694,10 +690,8 @@ Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.h
+ UInt32 *outSizeProcessed);
+
+#endif
-Index: linux-2.6.24.7/arch/x86/boot/compressed/lzma_misc.c
-===================================================================
--- /dev/null
-+++ linux-2.6.24.7/arch/x86/boot/compressed/lzma_misc.c
++++ b/arch/x86/boot/compressed/lzma_misc.c
@@ -0,0 +1,281 @@
+/*
+ * lzma_misc.c
@@ -980,11 +974,9 @@ Index: linux-2.6.24.7/arch/x86/boot/compressed/lzma_misc.c
+ lzma_unzip();
+ return;
+}
-Index: linux-2.6.24.7/scripts/Makefile.lib
-===================================================================
---- linux-2.6.24.7.orig/scripts/Makefile.lib
-+++ linux-2.6.24.7/scripts/Makefile.lib
-@@ -166,4 +166,9 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS)
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -172,4 +172,9 @@
quiet_cmd_gzip = GZIP $@
cmd_gzip = gzip -f -9 < $< > $@
@@ -995,18 +987,15 @@ Index: linux-2.6.24.7/scripts/Makefile.lib
+cmd_lzma = bash -e scripts/lzma_kern $< $@ -lc7 -lp0 -pb0
+# to use lzmacomp,
+# cmd_lzma = lzmacomp $< 700 > $@
-Index: linux-2.6.24.7/scripts/lzma_kern
-===================================================================
--- /dev/null
-+++ linux-2.6.24.7/scripts/lzma_kern
++++ b/scripts/lzma_kern
@@ -0,0 +1,4 @@
+get-size() { echo "$5" ;}
+printf -v len '%.8x' "$(get-size $(ls -l "$1"))"
+lzma e "$@"
+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"
-diff -urN linux-2.6.25.4/arch/x86/boot/compressed/Makefile linux-2.6.25.4.new/arch/x86/boot/compressed/Makefile
---- linux-2.6.25.4/arch/x86/boot/compressed/Makefile 2008-05-15 17:00:12.000000000 +0200
-+++ linux-2.6.25.4.new/arch/x86/boot/compressed/Makefile 2008-06-11 14:42:09.000000000 +0200
+--- a/arch/x86/boot/compressed/Makefile
++++ b/arch/x86/boot/compressed/Makefile
@@ -4,7 +4,7 @@
# create a compressed vmlinux image from the original vmlinux
#