summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Zhu <R01007@freescale.com>2015-04-03 22:34:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-06 20:36:05 +0100
commitc4ca9dbd4191fcff08e75035e3d276490ed80b05 (patch)
tree3f25197878b7bce579327902beb1175b2c30a773
parent0ec01bbd845b61798366441b2c7e5b8738db6b32 (diff)
downloadopenembedded-core-c4ca9dbd4191fcff08e75035e3d276490ed80b05.tar.gz
openembedded-core-c4ca9dbd4191fcff08e75035e3d276490ed80b05.tar.bz2
openembedded-core-c4ca9dbd4191fcff08e75035e3d276490ed80b05.zip
meta/lib/oe/utils.py: Corrected the return value of both_contain()
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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index bedade292b..b8224de20b 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 ""