This is an automated email from the ASF dual-hosted git repository. yuanz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
commit 8c28e578bc2795f8b39b3ceba3aaeee4de922890 Author: Yuan Zhuang <[email protected]> AuthorDate: Tue Jul 9 09:36:04 2024 +0000 examples/*/ta/Makefile: remove verbose for xargo --- examples/acipher-rs/ta/Makefile | 8 +++----- examples/aes-rs/ta/Makefile | 8 +++----- examples/authentication-rs/ta/Makefile | 8 +++----- examples/big_int-rs/ta/Makefile | 8 +++----- examples/diffie_hellman-rs/ta/Makefile | 8 +++----- examples/digest-rs/ta/Makefile | 8 +++----- examples/error_handling-rs/ta/Makefile | 8 +++----- examples/hello_world-rs/ta/Makefile | 8 +++----- examples/hotp-rs/ta/Makefile | 8 +++----- examples/random-rs/ta/Makefile | 8 +++----- examples/secure_storage-rs/ta/Makefile | 8 +++----- examples/signature_verification-rs/ta/Makefile | 8 +++----- examples/supp_plugin-rs/ta/Makefile | 8 +++----- examples/time-rs/ta/Makefile | 8 +++----- 14 files changed, 42 insertions(+), 70 deletions(-) diff --git a/examples/acipher-rs/ta/Makefile b/examples/acipher-rs/ta/Makefile index 1c6a277..5dab9d4 100644 --- a/examples/acipher-rs/ta/Makefile +++ b/examples/acipher-rs/ta/Makefile @@ -26,14 +26,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/aes-rs/ta/Makefile b/examples/aes-rs/ta/Makefile index a1c3406..78ed7c8 100644 --- a/examples/aes-rs/ta/Makefile +++ b/examples/aes-rs/ta/Makefile @@ -27,14 +27,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/authentication-rs/ta/Makefile b/examples/authentication-rs/ta/Makefile index a1c3406..78ed7c8 100644 --- a/examples/authentication-rs/ta/Makefile +++ b/examples/authentication-rs/ta/Makefile @@ -27,14 +27,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/big_int-rs/ta/Makefile b/examples/big_int-rs/ta/Makefile index a1c3406..78ed7c8 100644 --- a/examples/big_int-rs/ta/Makefile +++ b/examples/big_int-rs/ta/Makefile @@ -27,14 +27,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/diffie_hellman-rs/ta/Makefile b/examples/diffie_hellman-rs/ta/Makefile index 1c6a277..5dab9d4 100644 --- a/examples/diffie_hellman-rs/ta/Makefile +++ b/examples/diffie_hellman-rs/ta/Makefile @@ -26,14 +26,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/digest-rs/ta/Makefile b/examples/digest-rs/ta/Makefile index 1c6a277..5dab9d4 100644 --- a/examples/digest-rs/ta/Makefile +++ b/examples/digest-rs/ta/Makefile @@ -26,14 +26,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/error_handling-rs/ta/Makefile b/examples/error_handling-rs/ta/Makefile index a1c3406..78ed7c8 100644 --- a/examples/error_handling-rs/ta/Makefile +++ b/examples/error_handling-rs/ta/Makefile @@ -27,14 +27,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/hello_world-rs/ta/Makefile b/examples/hello_world-rs/ta/Makefile index 1c6a277..5dab9d4 100644 --- a/examples/hello_world-rs/ta/Makefile +++ b/examples/hello_world-rs/ta/Makefile @@ -26,14 +26,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/hotp-rs/ta/Makefile b/examples/hotp-rs/ta/Makefile index 1c6a277..5dab9d4 100644 --- a/examples/hotp-rs/ta/Makefile +++ b/examples/hotp-rs/ta/Makefile @@ -26,14 +26,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/random-rs/ta/Makefile b/examples/random-rs/ta/Makefile index 1c6a277..5dab9d4 100644 --- a/examples/random-rs/ta/Makefile +++ b/examples/random-rs/ta/Makefile @@ -26,14 +26,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/secure_storage-rs/ta/Makefile b/examples/secure_storage-rs/ta/Makefile index 1c6a277..5dab9d4 100644 --- a/examples/secure_storage-rs/ta/Makefile +++ b/examples/secure_storage-rs/ta/Makefile @@ -26,14 +26,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/signature_verification-rs/ta/Makefile b/examples/signature_verification-rs/ta/Makefile index a1c3406..78ed7c8 100644 --- a/examples/signature_verification-rs/ta/Makefile +++ b/examples/signature_verification-rs/ta/Makefile @@ -27,14 +27,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/supp_plugin-rs/ta/Makefile b/examples/supp_plugin-rs/ta/Makefile index 92b3fa7..b006c00 100644 --- a/examples/supp_plugin-rs/ta/Makefile +++ b/examples/supp_plugin-rs/ta/Makefile @@ -26,14 +26,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta diff --git a/examples/time-rs/ta/Makefile b/examples/time-rs/ta/Makefile index 1c6a277..5dab9d4 100644 --- a/examples/time-rs/ta/Makefile +++ b/examples/time-rs/ta/Makefile @@ -26,14 +26,12 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release +BUILDER = $(if $(STD),xargo,cargo) + all: ta strip sign ta: - @if [ $(STD) ]; then\ - xargo build --target $(TARGET_TA) --release --config $(LINKER_CFG) --verbose;\ - else\ - cargo build --target $(TARGET_TA) --release --config $(LINKER_CFG);\ - fi + @$(BUILDER) build --target $(TARGET_TA) --release --config $(LINKER_CFG) strip: ta @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
