- rel 6; xz and lzma formats support

Changed files:
    geninitrd-lzma.patch -> 2.4
    geninitrd.spec -> 2.153

diff --git a/geninitrd-lzma.patch b/geninitrd-lzma.patch
index 32078f355d48a414fe2b1c12cbf6aa030c56a08b..6b015cb733a69801d5afce45cdb61be3f1cb8f91 100644 (file)
--- a/geninitrd-lzma.patch
+++ b/geninitrd-lzma.patch
@@ -7,7 +7,7 @@ Index: geninitrd
        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 "       [--compress=yes|xz|lzma|bzip2|gzip]"
        echo "       [--initrdfs=rom|initramfs|ext2|cram] [--modules-conf=<modules.conf>]"
        echo "       [--with-bootsplash] [--without-bootsplash]"
        echo "       [--with-fbsplash] [--without-fbsplash]"
@@ -16,29 +16,35 @@ Index: geninitrd
        local mode="$1"
        # the best compressor list
 -      local compressors='lzma bzip2 gzip'
-+      local compressors='xz bzip2 gzip'
++      local compressors='xz lzma bzip2 gzip'
  
        # a specified one, take it
        if ! is_yes "$mode"; then
-@@ -802,9 +802,9 @@
+@@ -802,9 +802,13 @@
        local c prog map=/boot/System.map-$kernel
        for c in $compressors; do
                case $c in
--              lzma)
 +              xz)
++                      sym=unxz
++                      prog=/usr/bin/xz
++                      ;;
+               lzma)
                        sym=unlzma
 -                      prog=/usr/bin/lzma
 +                      prog=/usr/bin/xz
                        ;;
                bzip2)
                        sym=bzip2
-@@ -1327,8 +1327,8 @@
+@@ -1327,8 +1331,12 @@
        # TODO: the image name (specified from kernel.spec) already contains
        # extension, which is .gz most of the time.
        case "$compressor" in
--      lzma)
--              lzma -9 < "$IMAGE" > "$tmp"
 +      xz)
++              # don't use -9 here since kernel won't understand it
++              xz --format=xz --check=crc32 --lzma2=preset=6e,dict=1MiB < "$IMAGE" > "$tmp"
++              ;;
+       lzma)
+-              lzma -9 < "$IMAGE" > "$tmp"
 +              xz --format=lzma -9 < "$IMAGE" > "$tmp"
                ;;
        bzip2)

diff --git a/geninitrd.spec b/geninitrd.spec
index bca9db0f6a755d5801be5804d95325508ed2f784..2625004e7fbb2cdd552da0ccdccfabc2e0787e3b 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -3,7 +3,7 @@ Summary(pl.UTF-8):      Narzędzie do tworzenia inicjalnego ramdysku używanego przy
 Name:          geninitrd
 Version:       10000.18
 # leave rel 1 for ac
-Release:       5
+Release:       6
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz