diff options
author | Yao Zhao <yao.zhao@windriver.com> | 2012-08-02 12:06:36 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-19 10:45:55 +0100 |
commit | 771f89498cf46cf04613407641f2bfd9cfa7d1e3 (patch) | |
tree | a1f29b2024a117f6002de3b3cb149b56a50911e0 | |
parent | 61ed74a72524b7f18fe7e48d5ae7f1f6b5756919 (diff) | |
download | ast2050-yocto-poky-771f89498cf46cf04613407641f2bfd9cfa7d1e3.zip ast2050-yocto-poky-771f89498cf46cf04613407641f2bfd9cfa7d1e3.tar.gz |
base.bbclass: fix PACKAGECONFIG handling code
PACKAGECONFIG flag code only handles that when it has 3 or 4 items in flag,
it may have a stale data if some flags doesn't need DEPENDS and RDEPENDS.
(From OE-Core rev: 884cab0428cff2ffd070b6f36b688ca9851fbe43)
Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/base.bbclass | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index acc3217..1a094ad 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -382,20 +382,19 @@ python () { if flag == "defaultval": continue items = flagval.split(",") - if len(items) == 3: - enable, disable, depend = items - rdepend = "" - elif len(items) == 4: - enable, disable, depend, rdepend = items + num = len(items) + if num > 4: + bb.error("Only enable,disable,depend,rdepend can be specified!") + if flag in pkgconfig: - if depend: - extradeps.append(depend) - if rdepend: - extrardeps.append(rdepend) - if enable: - extraconf.append(enable) - elif disable: - extraconf.append(disable) + if num >= 3 and items[2]: + extradeps.append(items[2]) + if num >= 4 and items[3]: + extrardeps.append(items[3]) + if num >= 1 and items[0]: + extraconf.append(items[0]) + elif num >= 2 and items[1]: + extraconf.append(items[1]) appendVar('DEPENDS', extradeps) appendVar('RDEPENDS_${PN}', extrardeps) appendVar('EXTRA_OECONF', extraconf) |