From 12447371136bc58b14b9311fbb6734227d58e2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozan=20=C3=87a=C4=9Flayan?= Date: Thu, 23 Dec 2010 17:44:35 +0000 Subject: [PATCH] actionsapi/kerneltools: More fixes and cleanup Avoid calling depmod Call nonint_oldconfig to check the configuration Call dumpVersion from here instead of actions.py --- pisi/actionsapi/kerneltools.py | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pisi/actionsapi/kerneltools.py b/pisi/actionsapi/kerneltools.py index b0c29f55..805a4a33 100644 --- a/pisi/actionsapi/kerneltools.py +++ b/pisi/actionsapi/kerneltools.py @@ -169,23 +169,23 @@ def build(debugSymbols=False): def install(): suffix = __getSuffix() + # Dump kernel version under /etc/kernel + dumpVersion() + # Install kernel image pisitools.insinto("/boot/", "arch/x86/boot/bzImage", "kernel-%s" % suffix) # Install the modules # mod-fw= avoids firmwares from installing + # Override DEPMOD= to not call depmod as it will be called + # during module-init-tools' package handler autotools.rawInstall("INSTALL_MOD_PATH=%s/" % get.installDIR(), - "modules_install mod-fw=") + "DEPMOD=/bin/true modules_install mod-fw=") # Remove symlinks first pisitools.remove("/lib/modules/%s/source" % suffix) pisitools.remove("/lib/modules/%s/build" % suffix) - # Create correct ones - pisitools.dodir("/lib/modules/%s/build" % suffix) - pisitools.dosym("/lib/modules/%s/build" % suffix, - "/lib/modules/%s/source" % suffix) - # Create extra/ and updates/ subdirectories for _dir in ("extra", "updates"): pisitools.dodir("/lib/modules/%s/%s" % (suffix, _dir)) @@ -244,6 +244,7 @@ def installHeaders(extraHeaders=None): # Settle the correct build symlink to this headers pisitools.dosym("/%s" % headersDirectoryName, "/lib/modules/%s/build" % suffix) + pisitools.dosym("build", "/lib/modules/%s/source" % suffix) def installLibcHeaders(excludes=None): @@ -280,12 +281,3 @@ def installLibcHeaders(excludes=None): # Remove tmp directory shelltools.system("rm -rf %s" % headers_tmp) - - -def cleanModuleFiles(): - """ Cleans module.* files generated by depmod """ - # Remove modules.* files, they will be autogenerated during pakhandler. - # Don't remove modules.order generated by kbuild for ordering the modules - # according to the link order. - shelltools.system("find %s/lib/modules/%s -name 'modules.*' \ - -not -name 'modules.order' -exec rm -f '{}' \;" % (get.installDIR(), __getSuffix()))