From c4ca9dbd4191fcff08e75035e3d276490ed80b05 Mon Sep 17 00:00:00 2001 From: Jun Zhu Date: Fri, 3 Apr 2015 22:34:09 +0800 Subject: 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 Signed-off-by: Richard Purdie --- 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 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 "" -- cgit 1.2.3-korg