From 943d69584d3558027a0f976141734b0a7cbf89ca Mon Sep 17 00:00:00 2001
From: Ryan Butler <thebutlah@gmail.com>
Date: Wed, 31 Dec 2025 17:11:33 -0500
Subject: [PATCH] fix(optee): fix TA compilation on aarch64-linux hosts

---
 optee/.cargo/config.toml         | 4 ++--
 optee/secure-storage/ta/build.rs | 4 +++-
 xtask/optee/src/lib.rs           | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/optee/.cargo/config.toml b/optee/.cargo/config.toml
index e117d298..0f9768ee 100644
--- a/optee/.cargo/config.toml
+++ b/optee/.cargo/config.toml
@@ -2,8 +2,8 @@
 rustflags = "-C panic=abort"
 target = "aarch64-unknown-linux-gnu"
 
-[target.aarch64-unknown-linux-gnu]
-linker = "aarch64-unknown-linux-gnu-gcc"
+# [target.aarch64-unknown-linux-gnu]
+# linker = "aarch64-unknown-linux-gnu-gcc"
 
 [unstable]
 build-std = ["core", "alloc", "compiler_builtins"]
diff --git a/optee/secure-storage/ta/build.rs b/optee/secure-storage/ta/build.rs
index b50a5c0a..96638bb4 100644
--- a/optee/secure-storage/ta/build.rs
+++ b/optee/secure-storage/ta/build.rs
@@ -1,6 +1,8 @@
 use optee_utee_build::{Error, RustEdition, TaConfig};
 
 fn main() -> Result<(), Error> {
-    let config = TaConfig::new_default_with_cargo_env(orb_secure_storage_proto::UUID)?;
+    let config = TaConfig::new_default_with_cargo_env(
+        orb_secure_storage_proto::StorageDomain::WifiProfiles.as_uuid(),
+    )?;
     optee_utee_build::build(RustEdition::Edition2024, config)
 }
diff --git a/xtask/optee/src/lib.rs b/xtask/optee/src/lib.rs
index 8d2fd297..060a3345 100644
--- a/xtask/optee/src/lib.rs
+++ b/xtask/optee/src/lib.rs
@@ -127,7 +127,7 @@ impl BuildArgs {
         let optee_workspace = optee_workspace
             .as_deref()
             .unwrap_or_else(|| optee_manifest_dir());
-        run_cmd!(cd $optee_workspace; RUSTC_BOOTSTRAP=1 cargo build --target aarch64-unknown-linux-gnu --profile $profile -p $package)?;
+        run_cmd!(cd $optee_workspace; RUSTC_BOOTSTRAP=1 cargo build --profile $profile -p $package)?;
 
         Ok(())
     }