meta/lib/oe/utils.py: Corrected the return value of both_contain()
PATCH 1/1 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']) ...".
--- meta/lib/oe/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/utils.py +1 -1
@@ -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 ""
Signature · 1 line
1.9.1
Quoted 10 lines · 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 bothDISTRO_FEATUREandMACHINE_FEATURES.For example, build in Dizzy branch,
COMBINED_FEATURESis "alsa usbhost ...", but recently,COMBINED_FEATURESis like "set(['alsa'])set(['usbhost'])...".Signed-off-by Jun Zhu <[email protected]>
Signature · 3 lines
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