[meta-swupd][PATCH] swupd-image: Fix files ownership if IMAGE_BASENAME is not default

[meta-swupd][PATCH] swupd-image: Fix files ownership if IMAGE_BASENAME is not default

[Piotr Figiel]

From: Piotr Figiel <p.figiel@camlintechnologies.com>

In case IMAGE_BASENAME is set on image recipe level the files ownership on
target rootfs is incorrect for recipes inheriting swupd-image.bbclass.
Depending on the context swupd-image.bbclass used either PN (PN_BASE) or
IMAGE_BASENAME when generating path to pseudo shared state directory. This
seems correct only when IMAGE_BASENAME is not set as it defaults to PN.

This patch resolves above problem.

Addresses [YOCTO #10108].

Signed-off-by: Piotr Figiel <p.figiel@camlintechnologies.com>
---
 classes/swupd-image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/swupd-image.bbclass b/classes/swupd-image.bbclass
index 08ab3f5..ed9bd24 100644
--- a/classes/swupd-image.bbclass
+++ b/classes/swupd-image.bbclass
@@ -81,7 +81,7 @@ python () {
         # Because real image building via SWUPD_IMAGES can happen also after
         # the initial "bitbake <core image>" invocation, we have to keep that
         # pseudo database around and cannot delete it.
-        pseudo_state = d.expand('${TMPDIR}/work-shared/${PN_BASE}/pseudo')
+        pseudo_state = d.expand('${TMPDIR}/work-shared/${IMAGE_BASENAME}/pseudo')
         d.setVar('PSEUDO_LOCALSTATEDIR', pseudo_state)
 
         # Non mega virtual images must depend on the mega image having been
-- 
1.9.1

Re: [meta-swupd][PATCH] swupd-image: Fix files ownership if IMAGE_BASENAME is not default

[Joshua G Lock]

On Thu, 2016-08-11 at 14:27 +0200, Piotr Figiel wrote:
> From: Piotr Figiel <p.figiel@camlintechnologies.com>
> 
> In case IMAGE_BASENAME is set on image recipe level the files
> ownership on
> target rootfs is incorrect for recipes inheriting swupd-
> image.bbclass.
> Depending on the context swupd-image.bbclass used either PN (PN_BASE)
> or
> IMAGE_BASENAME when generating path to pseudo shared state directory.
> This
> seems correct only when IMAGE_BASENAME is not set as it defaults to
> PN.
> 
> This patch resolves above problem.
> 
> Addresses [YOCTO #10108].

Good catch, thanks! Patch pushed to meta-swupd master.

Joshua

> 
> Signed-off-by: Piotr Figiel <p.figiel@camlintechnologies.com>
> ---
>  classes/swupd-image.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/classes/swupd-image.bbclass b/classes/swupd-
> image.bbclass
> index 08ab3f5..ed9bd24 100644
> --- a/classes/swupd-image.bbclass
> +++ b/classes/swupd-image.bbclass
> @@ -81,7 +81,7 @@ python () {
>          # Because real image building via SWUPD_IMAGES can happen
> also after
>          # the initial "bitbake <core image>" invocation, we have to
> keep that
>          # pseudo database around and cannot delete it.
> -        pseudo_state = d.expand('${TMPDIR}/work-
> shared/${PN_BASE}/pseudo')
> +        pseudo_state = d.expand('${TMPDIR}/work-
> shared/${IMAGE_BASENAME}/pseudo')
>          d.setVar('PSEUDO_LOCALSTATEDIR', pseudo_state)
>  
>          # Non mega virtual images must depend on the mega image
> having been
> -- 
> 1.9.1
>