Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2023-05-04 11:58:37 +02:00
parent 7bd3ebc76e
commit eb1bc0eeb3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-digi-arm/conf/machine/include/digi-defaults.inc
View File

@ -64,6 +64,7 @@ MACHINE_VARIANT ?= ""
MACHINEOVERRIDES .= "${@['', ':${MACHINE_VARIANT}']['${MACHINE_VARIANT}' != '']}" MACHINEOVERRIDES .= "${@['', ':${MACHINE_VARIANT}']['${MACHINE_VARIANT}' != '']}"
# Extra RDEPENDS # Extra RDEPENDS
OPTEE_PKGS ??= ""
MACHINE_EXTRA_RDEPENDS += " \ MACHINE_EXTRA_RDEPENDS += " \
${@bb.utils.contains("MACHINE_FEATURES", "mca", "mca-tool", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "mca", "mca-tool", "", d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_PKGS}', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_PKGS}', '', d)} \

2
meta-digi-arm/conf/machine/include/imx-digi-base.inc
View File

@ -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" PREFERRED_VERSION_optee-test:mx9-nxp-bsp ??= "3.19.0.imx"
# Optee runtime packages to install # 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 # Use i.MX opencv Version
PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"