diff options
| -rw-r--r-- | classes/kernel.bbclass | 3 | ||||
| -rw-r--r-- | recipes/kexecboot/linux-kexecboot.inc | 3 | ||||
| -rw-r--r-- | recipes/preboot/linux-preboot.inc | 2 |
3 files changed, 2 insertions, 6 deletions
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" diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc index 3e2482c6a8..dc41cc2eec 100644 --- 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 d8771f8cca..6585c4677c 100644 --- 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 \ |