diff --git a/isar-patches/0001-meta-optee-client-Generalize-and-update-shutdown-rul.patch b/isar-patches/0001-meta-optee-client-Generalize-and-update-shutdown-rul.patch deleted file mode 100644 index 00aa5a662..000000000 --- a/isar-patches/0001-meta-optee-client-Generalize-and-update-shutdown-rul.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2dde60388814aa09d85714375a06ef1e0688f16d Mon Sep 17 00:00:00 2001 -From: Jan Kiszka -Date: Wed, 11 Oct 2023 16:04:53 +0200 -Subject: [PATCH] meta: optee-client: Generalize and update shutdown rule - -First, naming changed somewhere between kernel 5.10 and 6.1 so that -optee-ta-bc50d971... is now optee-ta-supp-bc50d971... - -And then we should account for possibly more devices that need to be -unbound. Use POSIX-compliant shell code for this. - -The generic loop allows to drop the explicit unmounting of efivarfs -because the corresponding driver will already get unbound. - -Signed-off-by: Jan Kiszka ---- - .../optee-client/files/debian/tee-supplicant.service | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meta/recipes-bsp/optee-client/files/debian/tee-supplicant.service b/meta/recipes-bsp/optee-client/files/debian/tee-supplicant.service -index cc92a5fd..d8b630a4 100644 ---- a/meta/recipes-bsp/optee-client/files/debian/tee-supplicant.service -+++ b/meta/recipes-bsp/optee-client/files/debian/tee-supplicant.service -@@ -13,8 +13,7 @@ Type=oneshot - RemainAfterExit=yes - # Start if not already started by the initramfs hook - ExecStart=/bin/sh -c '/usr/bin/pgrep tee-supplicant >/dev/null || /usr/sbin/tee-supplicant -d' --ExecStop=/bin/sh -c '/usr/bin/findmnt /sys/firmware/efi/efivars >/dev/null && /usr/bin/umount /sys/firmware/efi/efivars || true' --ExecStop=/bin/sh -c 'echo -n optee-ta-bc50d971-d4c9-42c4-82cb-343fb7f37896 > /sys/bus/tee/drivers/optee-ftpm/unbind || true' -+ExecStop=/bin/sh -c 'for dev in /sys/bus/tee/devices/*; do case "$dev" in *optee-ta-*) basename "$dev" > "$dev"/driver/unbind;; esac done' - ExecStop=/usr/bin/pkill tee-supplicant - - [Install] --- -2.35.3 - diff --git a/isar-patches/0001-optee-client-Fix-native-arm64-build.patch b/isar-patches/0001-optee-client-Fix-native-arm64-build.patch deleted file mode 100644 index 3a671428c..000000000 --- a/isar-patches/0001-optee-client-Fix-native-arm64-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fce7e3667affe5fce82381baeb473dd7342bf00d Mon Sep 17 00:00:00 2001 -From: Jan Kiszka -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 ---- - 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 index c49a06cd8..2a56429f6 100644 --- a/kas/iot2050.yml +++ b/kas/iot2050.yml @@ -27,15 +27,11 @@ repos: isar: url: https://github.com/ilbers/isar - commit: 6b6c74411074e3d3a08f044e681c3f1216727b6e + commit: 83644ddf694e51f11793e6107e4aaf68dc0043a5 layers: meta: patches: 01: - path: isar-patches/0001-optee-client-Fix-native-arm64-build.patch - 02: - path: isar-patches/0001-meta-optee-client-Generalize-and-update-shutdown-rul.patch - 03: path: isar-patches/0001-dpkg-source-Drop-I-filter.patch cip-core: