* [PATCH] base.bbclass: fix PACKAGECONFIG handling code
@ 2012-08-02 16:06 Yao Zhao
2012-08-16 17:48 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Yao Zhao @ 2012-08-02 16:06 UTC (permalink / raw)
To: openembedded-core
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@windriver.com>
---
meta/classes/base.bbclass | 25 ++++++++++++-------------
1 file 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)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] base.bbclass: fix PACKAGECONFIG handling code
2012-08-02 16:06 [PATCH] base.bbclass: fix PACKAGECONFIG handling code Yao Zhao
@ 2012-08-16 17:48 ` Saul Wold
2012-08-16 20:02 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2012-08-16 17:48 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/02/2012 09:06 AM, Yao Zhao wrote:
> 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@windriver.com>
> ---
> meta/classes/base.bbclass | 25 ++++++++++++-------------
> 1 file 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)
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] base.bbclass: fix PACKAGECONFIG handling code
2012-08-16 17:48 ` Saul Wold
@ 2012-08-16 20:02 ` Saul Wold
0 siblings, 0 replies; 3+ messages in thread
From: Saul Wold @ 2012-08-16 20:02 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/16/2012 10:48 AM, Saul Wold wrote:
> On 08/02/2012 09:06 AM, Yao Zhao wrote:
>> 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@windriver.com>
>> ---
>> meta/classes/base.bbclass | 25 ++++++++++++-------------
>> 1 file 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)
>>
>
> Merged into OE-Core
>
My mistake not merged.
Sau!
> Thanks
> Sau!
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-16 20:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-02 16:06 [PATCH] base.bbclass: fix PACKAGECONFIG handling code Yao Zhao
2012-08-16 17:48 ` Saul Wold
2012-08-16 20:02 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox