summaryrefslogtreecommitdiffstats
path: root/meta
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 13:03:28 +0000
commit54aae189175e1323d9fb3350606f1acb61cefaee (patch)
tree2c5503ac16ee61231a25f22294818618211ccea7 /meta
parent4a007570178f2d818b8cf1bb6f51566f219c0623 (diff)
downloadpoky-54aae189175e1323d9fb3350606f1acb61cefaee.tar.gz
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 ] (From OE-Core rev: bff4bda1fe86ddd218a192a14605924205a5300b) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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() {
94 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE 94 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
95 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 95 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
96 oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install 96 oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
97 rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.order"
98 rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.builtin"
99 rm "${D}/lib/modules/${KERNEL_VERSION}/build" 97 rm "${D}/lib/modules/${KERNEL_VERSION}/build"
100 rm "${D}/lib/modules/${KERNEL_VERSION}/source" 98 rm "${D}/lib/modules/${KERNEL_VERSION}/source"
101 else 99 else
@@ -251,6 +249,7 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
251# kernel-image becomes kernel-image-${KERNEL_VERISON} 249# kernel-image becomes kernel-image-${KERNEL_VERISON}
252PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules" 250PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules"
253FILES = "" 251FILES = ""
252FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order /lib/modules/${KERNEL_VERSION}/modules.builtin"
254FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" 253FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
255FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH}" 254FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH}"
256FILES_kernel-vmlinux = "/boot/vmlinux*" 255FILES_kernel-vmlinux = "/boot/vmlinux*"