diff options
| author |   Tom Rini <tom_rini@mentor.com> | 2010-09-15 16:30:28 -0700 |
|---|---|---|
| committer | Tom Rini <tom_rini@mentor.com> | 2010-09-15 16:34:02 -0700 |
| commit | 25e515ba2ff7d9670b179fce85514f598094f13a (patch) | |
| tree | 5b8481357860795939d9536c3e3e35ba7eb14405 /recipes | |
| parent | 7d909ba42651c7030393bb672c329d68b94d6608 (diff) | |
| download | openembedded-25e515ba2ff7d9670b179fce85514f598094f13a.tar.gz | |
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>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/kexecboot/linux-kexecboot.inc | 3 | ||||
| -rw-r--r-- | recipes/preboot/linux-preboot.inc | 2 |
2 files changed, 0 insertions, 5 deletions
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 \ |