From e8860f7bbfbdb8150326c49b470f8c93de6cfcaa Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 17 Apr 2024 17:55:16 +0200 Subject: [PATCH] optee-client: fix package installation in the rootfs Several things were wrong after the latest update to version 4.0: the tee-supplicant path, some settings in the systemd unit, etc. This commit fixes the installation so the optee test suite completes again. https://onedigi.atlassian.net/browse/DEL-8989 Signed-off-by: Javier Viguera --- .../optee-imx/optee-client_4.0.0.imx.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb index 32d91245c..427bdf1a8 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb @@ -8,6 +8,14 @@ require recipes-security/optee-imx/optee-client_3.19.0.imx.bb SRCBRANCH = "lf-6.1.55_2.2.0" SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee" -EXTRA_OEMAKE += "PKG_CONFIG=pkg-config" +EXTRA_OEMAKE += "PKG_CONFIG=pkg-config CFG_TEE_FS_PARENT_PATH='${localstatedir}/lib/tee'" + +do_install() { + oe_runmake DESTDIR=${D} install + install -D -p -m0644 ${WORKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/tee-supplicant.service + sed -i -e s:@sysconfdir@:${sysconfdir}:g \ + -e s:@sbindir@:${sbindir}:g \ + ${D}${systemd_system_unitdir}/tee-supplicant.service +} COMPATIBLE_MACHINE = "(ccimx93)"