From 25e515ba2ff7d9670b179fce85514f598094f13a Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 15 Sep 2010 16:30:28 -0700 Subject: kernel.bbclass: Fix INITRAMFS_IMAGE logic Due to a bitbake bug to be fixed in 1.10.1, EXPORT_FUNCTIONS isn't remapping kernel_do_compile[depends] to do_compile[depends], so make a comment about cleaning this up once we depend on a working bitbake. Next, it needs to add to do_configure (like the users have manually set a dependancy on) rather than do_compile so that the initramfs is copied into place in time. Since we're fixing the logic in kernel.bbclass, we can drop the workarounds that linux-kexecboot and linux-preboot have added. Signed-off-by: Tom Rini --- classes/kernel.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 9555f30a30..5f8bc8a905 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -95,7 +95,6 @@ kernel_do_compile() { oenote "no modules to compile" fi } -kernel_do_compile[depends] = "${INITRAMFS_TASK}" kernel_do_install() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE @@ -216,6 +215,8 @@ kernel_do_configure() { done fi } +# XXX: Once we depend on bitbake 1.10.1 or newer this can be kernel_do_... +do_configure[depends] += "${INITRAMFS_TASK}" do_menuconfig() { export TERMWINDOWTITLE="${PN} Kernel Configuration" -- cgit v1.2.3