Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[no-std branch] Further cleanups to allow mixed rust examples builds #117

Merged
merged 4 commits into from
Jan 10, 2024

Conversation

b49020
Copy link
Contributor

@b49020 b49020 commented Jan 8, 2024

Extend Makefile infrastructure to support different combinations for host and TA rust targets. Following environment variables are added:

  • TARGET_HOST
  • TARGET_TA
  • CROSS_COMPILE_HOST
  • CROSS_COMPILE_TA

TARGET is standardized rust environment variable to provide full target
triplet, so use that to distinguish rather than custom ARCH which will
be dropped in a future patch.

Signed-off-by: Sumit Garg <[email protected]>
@b49020
Copy link
Contributor Author

b49020 commented Jan 8, 2024

@DemesneGH Fyi..

b49020 added 3 commits January 9, 2024 10:33
Extend Makefile infrastructure to support different combinations for
host and TA rust targets. Following environment variables are added:
- TARGET_HOST
- TARGET_TA
- CROSS_COMPILE_HOST
- CROSS_COMPILE_TA

Signed-off-by: Sumit Garg <[email protected]>
After this change, install directory looks like:

out/
├── lib
│   └── optee_armtz
│       ├── 057f4b66-bdab-11eb-96cf-33d6e41cc849.ta
│       ├── 0864c8ec-bdab-11eb-8926-c7fa47a8c92d.ta
│       ├── 0a5a06b2-bdab-11eb-add0-77f29de31296.ta
│       ├── 0bef16a2-bdab-11eb-94be-6f9815f37c21.ta
│       ├── 0e6bf4fe-bdab-11eb-9bc5-3f4ecb50aee7.ta
│       ├── 10de87e2-bdab-11eb-b73c-63fec73e597c.ta
│       ├── 133af0ca-bdab-11eb-9130-43bf7873bf67.ta
│       ├── 1585d412-bdab-11eb-ba91-3b085fd2601f.ta
│       ├── 197c710c-bdab-11eb-8f3f-17a5f698d23b.ta
│       ├── 1cd6d392-bdab-11eb-9082-abc902ac5cd4.ta
│       ├── 21b1a1da-bdab-11eb-b614-275a7098826f.ta
│       ├── 255fc838-de89-42d3-9a8e-d044c50fa57c.ta
│       └── c7e478c2-89b3-46eb-ac19-571e66c3830d.ta
└── usr
    ├── bin
    │   ├── acipher-rs
    │   ├── aes-rs
    │   ├── authentication-rs
    │   ├── big_int-rs
    │   ├── diffie_hellman-rs
    │   ├── digest-rs
    │   ├── hello_world-rs
    │   ├── hotp-rs
    │   ├── random-rs
    │   ├── secure_storage-rs
    │   ├── signature_verification-rs
    │   ├── supp_plugin-rs
    │   └── time-rs
    └── lib
        └── tee-supplicant
            └── plugins
                └── ef620757-fa2b-4f19-a1c4-6e51cfe4c0f9.plugin.so

Signed-off-by: Sumit Garg <[email protected]>
@b49020
Copy link
Contributor Author

b49020 commented Jan 9, 2024

@DemesneGH Can you trigger the CI?

@DemesneGH DemesneGH merged commit 3e58869 into apache:no-std Jan 10, 2024
4 checks passed
@DemesneGH
Copy link
Contributor

merged, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants