diff options
| author |   Jun Zhu <R01007@freescale.com> | 2015-04-03 22:34:09 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-15 18:12:01 +0100 |
| commit | 9471b87ecadeeba8e8ffe6955ec1dedc976a2978 (patch) | |
| tree | 91c5d6f99853755bed5ffbf30037f86687c70b18 /meta/lib | |
| parent | cd3da9c95f48899e134a5b7ed1754fd18985df4f (diff) | |
| download | openembedded-core-9471b87ecadeeba8e8ffe6955ec1dedc976a2978.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 master rev: c4ca9dbd4191fcff08e75035e3d276490ed80b05)
Signed-off-by: Jun Zhu <R01007@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -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): else: checkvalue = set(checkvalue) if checkvalue.issubset(val1) and checkvalue.issubset(val2): - return checkvalue + return " ".join(checkvalue) else: return "" |