From c6be292f3601eb335a49da7da90763b8c406a419 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Thu, 6 Aug 2020 23:42:12 +0500 Subject: [PATCH] tcmode: fix setup_external_vars This was failing to set the variables needed. Signed-off-by: Christopher Larson --- conf/distro/include/tcmode-external-oe-sdk.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/distro/include/tcmode-external-oe-sdk.inc b/conf/distro/include/tcmode-external-oe-sdk.inc index d345471..1a28067 100644 --- a/conf/distro/include/tcmode-external-oe-sdk.inc +++ b/conf/distro/include/tcmode-external-oe-sdk.inc @@ -20,7 +20,7 @@ python extract_env_setup_metadata() { external_toolchain = Path(d.getVar('EXTERNAL_TOOLCHAIN')) if external_toolchain.is_absolute() and external_toolchain.is_dir(): - setup_external_vars(external_toolchain, d) + setup_external_vars(external_toolchain, d, d) localdata = bb.data.createCopy(d) variants = d.getVar('MULTILIB_VARIANTS') or '' @@ -29,17 +29,17 @@ python extract_env_setup_metadata() { overrides = d.getVar('OVERRIDES', False) + ':virtclass-multilib-' + item localdata.setVar('OVERRIDES', overrides) localdata.setVar('MLPREFIX', item + '-') - setup_external_vars(external_toolchain, localdata) + setup_external_vars(external_toolchain, localdata, d) } extract_env_setup_metadata[eventmask] = "bb.event.ConfigParsed" addhandler extract_env_setup_metadata -def setup_external_vars(external_toolchain, d): +def setup_external_vars(external_toolchain, localdata, d): from pathlib import Path - setup, env = get_setup_script_env(external_toolchain, d) + setup, env = get_setup_script_env(external_toolchain, localdata) - mlprefix = d.getVar('MLPREFIX') + mlprefix = localdata.getVar('MLPREFIX') if mlprefix: suffix = '_virtclass-multilib-' + mlprefix[:-1] else: