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 <tom_rini@mentor.com>

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 9555f30..5f8bc8a 100644 (file)
--- 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"

diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc
index 3e2482c..dc41cc2 100644 (file)
--- a/recipes/kexecboot/linux-kexecboot.inc
+++ b/recipes/kexecboot/linux-kexecboot.inc
@@ -55,9 +55,6 @@ INITRAMFS_COMPRESSION = '${@kernel_version_less_or_equal("PV", "2.6.29", "", "CO
 INITRAMFS_COMPRESSION_SUFFIX = '${@kernel_version_less_or_equal("PV", "2.6.29", "gz", "lzma", d)}'
 RD_COMPRESSION = '${@kernel_version_less_or_equal("PV", "2.6.29", "", "CONFIG_RD_LZMA=y", d)}'
 
-do_configure[depends] += "${INITRAMFS_IMAGE}:do_rootfs"
-
-
 do_configure_append() {
 sed -i -e /CONFIG_BLK_DEV_INITRD/d \
        -e /CONFIG_KEXEC/d \

diff --git a/recipes/preboot/linux-preboot.inc b/recipes/preboot/linux-preboot.inc
index d8771f8..6585c46 100644 (file)
--- a/recipes/preboot/linux-preboot.inc
+++ b/recipes/preboot/linux-preboot.inc
@@ -16,8 +16,6 @@ PROVIDES = ""
 KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-preboot-${PV}-${PR}-${MACHINE}"
 KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-preboot-${MACHINE}"
 
-do_configure[depends] += "${INITRAMFS_IMAGE}:do_rootfs"
-
 do_configure_append() {
 sed -i -e /CONFIG_BLK_DEV_INITRD/d \
        -e /CONFIG_KEXEC/d \