From 30872ba12abaab0a53e332a33429e602be30e249 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Tue, 28 May 2024 22:29:16 +0200 Subject: [PATCH] optee-client: Switch away from S = WORKDIR Since OE-Core commit 32cba1cc916a ("insane: Error for S == WORKDIR") usage of WORKDIR in tasks is fatal, and shall be replaced with UNPACKDIR. Similar change is introduced in OE-Core commit d9328e3b0b06 ("recipes: Switch away from S = WORKDIR"), follow the same pattern for OP-TEE client. Signed-off-by: Andrey Zhizhikin Signed-off-by: Jon Mason --- meta-arm/recipes-security/optee/optee-client.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm/recipes-security/optee/optee-client.inc b/meta-arm/recipes-security/optee/optee-client.inc index 77f6a642..ddda2d1a 100644 --- a/meta-arm/recipes-security/optee/optee-client.inc +++ b/meta-arm/recipes-security/optee/optee-client.inc @@ -24,8 +24,8 @@ EXTRA_OECMAKE = " \ EXTRA_OECMAKE:append:toolchain-clang = " -DCFG_WERROR=0" do_install:append() { - 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 + 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 sed -i -e s:@sysconfdir@:${sysconfdir}:g \ -e s:@sbindir@:${sbindir}:g \