]> 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>
Fri, 15 May 2015 17:12:01 +0000 (18:12 +0100)
commit9471b87ecadeeba8e8ffe6955ec1dedc976a2978
tree91c5d6f99853755bed5ffbf30037f86687c70b18
parentcd3da9c95f48899e134a5b7ed1754fd18985df4f
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>
meta/lib/oe/utils.py