Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

actionsapi/kerneltools: More fixes

Browse Source
This commit is contained in:
Ozan Çağlayan
2010-12-22 13:57:24 +00:00
parent fb49a5e153
commit 1eca7ba1a9
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/actionsapi/kerneltools.py
+22 -12
View File
@@ -46,13 +46,12 @@ def __getAllSupportedFlavours():
################# #################
def __getFlavour(): def __getFlavour():
flavour = ""
try: try:
flavour = get.srcNAME().split("kernel-")[1] flavour = get.srcNAME().split("kernel-")[1]
except IndexError: except IndexError:
pass return ""
else:
return flavour return flavour
def __getModuleFlavour(): def __getModuleFlavour():
for fl in [_f for _f in __getAllSupportedFlavours() if "-" in _f]: for fl in [_f for _f in __getAllSupportedFlavours() if "-" in _f]:
@@ -67,9 +66,11 @@ def __getModuleFlavour():
return "kernel" return "kernel"
def __getKernelARCH(): def __getKernelARCH():
"""i386 is relevant for our i686 architecture."""
return get.ARCH().replace("i686", "i386") return get.ARCH().replace("i686", "i386")
def __getSuffix(): def __getSuffix():
"""Read and return the value read from .suffix file."""
return open(".suffix", "r").read().strip() return open(".suffix", "r").read().strip()
def __getExtraVersion(abiVersion): def __getExtraVersion(abiVersion):
@@ -115,7 +116,6 @@ def getKernelVersion(flavour=None):
# Fail # Fail
raise ConfigureError(_("Can't find kernel version information file %s.") % kverfile) raise ConfigureError(_("Can't find kernel version information file %s.") % kverfile)
def configure(abiVersion): def configure(abiVersion):
# Copy the relevant configuration file # Copy the relevant configuration file
shutil.copy("configs/kernel-%s-config" % get.ARCH(), ".config") shutil.copy("configs/kernel-%s-config" % get.ARCH(), ".config")
@@ -129,9 +129,12 @@ def configure(abiVersion):
suffix += "-%s" % __getFlavour() suffix += "-%s" % __getFlavour()
open(".suffix", "w").write(suffix) open(".suffix", "w").write(suffix)
# Configure the kernel # Check configuration with nonint_oldconfig
autotools.make("ARCH=%s oldconfig" % __getKernelARCH()) autotools.make("ARCH=%s nonint_oldconfig" % __getKernelARCH())
# Configure the kernel interactively if
# configuration contains new options
autotools.make("ARCH=%s oldconfig" % __getKernelARCH())
def updateKConfig(): def updateKConfig():
# Call this to set newly added symbols to their defaults after sedding some KConfig # Call this to set newly added symbols to their defaults after sedding some KConfig
@@ -188,9 +191,16 @@ def install():
pisitools.dodir("/lib/modules/%s/%s" % (suffix, _dir)) pisitools.dodir("/lib/modules/%s/%s" % (suffix, _dir))
def installHeaders(extra=[]): def installHeaders(extraHeaders=None):
""" Install the files needed to build out-of-tree kernel modules. """ """ Install the files needed to build out-of-tree kernel modules. """
extras = ["drivers/media/dvb/dvb-core",
"drivers/media/dvb/frontends",
"drivers/media/video"]
if extraHeaders:
extras.extend(extraHeaders)
pruned = ["include", "scripts"] pruned = ["include", "scripts"]
wanted = ["Makefile*", "Kconfig*", "Kbuild*", "*.sh", "*.pl", "*.lds"] wanted = ["Makefile*", "Kconfig*", "Kbuild*", "*.sh", "*.pl", "*.lds"]
@@ -210,9 +220,9 @@ def installHeaders(extra=[]):
shelltools.system(find_cmd) shelltools.system(find_cmd)
# Install additional headers passed by actions.py # Install additional headers
for d in extra: for headers in extras:
shelltools.system("cp -a %s/*.h %s/%s" % (d, destination, d)) shelltools.system("cp -a %s/*.h %s/%s" % (headers, destination, headers))
# Install remaining headers # Install remaining headers
shelltools.system("cp -a scripts include %s" % destination) shelltools.system("cp -a scripts include %s" % destination)
@@ -236,7 +246,7 @@ def installHeaders(extra=[]):
pisitools.dosym("/%s" % headersDirectoryName, "/lib/modules/%s/build" % suffix) pisitools.dosym("/%s" % headersDirectoryName, "/lib/modules/%s/build" % suffix)
def installLibcHeaders(excludes=[]): def installLibcHeaders(excludes=None):
headers_tmp = os.path.join(get.installDIR(), 'tmp-headers') headers_tmp = os.path.join(get.installDIR(), 'tmp-headers')
headers_dir = os.path.join(get.installDIR(), 'usr/include') headers_dir = os.path.join(get.installDIR(), 'usr/include')