summaryrefslogtreecommitdiff
path: root/meta/classes/kernel-module-split.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-20 13:01:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 14:31:56 +0000
commitb851504dcf5e147c9efb1c7b6a4d22c1a1a87cd7 (patch)
tree0e98dbc147d2f0b56fa1472dbadc565099d157c9 /meta/classes/kernel-module-split.bbclass
parent872342fa3d08edede4a0105ac3ddb0f2ae3224b4 (diff)
downloadopenembedded-core-b851504dcf5e147c9efb1c7b6a4d22c1a1a87cd7.tar.gz
openembedded-core-b851504dcf5e147c9efb1c7b6a4d22c1a1a87cd7.tar.bz2
openembedded-core-b851504dcf5e147c9efb1c7b6a4d22c1a1a87cd7.zip
kernel/image/depmodwrapper: Fixups for depmod
With the rpm package backend enabled, running: bitbake <image> bitbake virtual/kernel -c clean bitbake <image> -c rootfs -f results in an image with incorrect kernel module dependency information. The problem is that the System.map and kernel-abiversion files are needed for depmod and after the recent kernel changes, these are no longer in sstate. Its reasonable to require the kernel to unpack/build if you're about to build a module against it. It is not reasonable to require this just to build a rootfs. Therefore stash the needed files specifically for depmod. Also fix some STAGING_KERNEL_DIR references which were incorrect, found whilst sorting through his change. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-module-split.bbclass')
-rw-r--r--meta/classes/kernel-module-split.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 2d43b512df..32b80856e0 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -75,7 +75,7 @@ python split_kernel_module_packages () {
if not os.path.exists(system_map_file):
system_map_file = "%s/System.map-%s" % (staging_kernel_dir, kernelver)
if not os.path.exists(system_map_file):
- bb.fatal("System.map-%s does not exist in '%s/boot' nor STAGING_KERNEL_DIR '%s'" % (kernelver, dvar, staging_kernel_dir))
+ bb.fatal("System.map-%s does not exist in '%s/boot' nor STAGING_KERNEL_BUILDDIR '%s'" % (kernelver, dvar, staging_kernel_dir))
cmd = "depmod -n -a -b %s -F %s %s" % (dvar, system_map_file, kernelver_stripped)
f = os.popen(cmd, 'r')