All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jun Zhu <R01007@freescale.com>
To: <openembedded-core@lists.openembedded.org>
Cc: Jun Zhu <R01007@freescale.com>, raa013@freescale.com
Subject: [PATCH] meta/lib/oe/utils.py: Corrected the return value of both_contain()
Date: Fri, 3 Apr 2015 22:34:09 +0800	[thread overview]
Message-ID: <1428071649-7803-1-git-send-email-R01007@freescale.com> (raw)

oe.utils.both_contain() should return the result as "checkvalue" or "",
but the latest implement returns as "set(['checkvalue'])" or "";

It causes that bitbake.conf generates the wrong result of COMBINED_FEATURES,
which contains the common components in both DISTRO_FEATURE and MACHINE_FEATURES.

For example, build in Dizzy branch, COMBINED_FEATURES is "alsa usbhost ...",
but recently, COMBINED_FEATURES is like "set(['alsa']) set(['usbhost']) ...".

Signed-off-by: Jun Zhu <R01007@freescale.com>
---
 meta/lib/oe/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index bedade2..b8224de 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -51,7 +51,7 @@ def both_contain(variable1, variable2, checkvalue, d):
     else:
         checkvalue = set(checkvalue)
     if checkvalue.issubset(val1) and checkvalue.issubset(val2):
-        return checkvalue
+        return " ".join(checkvalue)
     else:
         return ""
 
-- 
1.9.1



             reply	other threads:[~2015-04-03  8:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-03 14:34 Jun Zhu [this message]
2015-04-03 18:42 ` [PATCH] meta/lib/oe/utils.py: Corrected the return value of both_contain() Otavio Salvador

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=1428071649-7803-1-git-send-email-R01007@freescale.com \
    --to=r01007@freescale.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=raa013@freescale.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.