Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/2][morty] image_types.bbclass: fix image dependency chain collection
Date: Tue, 21 Feb 2017 10:04:50 -0800	[thread overview]
Message-ID: <1487700290-3110-3-git-send-email-armccurdy@gmail.com> (raw)
In-Reply-To: <1487700290-3110-1-git-send-email-armccurdy@gmail.com>

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".

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8a9f249a9166347cc0468191ce130003e3d306e1)
---
 meta/classes/image_types.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 5020a5a..3bfa60b 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)
-- 
1.9.1



  parent reply	other threads:[~2017-02-21 18:05 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-21 18:04 [PATCH 0/2][morty] Backport image dependency chain fixes Andre McCurdy
2017-02-21 18:04 ` [PATCH 1/2][morty] image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types Andre McCurdy
2017-02-21 18:04 ` Andre McCurdy [this message]
2017-03-15  2:14 ` [PATCH 0/2][morty] Backport image dependency chain fixes Andre McCurdy
2017-03-15  3:08   ` akuster808
2017-03-15  3:13     ` Andre McCurdy
2017-03-15  5:58       ` akuster808

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1487700290-3110-3-git-send-email-armccurdy@gmail.com \
    --to=armccurdy@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox