[PATCH] base.bbclass: squash whitespace when printing BUILDCFG_VARS

[PATCH] base.bbclass: squash whitespace when printing BUILDCFG_VARS

[Andre McCurdy]

TUNE_FEATURES for ARM targets typically contains a lot of whitespace
due to refactoring in OE 2.1:

  http://git.openembedded.org/openembedded-core/commit/?id=f774b44fa007a2a756ada892ede832b1251d940c

Squash whitespace when displaying BUILDCFG_VARS in buildcfg_vars().

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/classes/base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 024fe43..c36c5ed 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -191,7 +191,7 @@ def buildcfg_vars(d):
     for var in statusvars:
         value = d.getVar(var, True)
         if value is not None:
-            yield '%-17s = "%s"' % (var, value)
+            yield '%-17s = "%s"' % (var, " ".join(value.split()))
 
 def buildcfg_neededvars(d):
     needed_vars = oe.data.typed_value("BUILDCFG_NEEDEDVARS", d)
-- 
1.9.1

Re: [PATCH] base.bbclass: squash whitespace when printing BUILDCFG_VARS

[Christopher Larson]

[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]

On Mon, Nov 28, 2016 at 3:23 PM, Andre McCurdy <armccurdy@gmail.com> wrote:

> TUNE_FEATURES for ARM targets typically contains a lot of whitespace
> due to refactoring in OE 2.1:
>
>   http://git.openembedded.org/openembedded-core/commit/?id=
> f774b44fa007a2a756ada892ede832b1251d940c
>
> Squash whitespace when displaying BUILDCFG_VARS in buildcfg_vars().
>
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ---
>  meta/classes/base.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index 024fe43..c36c5ed 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -191,7 +191,7 @@ def buildcfg_vars(d):
>      for var in statusvars:
>          value = d.getVar(var, True)
>          if value is not None:
> -            yield '%-17s = "%s"' % (var, value)
> +            yield '%-17s = "%s"' % (var, " ".join(value.split()))
>
>  def buildcfg_neededvars(d):
>      needed_vars = oe.data.typed_value("BUILDCFG_NEEDEDVARS", d)
>

This will result in inaccurate values displayed for non-list variables.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 2200 bytes --]

Re: [PATCH] base.bbclass: squash whitespace when printing BUILDCFG_VARS

[Richard Purdie]

On Mon, 2016-11-28 at 16:53 -0700, Christopher Larson wrote:
> 
> On Mon, Nov 28, 2016 at 3:23 PM, Andre McCurdy <armccurdy@gmail.com>
> wrote:
> > TUNE_FEATURES for ARM targets typically contains a lot of
> > whitespace
> > due to refactoring in OE 2.1:
> > 
> >   http://git.openembedded.org/openembedded-core/commit/?id=f774b44f
> > a007a2a756ada892ede832b1251d940c

I'm wondering if we should take back some of the whitespace changes
that commit made...

Cheers,

Richard

Re: [PATCH] base.bbclass: squash whitespace when printing BUILDCFG_VARS

[Andre McCurdy]

On Mon, Nov 28, 2016 at 3:53 PM, Christopher Larson <clarson@kergoth.com> wrote:
>
> On Mon, Nov 28, 2016 at 3:23 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
>>
>> TUNE_FEATURES for ARM targets typically contains a lot of whitespace
>> due to refactoring in OE 2.1:
>>
>> http://git.openembedded.org/openembedded-core/commit/?id=f774b44fa007a2a756ada892ede832b1251d940c
>>
>> Squash whitespace when displaying BUILDCFG_VARS in buildcfg_vars().
>>
>> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
>> ---
>>  meta/classes/base.bbclass | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
>> index 024fe43..c36c5ed 100644
>> --- a/meta/classes/base.bbclass
>> +++ b/meta/classes/base.bbclass
>> @@ -191,7 +191,7 @@ def buildcfg_vars(d):
>>      for var in statusvars:
>>          value = d.getVar(var, True)
>>          if value is not None:
>> -            yield '%-17s = "%s"' % (var, value)
>> +            yield '%-17s = "%s"' % (var, " ".join(value.split()))
>>
>>  def buildcfg_neededvars(d):
>>      needed_vars = oe.data.typed_value("BUILDCFG_NEEDEDVARS", d)
>
> This will result in inaccurate values displayed for non-list variables.

I didn't notice any changes in the other fields. Do you have an
example of a value which wouldn't display correctly?

> --
> Christopher Larson
> clarson at kergoth dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Maintainer - Tslib
> Senior Software Engineer, Mentor Graphics