From 3651527f577ea24bbb1bdcb3ef0705235a0e536e Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Mon, 7 Nov 2022 11:44:51 +0000 Subject: [PATCH] arm/trusted-services: check before applying patches At the apply ts patch stage, first check if they are patches to be applied. Because if not, this would break the apply patch stage with an error. Signed-off-by: Rui Miguel Silva Signed-off-by: Jon Mason --- .../trusted-services/ts-psa-api-test-common_git.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc b/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc index dfd47163..41cb0c08 100644 --- a/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc +++ b/meta-arm/recipes-security/trusted-services/ts-psa-api-test-common_git.inc @@ -18,11 +18,9 @@ EXTRA_OECMAKE += "\ -DPSA_ARCH_TESTS_SOURCE_DIR=${WORKDIR}/git/psatest \ " -# TS ships patches that need to be applied to psa-arch-tests +# TS check if there are patches to apply to psa-arch-tests, if so apply them apply_ts_patch() { - for p in ${S}/external/psa_arch_tests/*.patch; do - patch -p1 -d ${WORKDIR}/git/psatest < ${p} - done + find ${S}/external/psa_arch_tests -type f -name '*.patch' -exec patch -p1 -d ${WORKDIR}/git/psatest -i {} \; } do_patch[postfuncs] += "apply_ts_patch"