From f5acf7d2c83f6a1e4d09fb7497bf1691598ba143 Mon Sep 17 00:00:00 2001 From: Emanuele Ghidoli Date: Mon, 8 Sep 2025 14:54:36 +0200 Subject: optee-imx: remove usage of UNPACKDIR variable While upgrading optee-imx to 4.4.0.imx, the UNPACKDIR variable was used but it is not supported in scarthgap. Fix by using WORKDIR instead. Fixes: 475d20abfdb2 ("optee-imx: Upgrade 4.2.0.imx -> 4.4.0.imx") Signed-off-by: Emanuele Ghidoli --- recipes-security/optee-imx/optee-client-fslc-imx.inc | 2 +- recipes-security/optee-imx/optee-client-fslc.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-security/optee-imx/optee-client-fslc-imx.inc b/recipes-security/optee-imx/optee-client-fslc-imx.inc index 7aeff9fd5..78d9399e4 100644 --- a/recipes-security/optee-imx/optee-client-fslc-imx.inc +++ b/recipes-security/optee-imx/optee-client-fslc-imx.inc @@ -21,7 +21,7 @@ TEE_GROUP_NAME ?= "teeclnt" do_install:append () { if ${@oe.utils.conditional('VIRTUAL-RUNTIME_dev_manager', 'busybox-mdev', 'false', 'true', d)}; then install -d ${D}${nonarch_base_libdir}/udev/rules.d/ - install -m 755 ${UNPACKDIR}/tee-udev.rules ${D}${nonarch_base_libdir}/udev/rules.d/ + install -m 755 ${WORKDIR}/tee-udev.rules ${D}${nonarch_base_libdir}/udev/rules.d/ sed -i -e "s/teeclnt/${TEE_GROUP_NAME}/" ${D}${nonarch_base_libdir}/udev/rules.d/tee-udev.rules fi diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc index 455bdd780..3adf38da3 100644 --- a/recipes-security/optee-imx/optee-client-fslc.inc +++ b/recipes-security/optee-imx/optee-client-fslc.inc @@ -27,8 +27,8 @@ EXTRA_OECMAKE = " \ EXTRA_OECMAKE:append:toolchain-clang = " -DCFG_WERROR=0" do_install:append() { - install -D -p -m0644 ${UNPACKDIR}/tee-supplicant@.service ${D}${systemd_system_unitdir}/tee-supplicant@.service - install -D -p -m0755 ${UNPACKDIR}/tee-supplicant.sh ${D}${sysconfdir}/init.d/tee-supplicant + install -D -p -m0644 ${WORKDIR}/tee-supplicant@.service ${D}${systemd_system_unitdir}/tee-supplicant@.service + install -D -p -m0755 ${WORKDIR}/tee-supplicant.sh ${D}${sysconfdir}/init.d/tee-supplicant sed -i -e s:@sysconfdir@:${sysconfdir}:g \ -e s:@sbindir@:${sbindir}:g \ -- cgit v1.2.3-54-g00ecf