From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 14 Jan 2016 21:17:08 +0000 (-0200)
Subject: image.bbclass: Handle image base type dependency properly
X-Git-Tag: 2016-4~1589
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=191c7be3a6cc52911f244323072433f6a1172bf1;p=openembedded-core.git

image.bbclass: Handle image base type dependency properly

When a base image type has an implicit dependency (from IMAGE_TYPEDEP)
this has to be taken into account. This is a regression introduced by
OE-Core:c2dab18 (image: Create separate tasks for rootfs construction).

The issue has been found when building meta-fsl-arm based images which
does not include the rootfs image type explicitly in IMAGE_FSTYPES but
instead is added, using IMAGE_TYPEDEP, for the 'sdcard.gz' image.

Reported-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 8a09db1929..96666d529f 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -337,6 +337,9 @@ python () {
             _add_type(dep)
             basedep = _image_base_type(dep)
             typedeps[baset].add(basedep)
+
+        if baset != t:
+            _add_type(baset)
         
     for t in alltypes[:]:
         _add_type(t)