From patchwork Tue Aug 14 12:13:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, REQUEST, 38/64] base.bbclass: fix PACKAGECONFIG handling code Date: Tue, 14 Aug 2012 12:13:25 -0000 From: Saul Wold X-Patchwork-Id: 34539 Message-Id: <5a538d26fcd0e7e9cf80037f6dac43f0496bd818.1344946189.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Yao Zhao 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. Signed-off-by: Yao Zhao Signed-off-by: Saul Wold --- 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 e15fa26..3e6a7de 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -364,20 +364,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)