From 6dda6cf98de9daa9658279baea25ecf48dc3ae1b Mon Sep 17 00:00:00 2001 From: zhengxiaoxiaoGitee Date: Sun, 7 Apr 2024 11:23:33 +0800 Subject: [PATCH] add COMPONENT compile marco and Correct the error in the comment --- ...ort-Correct-the-error-in-the-comment.patch | 26 +++++++++++++++++ backport-add-COMPONENT-compile-marco.patch | 29 +++++++++++++++++++ secGear.spec | 7 ++++- 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 backport-Correct-the-error-in-the-comment.patch create mode 100644 backport-add-COMPONENT-compile-marco.patch diff --git a/backport-Correct-the-error-in-the-comment.patch b/backport-Correct-the-error-in-the-comment.patch new file mode 100644 index 0000000..4af968d --- /dev/null +++ b/backport-Correct-the-error-in-the-comment.patch @@ -0,0 +1,26 @@ +From 985be3c3b4947d1a304ff9171c74ca3fe77a86bf Mon Sep 17 00:00:00 2001 +From: zhengxiaoxiaoGitee +Date: Mon, 1 Apr 2024 17:05:10 +0800 +Subject: [PATCH] Correct the error in the comment. + +Reference:https://gitee.com/openeuler/secGear/commit/985be3c3b4947d1a304ff9171c74ca3fe77a86bf +Conflict:NA +--- + inc/host_inc/status.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/inc/host_inc/status.h b/inc/host_inc/status.h +index 7a7920b..c0ff6c7 100644 +--- a/inc/host_inc/status.h ++++ b/inc/host_inc/status.h +@@ -179,7 +179,7 @@ typedef enum _enclave_result_t + CC_CLIENT_INTR = 0xFFFF4000, /* Interrupted by CFC. Broken control flow is detected. */ + CC_ERROR_TIME_NOT_SET = 0xFFFF5000, /* *< 时间未设置 */ + CC_ERROR_TIME_NEEDS_RESET = 0xFFFF5001, /* *< 时间需要重置 */ +- CC_FAIL = 0xFFFF5002, /* *< 时间需要重置 */ ++ CC_FAIL = 0xFFFF5002, /* *< 操作失败 */ + CC_ERROR_TIMER = 0xFFFF6000, + CC_ERROR_TIMER_CREATE_FAILED, + CC_ERROR_TIMER_DESTORY_FAILED, +-- +2.33.0 diff --git a/backport-add-COMPONENT-compile-marco.patch b/backport-add-COMPONENT-compile-marco.patch new file mode 100644 index 0000000..0508dd6 --- /dev/null +++ b/backport-add-COMPONENT-compile-marco.patch @@ -0,0 +1,29 @@ +From dd4281c80b3418b1654f1a23a5b69452da0ab94c Mon Sep 17 00:00:00 2001 +From: zhengxiaoxiaoGitee +Date: Mon, 1 Apr 2024 15:49:56 +0800 +Subject: [PATCH] add COMPONENT compile marco + +Reference:https://gitee.com/openeuler/secGear/commit/dd4281c80b3418b1654f1a23a5b69452da0ab94c +Conflict:NA +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 318e1ed..3ee9c48 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -103,7 +103,10 @@ if(CODEGEN) + endif() + + add_subdirectory(src) +-add_subdirectory(component) ++option(COMPONENT "default off" ON) ++if(COMPONENT) ++ add_subdirectory(component) ++endif() + + if(NOT IS_DIRECTORY ${LOCAL_ROOT_PATH}/bin) + execute_process(COMMAND mkdir ${LOCAL_ROOT_PATH}/bin) +-- +2.33.0 diff --git a/secGear.spec b/secGear.spec index a2f2530..2daf068 100644 --- a/secGear.spec +++ b/secGear.spec @@ -1,6 +1,6 @@ Name: secGear Version: 0.1.0 -Release: 46 +Release: 47 Summary: secGear is an SDK to develop confidential computing apps based on hardware enclave features @@ -83,6 +83,8 @@ Patch70: 0071-adapt-report-with-request-key.patch Patch71: backport-use-memset-instead-of-explicit_bzero.patch Patch72: backport-memset-no-optimize.patch Patch73: backport-add-codegen-compile-marco.patch +Patch74: backport-add-COMPONENT-compile-marco.patch +Patch75: backport-Correct-the-error-in-the-comment.patch BuildRequires: gcc python automake autoconf libtool BUildRequires: glibc glibc-devel cmake ocaml-dune rpm gcc-c++ compat-openssl11-libs compat-openssl11-devel @@ -214,6 +216,9 @@ popd systemctl restart rsyslog %changelog +* Sun Apr 7 2024 zhengxiaoxiao - 0.1.0-47 +- add COMPONENT compile marco and Correct the error in the commen + * Wed Mar 29 2024 zhengxiaoxiao - 0.1.0-46 - add codegen compile marco -- Gitee