- rel 3; crc32c handling from svn

diff --git a/geninitrd-svn.patch b/geninitrd-svn.patch
index 2567a694657d98529b7112f08d461833e3e4c7dd..9573f3c646b36ef0a82dd2ef8302a86a2046eefb 100644 (file)
--- a/geninitrd-svn.patch
+++ b/geninitrd-svn.patch
@@ -1,8 +1,49 @@
 Index: geninitrd
 ===================================================================
---- geninitrd  (revision 12585)
-+++ geninitrd  (revision 12586)
-@@ -1445,6 +1445,7 @@
+--- geninitrd  (wersja 12585)
++++ geninitrd  (wersja 12612)
+@@ -332,6 +332,15 @@
+       /lib/geninitrd/extract-ikconfig /boot/vmlinuz-$kernel
+ }
+ 
++# @param    $module
++basename_module() {
++      local module=$1
++
++      module=${module##*/}
++      module=${module%$modext*}
++      echo $module
++}
++
+ # Finds module dependencies
+ #
+ # @param      $module
+@@ -366,9 +375,23 @@
+               warn "If $module isn't compiled in kernel then this initrd may not start your system."
+       fi
+ 
++      local smodule
++
+       echo "$modprobe" | \
+       while read insmod modpath options; do
+-              [ "$insmod" = "insmod" ] && echo $modpath
++              if [ "$insmod" = "insmod" ]; then
++
++                      # XXX: find a away to autodetect
++                      smodule=$(basename_module $modpath)
++                      case "$smodule" in
++                              libcrc32c)
++                                      find_depmod "-crc32c-intel"
++                                      find_depmod "-crc32c"
++                                      ;;
++                      esac
++
++                      echo $modpath
++              fi
+       done
+       return 0
+ }
+@@ -1445,6 +1468,7 @@
  else
        initrd_gen_md
        initrd_gen_lvm

diff --git a/geninitrd.spec b/geninitrd.spec
index 3f9c462b7b6415f03a87f1143ecfd4dfacf3d3eb..b39ee6635ed1b265452a88b5839c75d425cbce1e 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -7,7 +7,7 @@ Summary:        Creates an initial ramdisk image for preloading modules
 Summary(pl.UTF-8):     Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:          geninitrd
 Version:       12582
-Release:       2
+Release:       3
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz