* [PATCH] image classes: use PN for depends, not IMAGE_BASE_NAME
@ 2012-11-21 14:44 Koen Kooi
2012-11-30 16:39 ` Koen Kooi
0 siblings, 1 reply; 3+ messages in thread
From: Koen Kooi @ 2012-11-21 14:44 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
Some images override IMAGE_BASE_NAME in the recipe causing targets using image-{live,vmdk} to fail.
Signed-off-by: Koen Kooi <koen@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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] image classes: use PN for depends, not IMAGE_BASE_NAME
2012-11-21 14:44 [PATCH] image classes: use PN for depends, not IMAGE_BASE_NAME Koen Kooi
@ 2012-11-30 16:39 ` Koen Kooi
2012-11-30 19:06 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Koen Kooi @ 2012-11-30 16:39 UTC (permalink / raw)
To: openembedded-core
ping
Op 21 nov. 2012, om 15:44 heeft Koen Kooi <koen@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@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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] image classes: use PN for depends, not IMAGE_BASE_NAME
2012-11-30 16:39 ` Koen Kooi
@ 2012-11-30 19:06 ` Saul Wold
0 siblings, 0 replies; 3+ messages in thread
From: Saul Wold @ 2012-11-30 19:06 UTC (permalink / raw)
To: Koen Kooi; +Cc: openembedded-core
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@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@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@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-30 19:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-21 14:44 [PATCH] image classes: use PN for depends, not IMAGE_BASE_NAME Koen Kooi
2012-11-30 16:39 ` Koen Kooi
2012-11-30 19:06 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox