From 0b60398f354971c053c941bda77a274a1aecefe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ozan=20=C3=87a=C4=9Flayan?= <ozan@pardus.org.tr>
Date: Tue, 21 Dec 2010 17:37:12 +0000
Subject: [PATCH] actionsapi/kerneltools: Use upstream ways to not install the
 firmwares

---
 pisi/actionsapi/kerneltools.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pisi/actionsapi/kerneltools.py b/pisi/actionsapi/kerneltools.py
index ce1e5ce3..03731a35 100644
--- a/pisi/actionsapi/kerneltools.py
+++ b/pisi/actionsapi/kerneltools.py
@@ -70,7 +70,7 @@ def __getKernelARCH():
     return get.ARCH().replace("i686", "i386")
 
 def __getSuffix():
-    return open(suffix, "r").read()
+    return open(".suffix", "r").read().strip()
 
 def __getExtraVersion(abiVersion):
     extraversion = ""
@@ -117,9 +117,6 @@ def getKernelVersion(flavour=None):
 
 
 def configure(abiVersion):
-    # I don't know what for but let's clean *.orig files
-    shelltools.system("find . -name \"*.orig\" | xargs rm -f")
-
     # Copy the relevant configuration file
     shutil.copy("configs/kernel-%s-config" % get.ARCH(), ".config")
 
@@ -166,7 +163,7 @@ def build(debugSymbols=False):
     autotools.make("ARCH=%s %s" % (__getKernelARCH(), " ".join(extra_config)))
 
 
-def install(installFirmwares=True):
+def install():
     suffix = __getSuffix()
 
     # Install kernel image
@@ -175,9 +172,10 @@ def install(installFirmwares=True):
     # Check if loadable module support is available or not before doing module specific tasks
     if re.search("CONFIG_MODULES=y", open(".config", "r").read().strip()):
 
-        # Install the modules and the firmwares into /lib/{modules,firmware}
+        # Install the modules
+        # mod-fw= avoids firmwares from installing
         autotools.rawInstall("INSTALL_MOD_PATH=%s/" % get.installDIR(),
-                             "modules_install")
+                             "modules_install mod-fw=")
 
         # Install Module.symvers and System.map
         pisitools.insinto("/lib/modules/%s/" % suffix, "System.map")
@@ -187,10 +185,6 @@ def install(installFirmwares=True):
         pisitools.remove("/lib/modules/%s/source" % suffix)
         pisitools.remove("/lib/modules/%s/build" % suffix)
 
-        if not installFirmwares:
-            # For use with PAE e.g.
-            shelltools.system("rm -rf %s/lib/firmware" % get.installDIR())
-
 
 def installHeaders(extra=[]):
     """ Install the files needed to build out-of-tree kernel modules. """