From 1b8ee250f3ce93e1a88cac71ab8d305bfd15dda1 Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Mon, 23 Jan 2023 13:50:17 +0000 Subject: [PATCH] classes: Prevent passing None to the runfvp environment FVP_ENV_PASSTHROUGH may contain variables that have not been set. d.getVar returns None in this case. Detect this and skip setting the variable in the model environment. Signed-off-by: Peter Hoyes Signed-off-by: Jon Mason --- meta-arm/classes/fvpboot.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-arm/classes/fvpboot.bbclass b/meta-arm/classes/fvpboot.bbclass index 0c0f9d2d..da0580b0 100644 --- a/meta-arm/classes/fvpboot.bbclass +++ b/meta-arm/classes/fvpboot.bbclass @@ -73,7 +73,8 @@ python do_write_fvpboot_conf() { data["env"] = {} for var in d.getVar("FVP_ENV_PASSTHROUGH").split(): - data["env"][var] = d.getVar(var) + if d.getVar(var) is not None: + data["env"][var] = d.getVar(var) os.makedirs(os.path.dirname(conffile), exist_ok=True) with open(conffile, "wt") as f: