[oe-commits] Yao Zhao : base.bbclass: fix PACKAGECONFIG handling code
git at git.openembedded.org
git at git.openembedded.org
Sun Aug 19 09:50:26 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 884cab0428cff2ffd070b6f36b688ca9851fbe43
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=884cab0428cff2ffd070b6f36b688ca9851fbe43
Author: Yao Zhao <yao.zhao at windriver.com>
Date: Thu Aug 2 12:06:36 2012 -0400
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.
Signed-off-by: Yao Zhao <yao.zhao at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
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)
More information about the Openembedded-commits
mailing list