From 99c6c878ee122a04f23ef49ea653208ca1c7aa77 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 21 Feb 2017 10:04:50 -0800 Subject: image_types.bbclass: fix image dependency chain collection If image type "foo" depends on image type "bar.xz", then dependencies should be collected from the base image type (ie "IMAGE_DEPENDS_bar") not from "IMAGE_DEPENDS_bar.xz". (From OE-Core rev: 854fff614059100494326adeec7c48fa5272d080) Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie (cherry picked from commit 8a9f249a9166347cc0468191ce130003e3d306e1) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/classes/image_types.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 5020a5a9d4..3bfa60ba26 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -33,8 +33,8 @@ def imagetypes_getdepends(d): for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split(): base, rest = split_types(typedepends) + adddep(d.getVar('IMAGE_DEPENDS_%s' % base, True) , deps) resttypes += rest - adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps) for ctype in resttypes: adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps) -- cgit v1.2.3-54-g00ecf