- rel 4; add ehci_platform; load xhci last

diff --git a/geninitrd-svn.patch b/geninitrd-svn.patch
index 00bd564e7dc29fbb92254b948f4234a997841049..c9f9c538925258394d8198d1551f2f513b0bc271 100644 (file)
--- a/geninitrd-svn.patch
+++ b/geninitrd-svn.patch
@@ -1,7 +1,7 @@
 Index: geninitrd
 ===================================================================
 --- geninitrd  (wersja 12652)
-+++ geninitrd  (wersja 12654)
++++ geninitrd  (wersja 12655)
 @@ -388,6 +388,10 @@
                                        find_depmod "-crc32c-intel"
                                        find_depmod "-crc32c"
@@ -16,40 +16,68 @@ Index: geninitrd
 Index: functions
 ===================================================================
 --- functions  (wersja 12652)
-+++ functions  (wersja 12654)
-@@ -212,6 +212,8 @@
++++ 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_hcd") {
-                               ehci="ehci_hcd"
++                      } else if (module == "ehci_platform") {
++                              ehci_platform="ehci_platform"
                        } else if (module == "ohci_hcd") {
-@@ -225,7 +227,7 @@
+                               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
+-                      # xhci/ehci/ohci/uhci hack to preserve such order
 -                      printf "%s %s %s %s ", xhci, ehci, ohci, uhci;
-+                      printf "%s %s %s %s %s ", xhci, ehci_pci, 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]; };
                }
        '
-@@ -262,6 +264,8 @@
-                               module = $2;
+@@ -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_hcd") {
-                                       ehci = "ehci_hcd"
++                              } else if (module == "ehci_platform") {
++                                      ehci_platform="ehci_platform"
                                } else if (module == "ohci_hcd") {
-@@ -277,7 +281,7 @@
+                                       ohci = "ohci_hcd"
+                               } else if (module == "uhci_hcd") {
+@@ -276,8 +284,8 @@
+                  found=0
                }
                END {
-                  # xhci/ehci/ohci/uhci hack to preserve such order
+-                 # xhci/ehci/ohci/uhci hack to preserve such order
 -                 printf "%s %s %s %s ", xhci, ehci, ohci, uhci;
-+                 printf "%s %s %s %s %s ", xhci, ehci_pci, 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 e5b6440ed8af322a4cf4e969eb00e3ef033fa3b4..d9c6d162cc75e0800b7a117b5b3d79c88a01c021 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:       12639
-Release:       3
+Release:       4
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz