diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2012-11-21 15:44:34 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-24 15:12:28 +0000 |
| commit | e2143b373983fd3e85d78dc9b34cd386ceccc285 (patch) | |
| tree | f794cc86d6da5e30b164c12bd5e1370b826fd93d | |
| parent | 5ce6418c13415e76a1287cce750b03d07bdf68ed (diff) | |
| download | ast2050-yocto-poky-e2143b373983fd3e85d78dc9b34cd386ceccc285.zip ast2050-yocto-poky-e2143b373983fd3e85d78dc9b34cd386ceccc285.tar.gz | |
image classes: use PN for depends, not IMAGE_BASE_NAME
Some images override IMAGE_BASE_NAME in the recipe causing targets using image-{live,vmdk} to fail.
(From OE-Core rev: 7e000fef0bf917f27dcad66dd90fae6c155c4d1d)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image-live.bbclass | 2 | ||||
| -rw-r--r-- | 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 |
