summaryrefslogtreecommitdiff
path: root/meta/classes/kernel.bbclass
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2013-02-28 12:09:05 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-01 12:57:58 +0000
commitbff4bda1fe86ddd218a192a14605924205a5300b (patch)
tree602c361a5809d1cf6f9f8f3dd010d009c044c0fe /meta/classes/kernel.bbclass
parent150174d52adefdefe62e2ed0598665481591e4c2 (diff)
downloadopenembedded-core-bff4bda1fe86ddd218a192a14605924205a5300b.tar.gz
openembedded-core-bff4bda1fe86ddd218a192a14605924205a5300b.tar.bz2
openembedded-core-bff4bda1fe86ddd218a192a14605924205a5300b.zip
kernel.bbclass: Add missing modules.order and modules.builtins
When running depmod, from kmod, warnings about missing modules.order and modules.builtins occur. Looking back it is not clear why these files were being ignored, other then nobody knew what to do with them. Add the files into the kernel-base package, if they exist, ensuring they will always get installed if at least one module is installed. [ YOCTO #3963 ] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/kernel.bbclass')
-rw-r--r--meta/classes/kernel.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 00117a6cd8..e8c585bb94 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -94,8 +94,6 @@ kernel_do_install() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
- rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.order"
- rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.builtin"
rm "${D}/lib/modules/${KERNEL_VERSION}/build"
rm "${D}/lib/modules/${KERNEL_VERSION}/source"
else
@@ -251,6 +249,7 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
# kernel-image becomes kernel-image-${KERNEL_VERISON}
PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules"
FILES = ""
+FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order /lib/modules/${KERNEL_VERSION}/modules.builtin"
FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH}"
FILES_kernel-vmlinux = "/boot/vmlinux*"