diff options
author | Jun Zhu <R01007@freescale.com> | 2015-04-03 22:34:09 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-08 10:53:15 +0100 |
commit | dd90ccfa8203ca385f1de841bd6817519af2d1bf (patch) | |
tree | 6a06a8fde78728505b7536272074d411c282ec09 /meta | |
parent | 74e7f68a7b46eb8700b415ab3a24092e295b001e (diff) | |
download | poky-dd90ccfa8203ca385f1de841bd6817519af2d1bf.tar.gz |
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']) ...".
(From OE-Core rev: c4ca9dbd4191fcff08e75035e3d276490ed80b05)
Signed-off-by: Jun Zhu <R01007@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/utils.py | 2 |
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): | |||
51 | else: | 51 | else: |
52 | checkvalue = set(checkvalue) | 52 | checkvalue = set(checkvalue) |
53 | if checkvalue.issubset(val1) and checkvalue.issubset(val2): | 53 | if checkvalue.issubset(val1) and checkvalue.issubset(val2): |
54 | return checkvalue | 54 | return " ".join(checkvalue) |
55 | else: | 55 | else: |
56 | return "" | 56 | return "" |
57 | 57 | ||