From fbb2c0f772f39a3c710f2e88538310843d1cb553 Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Fri, 6 Feb 2026 19:00:11 +0100 Subject: [PATCH] arm/arm-bsp: optee-examples: drop patch included in 4.9.0 This fixes a build error due to: patching file Makefile Hunk #1 FAILED at 12. 1 out of 1 hunk FAILED -- rejects in file Makefile Patch 0001-Makefile-Avoid-variable-override.patch can be reverse-applied Signed-off-by: Jan Luebbe Signed-off-by: Jon Mason --- .../recipes-security/optee/optee-examples.inc | 1 - ...001-Makefile-Avoid-variable-override.patch | 32 ------------------- 2 files changed, 33 deletions(-) delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Avoid-variable-override.patch diff --git a/meta-arm/recipes-security/optee/optee-examples.inc b/meta-arm/recipes-security/optee/optee-examples.inc index 6cd14920..b874127f 100644 --- a/meta-arm/recipes-security/optee/optee-examples.inc +++ b/meta-arm/recipes-security/optee/optee-examples.inc @@ -12,7 +12,6 @@ inherit python3native require optee.inc SRC_URI = "git://github.com/linaro-swg/optee_examples.git;protocol=https;${OPTEE_SRC_URI_BRANCH_OR_TAG} \ - file://0001-Makefile-Avoid-variable-override.patch \ " EXTRA_OEMAKE = "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ diff --git a/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Avoid-variable-override.patch b/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Avoid-variable-override.patch deleted file mode 100644 index 170fe461..00000000 --- a/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Avoid-variable-override.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ad981dad843712c21a01f61461fd5cd34f147b4a Mon Sep 17 00:00:00 2001 -From: Vyacheslav Yurkov -Date: Thu, 9 Oct 2025 08:30:52 +0000 -Subject: [PATCH] Makefile: Avoid variable override - -When CROSS_COMPILE is set in the environment / command line, we should -not directly pass it to the subshell, otherwise it's evaluated to an -empty string. - -Signed-off-by: Vyacheslav Yurkov -Acked-by: Jerome Forissier -Acked-by: Mikko Rapeli mikko.rapeli@linaro.org - -Upstream-Status: Backport -[https://github.com/linaro-swg/optee_examples/commit/bbaca7ef34c82c052c6e1470cf379561952fc995] ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 9359d95..4256139 100644 ---- a/Makefile -+++ b/Makefile -@@ -12,7 +12,7 @@ clean: examples-clean prepare-for-rootfs-clean - - examples: - @for example in $(EXAMPLE_LIST); do \ -- $(MAKE) -C $$example CROSS_COMPILE="$(HOST_CROSS_COMPILE)" || exit 1; \ -+ $(MAKE) -C $$example || exit 1; \ - done - - examples-clean: