From 59cffeb4ce3e7783090773ebfe7a6b4249a15ffc Mon Sep 17 00:00:00 2001 From: xuraoqing Date: Thu, 13 Mar 2025 14:23:14 +0800 Subject: [PATCH] cargo config.toml generation move to prep stage Signed-off-by: xuraoqing --- secGear.spec | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/secGear.spec b/secGear.spec index 6459faa..152f8c0 100644 --- a/secGear.spec +++ b/secGear.spec @@ -1,6 +1,6 @@ Name: secGear Version: 0.1.0 -Release: 58 +Release: 59 Summary: secGear is an SDK to develop confidential computing apps based on hardware enclave features @@ -187,12 +187,31 @@ The %{name}-ra_tls-devel contains Header file for using RA_TLS %ifnarch x86_64 cd %{_builddir}/%{name}/service/attestation/attestation-agent/ tar xf %{SOURCE1} + +mkdir -p .cargo +touch .cargo/config.toml +cat << EOF >> ./.cargo/config.toml +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" +EOF + cd %{_builddir}/%{name}/service/attestation/attestation-service/ tar xf %{SOURCE1} +mkdir -p .cargo +cp %{_builddir}/%{name}/service/attestation/attestation-agent/.cargo/config.toml .cargo/ + cd %{_builddir}/%{name}/service/attestation/attestation-client/ tar xf %{SOURCE1} +mkdir -p .cargo/ +cp %{_builddir}/%{name}/service/attestation/attestation-agent/.cargo/config.toml .cargo/ + cd %{_builddir}/%{name}/service/attestation/attestation-types/ tar xf %{SOURCE1} +mkdir -p .cargo/ +cp %{_builddir}/%{name}/service/attestation/attestation-agent/.cargo/config.toml .cargo/ %endif %build @@ -206,28 +225,11 @@ cmake -DCMAKE_BUILD_TYPE=Debug -DENCLAVE=GP make cd %{_builddir}/%{name}/service/attestation/attestation-agent/ -mkdir -p .cargo -touch .cargo/config.toml -cat << EOF >> ./.cargo/config.toml -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" -EOF - %{_cargo} build --features virtcca-attester --bins --release -mkdir -p %{_builddir}/%{name}/service/attestation/attestation-service/.cargo/ -cp %{_builddir}/%{name}/service/attestation/attestation-agent/.cargo/config.toml %{_builddir}/%{name}/service/attestation/attestation-service/.cargo/ cd %{_builddir}/%{name}/service/attestation/attestation-service/ %{_cargo} build --bins --release -mkdir -p %{_builddir}/%{name}/service/attestation/attestation-client/.cargo/ -cp %{_builddir}/%{name}/service/attestation/attestation-agent/.cargo/config.toml %{_builddir}/%{name}/service/attestation/attestation-client/.cargo/ cd %{_builddir}/%{name}/service/attestation/attestation-client/ %{_cargo} build --bins --release -mkdir -p %{_builddir}/%{name}/service/attestation/attestation-types/.cargo/ -cp %{_builddir}/%{name}/service/attestation/attestation-agent/.cargo/config.toml %{_builddir}/%{name}/service/attestation/attestation-types/.cargo/ - %endif %install @@ -351,6 +353,9 @@ popd systemctl restart rsyslog %changelog +* Thu Mar 13 2025 xuraoqing - 0.1.0-59 +- cargo config.toml generation move to prep stage + * Tue Mar 11 2025 houmingyong - 0.1.0-58 - fix ra_tls verify failed while use evidence -- Gitee