From 7e000fef0bf917f27dcad66dd90fae6c155c4d1d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 21 Nov 2012 15:44:34 +0100 Subject: 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. Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- 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 2f3261ec16..bfb59f808b 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 736d1d79b2..6f7df3f3ee 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 -- cgit 1.2.3-korg