xz -9 (no longer as lzma) is back

Changed files:
    geninitrd-lzma.patch -> 2.2

diff --git a/geninitrd-lzma.patch b/geninitrd-lzma.patch
index 80be7b2558dcc1650bd674aadfd17d19ecd9c9ae..b32ab366b081c16f6b56262a5954b32b870a3394 100644 (file)
--- a/geninitrd-lzma.patch
+++ b/geninitrd-lzma.patch
@@ -2,12 +2,44 @@ Index: geninitrd
 ===================================================================
 --- 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"