From eb1bc0eeb3f19bf060ef2c2d386792a94ffc5764 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 4 May 2023 11:58:37 +0200 Subject: [PATCH] meta-digi-arm: fix regression in optee userspace support OPTEE_PKGS variable must have a default (empty) value to prevent bitbake parsing errors. This fixes a build failure for MP1 platforms where the variable was undefined in the commit that added the support. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 1 + meta-digi-arm/conf/machine/include/imx-digi-base.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index b8a9eb21f..9410a4ab4 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -64,6 +64,7 @@ MACHINE_VARIANT ?= "" MACHINEOVERRIDES .= "${@['', ':${MACHINE_VARIANT}']['${MACHINE_VARIANT}' != '']}" # Extra RDEPENDS +OPTEE_PKGS ??= "" MACHINE_EXTRA_RDEPENDS += " \ ${@bb.utils.contains("MACHINE_FEATURES", "mca", "mca-tool", "", d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_PKGS}', '', d)} \ diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index 856ed6d0f..aed5d59e9 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -279,7 +279,7 @@ PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.19.0.imx" PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "3.19.0.imx" # Optee runtime packages to install -OPTEE_PKGS:use-nxp-bsp ??= "optee-client optee-os" +OPTEE_PKGS ??= "optee-client optee-os" # Use i.MX opencv Version PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"