[OE-core] [PATCH] image classes: use PN for depends, not IMAGE_BASE_NAME
Koen Kooi
koen at dominion.thruhere.net
Wed Nov 21 14:44:34 UTC 2012
Some images override IMAGE_BASE_NAME in the recipe causing targets using image-{live,vmdk} to fail.
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
meta/classes/image-live.bbclass | 2 +-
meta/classes/image-vmdk.bbclass | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 2f3261e..bfb59f8 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -10,6 +10,6 @@ LABELS_append = " ${SYSLINUX_LABELS} "
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
do_bootimg[depends] += "${INITRD_IMAGE}:do_rootfs"
-do_bootimg[depends] += "${IMAGE_BASENAME}:do_rootfs"
+do_bootimg[depends] += "${PN}:do_rootfs"
inherit bootimg
diff --git a/meta/classes/image-vmdk.bbclass b/meta/classes/image-vmdk.bbclass
index 736d1d7..6f7df3f 100644
--- a/meta/classes/image-vmdk.bbclass
+++ b/meta/classes/image-vmdk.bbclass
@@ -8,7 +8,7 @@ SYSLINUX_LABELS = "boot"
LABELS_append = " ${SYSLINUX_LABELS} "
# need to define the dependency and the ROOTFS for directdisk
-do_bootdirectdisk[depends] += "${IMAGE_BASENAME}:do_rootfs"
+do_bootdirectdisk[depends] += "${PN}:do_rootfs"
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
# creating VMDK relies on having a live hddimg so ensure we
--
1.7.7.6
More information about the Openembedded-core
mailing list