Fix native build of optee-client

This allows to build images natively on arm64 hosts again by fixing an issue in optee-client via Isar. See also #482. Signed-off-by: Jan Kiszka <[email protected]>
siemens · Oct 5, 2023 · 80cfd17 · 80cfd17
1 parent 2c08293
commit 80cfd17
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/isar-patches/0001-optee-client-Fix-native-arm64-build.patch b/isar-patches/0001-optee-client-Fix-native-arm64-build.patch
@@ -0,0 +1,31 @@
+From fce7e3667affe5fce82381baeb473dd7342bf00d Mon Sep 17 00:00:00 2001
+From: Jan Kiszka <[email protected]>
+Date: Tue, 3 Oct 2023 21:42:55 +0200
+Subject: [PATCH] optee-client: Fix native arm64 build
+
+optee-client sets CROSS_COMPILE to arm-linux-gnueabihf- by default,
+causing breakages when building natively, e.g. on arm64. Fix this by
+simply setting CROSS_COMPILE unconditionally.
+
+Signed-off-by: Jan Kiszka <[email protected]>
+---
+ meta/recipes-bsp/optee-client/files/debian/rules.tmpl | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meta/recipes-bsp/optee-client/files/debian/rules.tmpl b/meta/recipes-bsp/optee-client/files/debian/rules.tmpl
+index 1b7920d0..7d1b335b 100755
+--- a/meta/recipes-bsp/optee-client/files/debian/rules.tmpl
++++ b/meta/recipes-bsp/optee-client/files/debian/rules.tmpl
+@@ -7,9 +7,7 @@
+ #
+ # SPDX-License-Identifier: MIT
+
+-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
+-endif
+
+ %:
+ 	dh $@ --exclude=.a
+-- 
+2.35.3
+
diff --git a/kas/iot2050.yml b/kas/iot2050.yml
@@ -30,6 +30,9 @@ repos:
     commit: ecc7cae423a828d294575301c1584fbe303cba3e
     layers:
       meta:
+    patches:
+      01:
+        path: isar-patches/0001-optee-client-Fix-native-arm64-build.patch
 
   cip-core:
     url: https://gitlab.com/cip-project/cip-core/isar-cip-core.git