Rel 2. Preload crct10dif module when crc-t10dif is going to be loaded (uses its symbo...

diff --git a/geninitrd-svn.patch b/geninitrd-svn.patch
index c9f9c538925258394d8198d1551f2f513b0bc271..7c2e47eda23c3138b63d93bf9def25a273ed69b2 100644 (file)
--- a/geninitrd-svn.patch
+++ b/geninitrd-svn.patch
@@ -1,83 +1,14 @@
 Index: geninitrd
 ===================================================================
---- geninitrd  (wersja 12652)
-+++ geninitrd  (wersja 12655)
-@@ -388,6 +388,10 @@
+--- geninitrd  (wersja 12709)
++++ geninitrd  (wersja 12710)
+@@ -395,6 +395,9 @@
+                       # XXX: find a away to autodetect
+                       smodule=$(basename_module $modpath)
+                       case "$smodule" in
++                              crc-t10dif)
++                                      find_depmod "-crct10dif"
++                                      ;;
+                               libcrc32c)
                                        find_depmod "-crc32c-intel"
                                        find_depmod "-crc32c"
-                                       ;;
-+                              virtio_blk|virtio_scsi)
-+                                      find_depmod "-virtio_pci"
-+                                      find_depmod "-virtio_mmio"
-+                                      ;;
-                       esac
- 
-                       echo $modpath
-Index: functions
-===================================================================
---- functions  (wersja 12652)
-+++ functions  (wersja 12655)
-@@ -207,13 +207,17 @@
-       fi
- 
-       echo $modaliases | xargs modprobe --set-version $kernel -aRn | awk '
--              BEGIN { skip_modules[notexisting_module]=""; modules[1]=""; xhci=""; ehci=""; ohci=""; uhci="" }
-+              BEGIN { skip_modules[notexisting_module]=""; modules[1]=""; xhci=""; ehci_pci=""; ehci_hcd=""; ehci_platform=""; ohci=""; uhci="" }
-               {
-                       module=$1
-                       if (module == "xhci_hcd") {
-                               xhci="xhci_hcd"
-                       } else if (module == "ehci_hcd") {
--                              ehci="ehci_hcd"
-+                              ehci_hcd="ehci_hcd"
-+                      } else if (module == "ehci_pci") {
-+                              ehci_pci="ehci_pci"
-+                      } else if (module == "ehci_platform") {
-+                              ehci_platform="ehci_platform"
-                       } else if (module == "ohci_hcd") {
-                               ohci="ohci_hcd"
-                       } else if (module == "uhci_hcd") {
-@@ -224,8 +228,8 @@
-                       skip_modules[module]=1;
-               }
-               END {
--                      # xhci/ehci/ohci/uhci hack to preserve such order
--                      printf "%s %s %s %s ", xhci, ehci, ohci, uhci;
-+                      # ehci/ohci/uhci/xhci hack to preserve such order
-+                      printf "%s %s %s %s %s %s ", ehci_hcd, ehci_pci, ehci_platform, ohci, uhci, xhci;
-                       for (i in modules) { printf "%s ", modules[i]; };
-               }
-       '
-@@ -255,7 +259,7 @@
-       fi
- 
-       LC_ALL=C lspci -p "$pcimap" -kvmmn | awk -vreq_class="${req_class}" '
--              BEGIN      { skip_modules[notexisting_module]=""; modules[1]=""; xhci=""; ehci=""; ohci=""; uhci="" }
-+              BEGIN      { skip_modules[notexisting_module]=""; modules[1]=""; xhci=""; ehci_pci=""; ehci_hcd=""; ehci_platform=""; ohci=""; uhci="" }
-               /^Slot:/   { found=0 }
-               /^Class:/  { if (req_class == $2) { found = 1 } }
-               /^Driver:/ { if (found) {
-@@ -263,7 +267,11 @@
-                               if (module == "xhci_hcd") {
-                                       xhci = "xhci_hcd"
-                               } else if (module == "ehci_hcd") {
--                                      ehci = "ehci_hcd"
-+                                      ehci_hcd = "ehci_hcd"
-+                              } else if (module == "ehci_pci") {
-+                                      ehci_pci="ehci_pci"
-+                              } else if (module == "ehci_platform") {
-+                                      ehci_platform="ehci_platform"
-                               } else if (module == "ohci_hcd") {
-                                       ohci = "ohci_hcd"
-                               } else if (module == "uhci_hcd") {
-@@ -276,8 +284,8 @@
-                  found=0
-               }
-               END {
--                 # xhci/ehci/ohci/uhci hack to preserve such order
--                 printf "%s %s %s %s ", xhci, ehci, ohci, uhci;
-+                 # ehci/ohci/uhci/xhci hack to preserve such order
-+                 printf "%s %s %s %s %s %s ", ehci_hcd, ehci_pci, ehci_platform, ohci, uhci, xhci;
-                  for (i in modules) { printf "%s ", modules[i]; }
-               }
-       '

diff --git a/geninitrd.spec b/geninitrd.spec
index 4a455ad9efaa13477587739775d9bb03464088c0..5ce63a29c5649c62cba55cd2f878df17ecb59170 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -7,12 +7,12 @@ 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:       12695
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
 # Source0-md5: c6235c690934c87e5361bcf4a23b25db
-# svn diff http://svn.pld-linux.org/svn/geninitrd/trunk -r 12652:HEAD > geninitrd-svn.patch
+# svn diff http://svn.pld-linux.org/svn/geninitrd/trunk -r 12709:HEAD > geninitrd-svn.patch
 Patch0:                %{name}-svn.patch
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/geninitrd
 BuildRequires: xmlto >= 0:0.0.18-1
@@ -87,7 +87,7 @@ bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
 %setup -q
-#%patch0 -p0
+%patch0 -p0
 
 %build
 %{__make}