[PATCH] meta/lib/oe/utils.py: Corrected the return value of both_contain()

[PATCH] meta/lib/oe/utils.py: Corrected the return value of both_contain()

[Jun Zhu]

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

Re: [PATCH] meta/lib/oe/utils.py: Corrected the return value of both_contain()

[Otavio Salvador]

On Fri, Apr 3, 2015 at 11:34 AM, Jun Zhu <R01007@freescale.com> wrote:
> 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>

Tested-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750