- rel 3; handle ehci-pci module

diff --git a/geninitrd-svn.patch b/geninitrd-svn.patch
index 437419b391684a4e128477c298154c9e92c98353..00bd564e7dc29fbb92254b948f4234a997841049 100644 (file)
--- a/geninitrd-svn.patch
+++ b/geninitrd-svn.patch
@@ -1,7 +1,7 @@
 Index: geninitrd
 ===================================================================
 --- geninitrd  (wersja 12652)
-+++ geninitrd  (wersja 12653)
++++ geninitrd  (wersja 12654)
 @@ -388,6 +388,10 @@
                                        find_depmod "-crc32c-intel"
                                        find_depmod "-crc32c"
@@ -13,3 +13,43 @@ Index: geninitrd
                        esac
  
                        echo $modpath
+Index: functions
+===================================================================
+--- functions  (wersja 12652)
++++ functions  (wersja 12654)
+@@ -212,6 +212,8 @@
+                       module=$1
+                       if (module == "xhci_hcd") {
+                               xhci="xhci_hcd"
++                      } else if (module == "ehci_pci") {
++                              ehci_pci="ehci_pci"
+                       } else if (module == "ehci_hcd") {
+                               ehci="ehci_hcd"
+                       } else if (module == "ohci_hcd") {
+@@ -225,7 +227,7 @@
+               }
+               END {
+                       # 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;
+                       for (i in modules) { printf "%s ", modules[i]; };
+               }
+       '
+@@ -262,6 +264,8 @@
+                               module = $2;
+                               if (module == "xhci_hcd") {
+                                       xhci = "xhci_hcd"
++                              } else if (module == "ehci_pci") {
++                                      ehci_pci="ehci_pci"
+                               } else if (module == "ehci_hcd") {
+                                       ehci = "ehci_hcd"
+                               } else if (module == "ohci_hcd") {
+@@ -277,7 +281,7 @@
+               }
+               END {
+                  # 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;
+                  for (i in modules) { printf "%s ", modules[i]; }
+               }
+       '

diff --git a/geninitrd.spec b/geninitrd.spec
index fa0ac10f1e447eb6cdd9d3c0904abb73eb7497ba..e5b6440ed8af322a4cf4e969eb00e3ef033fa3b4 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:       2
+Release:       3
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz