From: Holger Levsen <holger@layer-acht.org>
Date: Sun, 18 Sep 2011 09:05:41 +0000 (+0200)
Subject: unpack the modules so make-kpkg finds them
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=ae14ed6e76f0f6864e864cd94a6d1cf2cb8f1ac6;p=profitbricks%2Fjenkins-build-scripts.git

unpack the modules so make-kpkg finds them
---

diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py
index dee9702..7e73799 100644
--- a/kernel_inpbuilder.py
+++ b/kernel_inpbuilder.py
@@ -202,15 +202,6 @@ def build_kernel(revision, parallel_jobs='auto', distcc=False):
     else:
         parallel_jobs = int(parallel_jobs)
 
-    cmd = ['m-a', 'update']
-    ret = os.system('%s' %(' '.join(cmd)))
-    if ret:
-        logger.error('%s returned with %s' %(' '.join(cmd), ret))
-        return False
-    logger.info(
-            'module-assistant update ran successfully.'
-    )
-
     cmd = [MAKE_KPKG, '-j', '%s' %(parallel_jobs), '--arch',
             '%s' %(BUILD_ARCH), '--rootcmd', 'fakeroot', '--revision',
             '%s' %(revision), '--initrd', '--arch_in_name', 'kernel_debug',
@@ -307,6 +298,17 @@ def install_extra_modules():
         cmd = [APT_GET, '-y', 'install']
         cmd += extra_modules
         subprocess.check_call(cmd)
+
+    cmd = ['m-a', 'unpack']
+    cmd += extra_modules
+    ret = os.system('%s' %(' '.join(cmd)))
+    if ret:
+        logger.error('%s returned with %s' %(' '.join(cmd), ret))
+        return False
+    logger.info(
+            'module-assistant unpacked successfully.'
+    )
+
     return True