[OE-core] [PATCH] image classes: use PN for depends, not IMAGE_BASE_NAME

[Saul Wold]

On 11/30/2012 08:39 AM, Koen Kooi wrote:
> ping
>
Koen,

It's been in master for a few days now, we kind of fell behind on email 
ACKs.

Sau!

> Op 21 nov. 2012, om 15:44 heeft Koen Kooi <koen at dominion.thruhere.net> het volgende geschreven:
>
>> 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
>>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>