From 7819d6bed81f27a985516d3df9ea37d8eda22665 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 27 Sep 2021 13:55:58 +0100 Subject: [PATCH] arm/fvpboot: clean up fvpboot_vars Change-Id: I43a04cd1b977fbf7d0050b2ab9e7509c0439dca5 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm/classes/fvpboot.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-arm/classes/fvpboot.bbclass b/meta-arm/classes/fvpboot.bbclass index 18a9d686..de66d7ce 100644 --- a/meta-arm/classes/fvpboot.bbclass +++ b/meta-arm/classes/fvpboot.bbclass @@ -74,7 +74,8 @@ python do_write_fvpboot_conf() { } def fvpboot_vars(d): - build_vars = ['DEPLOY_DIR_IMAGE', 'IMAGE_NAME', 'IMAGE_LINK_NAME', - 'COMPONENTS_DIR', 'BUILD_ARCH'] - return build_vars + [k for k in d.keys() if k.startswith('FVP_')] -do_write_fvpboot_conf[vardeps] += "${@' '.join(fvpboot_vars(d))}" + vars = ['DEPLOY_DIR_IMAGE', 'IMAGE_NAME', 'IMAGE_LINK_NAME', 'COMPONENTS_DIR', 'BUILD_ARCH'] + vars.extend((k for k in d.keys() if k.startswith('FVP_'))) + return " ".join(vars) + +do_write_fvpboot_conf[vardeps] += "${@fvpboot_vars(d)}"