similarity index 60%
rename from meta-arm/recipes-security/optee/optee-test/musl-workaround.patch
rename to meta-arm/recipes-security/optee/optee-test/0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch
@@ -1,3 +1,8 @@
+From ddd5ad19732c9a2a9fe236662a8d264c6b2b1a0a Mon Sep 17 00:00:00 2001
+From: Jon Mason <jon.mason@arm.com>
+Date: Sat, 15 Jul 2023 15:08:43 -0400
+Subject: [PATCH] xtest: regression_1000: remove unneeded stat.h include
+
Hack to work around musl compile error:
In file included from optee-test/3.17.0-r0/recipe-sysroot/usr/include/sys/stat.h:23,
from optee-test/3.17.0-r0/git/host/xtest/regression_1000.c:25:
@@ -7,14 +12,19 @@ Hack to work around musl compile error:
stat.h is not needed, since it is not being used in this file. So removing it.
-Upstream-Status: Pending [Not submitted to upstream yet]
+Upstream-Status: Backport [https://github.com/OP-TEE/optee_test/pull/688]
Signed-off-by: Jon Mason <jon.mason@arm.com>
+Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
+Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
+---
+ host/xtest/regression_1000.c | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/host/xtest/regression_1000.c b/host/xtest/regression_1000.c
-index 4264884..7f1baca 100644
+index cd11f933ce43..8e338e59da21 100644
--- a/host/xtest/regression_1000.c
+++ b/host/xtest/regression_1000.c
-@@ -22,7 +22,6 @@
+@@ -24,7 +24,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -1,7 +1,7 @@
require optee-test.inc
SRC_URI += " \
- file://musl-workaround.patch \
+ file://0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch \
"
SRCREV = "a286b57f1721af215ace318d5807e63f40186df6"
Patch was accepted upstream (see https://github.com/OP-TEE/optee_test/pull/688). Use the commit that was backported and specify it as so. Signed-off-by: Jon Mason <jon.mason@arm.com> --- ...on_1000-remove-unneeded-stat.h-include.patch} | 16 +++++++++++++--- .../recipes-security/optee/optee-test_3.22.0.bb | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) rename meta-arm/recipes-security/optee/optee-test/{musl-workaround.patch => 0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch} (60%)