Skip to content

Commit 5204281

Browse files
committed
fix(cargo-optee): correct README language and add metadata for Cargo.toml
1 parent b939198 commit 5204281

File tree

6 files changed

+36
-20
lines changed

6 files changed

+36
-20
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ The Docker image automates the entire setup process for TrustZone emulation
3535
in QEMU, enabling you to focus on writing and testing your applications
3636
efficiently, without the hassle of manual configuration.
3737

38-
**UPDATES** 我们更新了一个更加方便的工具,更好的封装让开发者更加便捷[cargo-optee](./cargo-optee/README.md), 后续我们可能会慢慢放弃makefile结合cargo的方式,使用更加rust的方式开发. 为了平稳过度,我们仍然保留的使用Makefile进行构建的相关工具组件。
38+
**UPDATES:** We have introduced a more convenient build tool, [cargo-optee](./cargo-optee/README.md),
39+
which provides better abstraction and a more ergonomic developer experience. In the long term,
40+
we plan to gradually move away from the Makefile + Cargo workflow and adopt a more idiomatic Rust-based
41+
development approach. To ensure a smooth transition, the existing Makefile-based build components are
42+
still retained and supported.
3943

4044
**Choose your development mode in Emulator:**
4145
- 🚀 [Quick Emulation And Development in Docker](docs/emulate-and-dev-in-docker.md)
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
2-
"arch": "aarch64",
3-
"data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
4-
"features": "+strict-align",
5-
"dynamic-linking": false,
6-
"executables": true,
7-
"has-rpath": true,
8-
"linker-flavor": "ld",
9-
"linker-is-gnu": true,
10-
"llvm-target": "aarch64-unknown-linux-gnu",
11-
"max-atomic-width": 128,
12-
"os": "optee",
13-
"position-independent-executables": true,
14-
"relro-level": "full",
15-
"target-c-int-width": "32",
16-
"target-endian": "little",
17-
"target-pointer-width": "64",
18-
"vendor": "unknown",
19-
"panic-strategy": "abort"
20-
}
2+
"arch": "aarch64",
3+
"data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
4+
"features": "+strict-align",
5+
"dynamic-linking": false,
6+
"executables": true,
7+
"has-rpath": true,
8+
"linker-flavor": "ld",
9+
"linker-is-gnu": true,
10+
"llvm-target": "aarch64-unknown-linux-gnu",
11+
"max-atomic-width": 128,
12+
"os": "optee",
13+
"position-independent-executables": true,
14+
"relro-level": "full",
15+
"target-c-int-width": "32",
16+
"target-endian": "little",
17+
"target-pointer-width": "64",
18+
"vendor": "unknown",
19+
"panic-strategy": "abort"
20+
}
2121

examples/mnist-rs/ta/inference/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ spin = { workspace = true }
3838
[build-dependencies]
3939
proto = { workspace = true }
4040
optee-utee-build = { workspace = true }
41+
42+
[package.metadata.optee.ta]
43+
uuid-path = "uuid.txt"

examples/mnist-rs/ta/train/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ bytemuck = { workspace = true, features = ["min_const_generics"] }
3838
[build-dependencies]
3939
proto = { workspace = true }
4040
optee-utee-build = { workspace = true }
41+
42+
[package.metadata.optee.ta]
43+
uuid-path = "uuid.txt"

examples/supp_plugin-rs/plugin/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,6 @@ lto = true
4040
[lib]
4141
crate-type = ["cdylib"]
4242
name = "syslog_plugin"
43+
44+
[package.metadata.optee.plugin]
45+
uuid-path = "../plugin_uuid.txt"

examples/supp_plugin-rs/ta/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,6 @@ optee-utee-build = { path = "../../../optee-utee-build" }
4141
panic = "abort"
4242
lto = true
4343
opt-level = 1
44+
45+
[package.metadata.optee.ta]
46+
uuid-path = "../ta_uuid.txt"

0 commit comments

Comments
 (0)