aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-08-01 16:44:16 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-08-01 16:44:16 +0000
commit6e65f0080d362fb47b780cfa36dfcae319feeb2b (patch)
tree618273fe1dccd4500b8c41079feaf81c19466621 /target/linux/generic-2.6
parent8c61fc8592d1e6e1254f406b14548ede8389fae5 (diff)
downloadupstream-6e65f0080d362fb47b780cfa36dfcae319feeb2b.tar.gz
upstream-6e65f0080d362fb47b780cfa36dfcae319feeb2b.tar.bz2
upstream-6e65f0080d362fb47b780cfa36dfcae319feeb2b.zip
also use openwrt-specific lzma options in gen_initramfs_list.sh
SVN-Revision: 17080
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch
index e7b6b3d4c0..f334e23af5 100644
--- a/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch
@@ -6,3 +6,36 @@
quiet_cmd_lzma = LZMA $@
-cmd_lzma = (lzma -9 -c $< && $(size_append) $<) >$@ || (rm -f $@ ; false)
+cmd_lzma = lzma e $< $@ -lc1 -lp2 -pb2 -eos
+--- a/scripts/gen_initramfs_list.sh 2009-06-10 05:05:27.000000000 +0200
++++ b/scripts/gen_initramfs_list.sh 2009-08-01 18:36:14.000000000 +0200
+@@ -225,7 +225,7 @@
+ output="/dev/stdout"
+ output_file=""
+ is_cpio_compressed=
+-compr="gzip -9 -f"
++compr="gzip -9 -f -"
+
+ arg="$1"
+ case "$arg" in
+@@ -239,9 +239,9 @@
+ output_file="$1"
+ cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
+ output=${cpio_list}
+- echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
+- echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
+- echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
++ echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
++ echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
++ echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -lc1 -lp2 -pb2 -eos -si -so"
+ echo "$output_file" | grep -q "\.cpio$" && compr="cat"
+ shift
+ ;;
+@@ -292,7 +292,7 @@
+ if [ "${is_cpio_compressed}" = "compressed" ]; then
+ cat ${cpio_tfile} > ${output_file}
+ else
+- (cat ${cpio_tfile} | ${compr} - > ${output_file}) \
++ (cat ${cpio_tfile} | ${compr} > ${output_file}) \
+ || (rm -f ${output_file} ; false)
+ fi
+ [ -z ${cpio_file} ] && rm ${cpio_tfile}