From 3d35fe2f6035781034cb28d7719b772a1b25a8f8 Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Tue, 22 Feb 2022 17:28:53 +0100 Subject: [PATCH] libkas: Update BB_ENV_PASSTHROUGH_ADDITIONS with env_vars 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 [Jan: fixed overlong line] Signed-off-by: Jan Kiszka --- kas/libkas.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kas/libkas.py b/kas/libkas.py index 01402fc..5d78382 100644 --- a/kas/libkas.py +++ b/kas/libkas.py @@ -259,7 +259,11 @@ 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})