Patchwork [1/2] bitbake.conf: add a couple explicit vardeps

login
register
mail settings
Submitter Chris Larson
Date Nov. 16, 2011, 9:17 p.m.
Message ID <CABcZAN=BW7pRGFfQ5RgeX=rwWWFdWo3iJk2Z4zD1oOapTrpdFQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/15059/
State New
Headers show

Comments

Chris Larson - Nov. 16, 2011, 9:17 p.m.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/conf/bitbake.conf |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

 ##################################################################
@@ -717,6 +718,7 @@ COMBINED_FEATURES = "\
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES",
"usbgadget", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES",
"usbhost", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}"
+COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES"


 # Make sure MACHINE isn't exported
Richard Purdie - Nov. 18, 2011, 2:29 p.m.
On Wed, 2011-11-16 at 14:17 -0700, Chris Larson wrote:
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
>  meta/conf/bitbake.conf |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 0d6b3b8..c158c61 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -506,6 +506,7 @@ DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types"
>  FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
>  DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe"
>  SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION',
> 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', 1) == '1'], d, 1)}"
> +SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION"
>  BUILD_OPTIMIZATION = "-O2 -pipe"
> 
>  ##################################################################
> @@ -717,6 +718,7 @@ COMBINED_FEATURES = "\
>      ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES",
> "usbgadget", d)} \
>      ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES",
> "usbhost", d)} \
>      ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}"
> +COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES"
> 
> 
>  # Make sure MACHINE isn't exported

I merged this to master but your patch was line wrapped so I had to
unmangle it...

Cheers,

Richard
Chris Larson - Nov. 18, 2011, 3:36 p.m.
On Fri, Nov 18, 2011 at 7:29 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Wed, 2011-11-16 at 14:17 -0700, Chris Larson wrote:
>> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
>> ---
>>  meta/conf/bitbake.conf |    2 ++
>>  1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>> index 0d6b3b8..c158c61 100644
>> --- a/meta/conf/bitbake.conf
>> +++ b/meta/conf/bitbake.conf
>> @@ -506,6 +506,7 @@ DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types"
>>  FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
>>  DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe"
>>  SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION',
>> 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', 1) == '1'], d, 1)}"
>> +SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION"
>>  BUILD_OPTIMIZATION = "-O2 -pipe"
>>
>>  ##################################################################
>> @@ -717,6 +718,7 @@ COMBINED_FEATURES = "\
>>      ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES",
>> "usbgadget", d)} \
>>      ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES",
>> "usbhost", d)} \
>>      ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}"
>> +COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES"
>>
>>
>>  # Make sure MACHINE isn't exported
>
> I merged this to master but your patch was line wrapped so I had to
> unmangle it...

Yeah, sorry about that. I was getting an inexplicable error from
send-email, so used imap-send, but forgot that the gmail web interface
line wraps (stupid thing, they need to add an option to disable that).

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 0d6b3b8..c158c61 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -506,6 +506,7 @@  DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types"
 FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
 DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe"
 SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION',
'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', 1) == '1'], d, 1)}"
+SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION"
 BUILD_OPTIMIZATION = "-O2 -pipe"