Patchwork [for-danny] kernel.bbclass: Add missing modules.order and modules.builtins

login
register
mail settings
Submitter Denys Dmytriyenko
Date March 12, 2013, 8:11 p.m.
Message ID <1363119114-5177-1-git-send-email-denis@denix.org>
Download mbox | patch
Permalink /patch/46087/
State New
Headers show

Comments

Denys Dmytriyenko - March 12, 2013, 8:11 p.m.
From: Mark Hatle <mark.hatle@windriver.com>

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>
---
 meta/classes/kernel.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Ross Burton - March 12, 2013, 8:26 p.m.
On 12 March 2013 13:11, Denys Dmytriyenko <denis@denix.org> wrote:
> From: Mark Hatle <mark.hatle@windriver.com>
>
> 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.

Merged into danny-next locally, I'll push when I have reasonable connectivity.

Ross

Patch

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 88ce561..fd46711 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -108,8 +108,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
@@ -259,6 +257,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"
 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*"