[PATCH] libkas: Update BB_ENV_PASSTHROUGH_ADDITIONS with env_vars

[Peter Hoyes]

From: Peter Hoyes <Peter...@arm.com>

Poky master has renamed BB_ENV_EXTRAWHITE ->
BB_ENV_PASSTHROUGH_ADDITIONS ahead of the kirkstone release
https://git.yoctoproject.org/poky/commit/?id=492214104a55ec56cc483c9b045038e355c6af7b

Update env var logic so that it updates either BB_ENV_EXTRAWHITE (for
honister or earlier) or BB_ENV_PASSTHROUGH_ADDITIONS (for master or
kirkstone), depending on which is defined in the bitbake environment.

Signed-off-by: Peter Hoyes <Peter...@arm.com>
---
kas/libkas.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kas/libkas.py b/kas/libkas.py
index 01402fc..0af8fbd 100644
--- a/kas/libkas.py
+++ b/kas/libkas.py
@@ -259,7 +259,10 @@ def get_build_environ(build_system):

env.update(conf_env)

- if 'BB_ENV_EXTRAWHITE' in env:
+ if 'BB_ENV_PASSTHROUGH_ADDITIONS' in env:
+ passthrough_additions = env['BB_ENV_PASSTHROUGH_ADDITIONS'] + ' ' + ' '.join(env_vars)
+ env.update({'BB_ENV_PASSTHROUGH_ADDITIONS': passthrough_additions})
+ elif 'BB_ENV_EXTRAWHITE' in env:
extra_white = env['BB_ENV_EXTRAWHITE'] + ' ' + ' '.join(env_vars)
env.update({'BB_ENV_EXTRAWHITE': extra_white})

--
2.25.1

[Jan Kiszka]

Thanks for this update.

Is it a hard switch in bitbake, or do the new versions still support the
old vars as well? If the latter, is there a case where we should forward
both?

Jan

--
Siemens AG, Technology
Competence Center Embedded Linux

[Ross Burton]

On Tue, 22 Feb 2022 at 17:59, Jan Kiszka <jan.k...@siemens.com> wrote:
> Is it a hard switch in bitbake, or do the new versions still support the
> old vars as well? If the latter, is there a case where we should forward
> both?

It's a hard switch. Current git master supports only the new names.

Ross

[Jan Kiszka]

Thanks for the clarification - applied as-is.

[Jan Kiszka]

On 22.02.22 19:08, Jan Kiszka wrote:
> On 22.02.22 19:06, Ross Burton wrote:
>> On Tue, 22 Feb 2022 at 17:59, Jan Kiszka <jan.k...@siemens.com> wrote:
>>> Is it a hard switch in bitbake, or do the new versions still support the
>>> old vars as well? If the latter, is there a case where we should forward
>>> both?
>>
>> It's a hard switch. Current git master supports only the new names.
>>
>
> Thanks for the clarification - applied as-is.
>

...not as is: I had to rewrap an overlong line to pass the style checks.

[Ross Burton]

This isn't merged from what I can tell, and when it is can you make a
new container image? With this bug it's impossible to use a
state/dldir by setting environment variables.

Ross

[Jan Kiszka]

On 24.02.22 17:04, Ross Burton wrote:
> This isn't merged from what I can tell, and when it is can you make a
> new container image? With this bug it's impossible to use a
> state/dldir by setting environment variables.

It was only in next for testing. Now also in master.

Jan

[Diego Sueiro]

Hi,

Is there an ETA for a new release containing this fix?

It is currently not possible to build oe-core master with kas unless I switch to the next branch.

Cheers,

--

Diego Sueiro

[Ross Burton]

Any plans for a new release? My development machine doesn't use the
kas container so I now need to run kas from git instead of a release
from pip.

Ross