Author: arekm Date: Fri Sep 4 11:05:23 2009 GMT
Module: packages Tag: HEAD
---- Log message:
xz -9 (no longer as lzma) is back
---- Files affected:
packages/geninitrd:
geninitrd-lzma.patch (2.1 -> 2.2)
---- Diffs:
================================================================
Index: packages/geninitrd/geninitrd-lzma.patch
diff -u packages/geninitrd/geninitrd-lzma.patch:2.1
packages/geninitrd/geninitrd-lzma.patch:2.2
--- packages/geninitrd/geninitrd-lzma.patch:2.1 Fri Sep 4 12:37:40 2009
+++ packages/geninitrd/geninitrd-lzma.patch Fri Sep 4 13:05:18 2009
@@ -2,12 +2,44 @@
===================================================================
--- geninitrd (wersja 10524)
+++ geninitrd (kopia robocza)
-@@ -1328,7 +1328,7 @@
+@@ -47,7 +47,7 @@
+ uname_r=$(uname -r)
+ echo "usage: $PROGRAM [--version] [-v] [-f] [--ifneeded] [--preload
<module>]"
+ echo " [--with=<module>] [--image-version] [--fstab=<fstab>]
[--nocompress]"
+- echo " [--compress=yes|lzma|bzip2|gzip]"
++ echo " [--compress=yes|xz|bzip2|gzip]"
+ echo " [--initrdfs=rom|initramfs|ext2|cram]
[--modules-conf=<modules.conf>]"
+ echo " [--with-bootsplash] [--without-bootsplash]"
+ echo " [--with-fbsplash] [--without-fbsplash]"
+@@ -790,7 +790,7 @@
+ find_compressor() {
+ local mode="$1"
+ # the best compressor list
+- local compressors='lzma bzip2 gzip'
++ local compressors='xz bzip2 gzip'
+
+ # a specified one, take it
+ if ! is_yes "$mode"; then
+@@ -802,9 +802,9 @@
+ local c prog map=/boot/System.map-$kernel
+ for c in $compressors; do
+ case $c in
+- lzma)
++ xz)
+ sym=unlzma
+- prog=/usr/bin/lzma
++ prog=/usr/bin/xz
+ ;;
+ bzip2)
+ sym=bzip2
+@@ -1327,8 +1327,8 @@
+ # TODO: the image name (specified from kernel.spec) already contains
# extension, which is .gz most of the time.
case "$compressor" in
- lzma)
+- lzma)
- lzma -9 < "$IMAGE" > "$tmp"
-+ lzma < "$IMAGE" > "$tmp"
++ xz)
++ xz -9 < "$IMAGE" > "$tmp"
;;
bzip2)
bzip2 -9 < "$IMAGE" > "$tmp"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd-lzma.patch?r1=2.1&r2=2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
