]> code.ossystems Code Review - openembedded-core.git/commit
meta/lib/oe/utils.py: Corrected the return value of both_contain()
authorJun Zhu <R01007@freescale.com>
Fri, 3 Apr 2015 14:34:09 +0000 (22:34 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 6 Apr 2015 19:36:05 +0000 (20:36 +0100)
commitc4ca9dbd4191fcff08e75035e3d276490ed80b05
tree3f25197878b7bce579327902beb1175b2c30a773
parent0ec01bbd845b61798366441b2c7e5b8738db6b32
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 <R01007@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/utils.py