From ffbcce92d6fbd22b2ec6f89696c3866e7f686fb4 Mon Sep 17 00:00:00 2001 From: c00448856 Date: Mon, 21 Dec 2020 07:43:39 +0800 Subject: [PATCH] fit for rpmbuild --- Makefile | 4 +-- .../QuoteGeneration/download_prebuilt.sh | 36 +++++++++---------- .../rpm/libsgx-ae-qe3/libsgx-ae-qe3.spec | 1 - .../rpm/libsgx-ae-qve/libsgx-ae-qve.spec | 1 - .../QuoteVerification/prepare_sgxssl.sh | 35 +++++++++--------- .../rpm/sgx-aesm-service/libsgx-ae-epid.spec | 1 - .../rpm/sgx-aesm-service/libsgx-ae-le.spec | 1 - .../rpm/sgx-aesm-service/libsgx-ae-pce.spec | 1 - 8 files changed, 39 insertions(+), 41 deletions(-) diff --git a/Makefile b/Makefile index 8d803d6..57e8e72 100644 --- a/Makefile +++ b/Makefile @@ -50,11 +50,11 @@ tips: preparation: # As SDK build needs to clone and patch openmp, we cannot support the mode that download the source from github as zip. # Only enable the download from git - git submodule update --init --recursive +# git submodule update --init --recursive ./external/dcap_source/QuoteVerification/prepare_sgxssl.sh nobuild cd external/openmp/openmp_code && git apply ../0001-Enable-OpenMP-in-SGX.patch >/dev/null 2>&1 || git apply ../0001-Enable-OpenMP-in-SGX.patch --check -R @# download prebuilt binaries - ./download_prebuilt.sh +# ./download_prebuilt.sh ./external/dcap_source/QuoteGeneration/download_prebuilt.sh psw: diff --git a/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/download_prebuilt.sh b/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/download_prebuilt.sh index d07649b..565ee52 100755 --- a/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/download_prebuilt.sh +++ b/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/download_prebuilt.sh @@ -38,30 +38,30 @@ server_url_path=https://download.01.org/intel-sgx/sgx-dcap/1.8/linux server_ae_url=$server_url_path/$ae_file_name server_checksum_url=$server_url_path/$checksum_file -rm -rf $out_dir/$ae_file_name -wget $server_ae_url -P $out_dir -if [ $? -ne 0 ]; then - echo "Fail to download file $server_ae_url" - exit -1 -fi +#rm -rf $out_dir/$ae_file_name +mv $ae_file_name $out_dir +#if [ $? -ne 0 ]; then +# echo "Fail to download file $server_ae_url" +# exit -1 +#fi -rm -f $out_dir/$checksum_file -wget $server_checksum_url -P $out_dir -if [ $? -ne 0 ]; then - echo "Fail to download file $server_checksum_url" - exit -1 -fi +#rm -f $out_dir/$checksum_file +#wget $server_checksum_url -P $out_dir +#if [ $? -ne 0 ]; then +# echo "Fail to download file $server_checksum_url" +# exit -1 +#fi pushd $out_dir -sha256sum -c $checksum_file -if [ $? -ne 0 ]; then - echo "Checksum verification failure" - exit -1 -fi +#sha256sum -c $checksum_file +#if [ $? -ne 0 ]; then +# echo "Checksum verification failure" +# exit -1 +#fi tar -zxf $ae_file_name rm -f $ae_file_name -rm -f $checksum_file +#rm -f $checksum_file popd diff --git a/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/installer/linux/rpm/libsgx-ae-qe3/libsgx-ae-qe3.spec b/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/installer/linux/rpm/libsgx-ae-qe3/libsgx-ae-qe3.spec index 7e24818..4955ff6 100644 --- a/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/installer/linux/rpm/libsgx-ae-qe3/libsgx-ae-qe3.spec +++ b/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/installer/linux/rpm/libsgx-ae-qe3/libsgx-ae-qe3.spec @@ -58,7 +58,6 @@ done %files -f %{_specdir}/list-%{name} -%debug_package %changelog * Mon Jul 29 2019 SGX Team diff --git a/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/installer/linux/rpm/libsgx-ae-qve/libsgx-ae-qve.spec b/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/installer/linux/rpm/libsgx-ae-qve/libsgx-ae-qve.spec index d4bb388..65aa3cb 100644 --- a/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/installer/linux/rpm/libsgx-ae-qve/libsgx-ae-qve.spec +++ b/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteGeneration/installer/linux/rpm/libsgx-ae-qve/libsgx-ae-qve.spec @@ -58,7 +58,6 @@ done %files -f %{_specdir}/list-%{name} -%debug_package %changelog * Mon Jul 29 2019 SGX Team diff --git a/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteVerification/prepare_sgxssl.sh b/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteVerification/prepare_sgxssl.sh index 214633e..0dbab9b 100755 --- a/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteVerification/prepare_sgxssl.sh +++ b/external/dcap_source/SGXDataCenterAttestationPrimitives-DCAP_1.8/QuoteVerification/prepare_sgxssl.sh @@ -46,14 +46,16 @@ sgxssl_chksum=5fb5328fdd55d643cc125dd43cbd0a1f7d74ead7948b52cf15d8533d47a0d266 openssl_chksum=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 rm -f check_sum_sgxssl.txt check_sum_openssl.txt if [ ! -f $build_script ]; then - wget $sgxssl_github_archive/$sgxssl_file_name.zip -P $sgxssl_dir/ || exit 1 - sha256sum $sgxssl_dir/$sgxssl_file_name.zip > $sgxssl_dir/check_sum_sgxssl.txt - grep $sgxssl_chksum $sgxssl_dir/check_sum_sgxssl.txt - if [ $? -ne 0 ]; then - echo "File $sgxssl_dir/$sgxssl_file_name.zip checksum failure" - rm -f $sgxssl_dir/$sgxssl_file_name.zip - exit -1 - fi +# wget $sgxssl_github_archive/$sgxssl_file_name.zip -P $sgxssl_dir/ || exit 1 + mkdir -p $sgxssl_dir/ + mv ./$sgxssl_file_name.zip $sgxssl_dir/ || exit 1 +# sha256sum $sgxssl_dir/$sgxssl_file_name.zip > $sgxssl_dir/check_sum_sgxssl.txt +# grep $sgxssl_chksum $sgxssl_dir/check_sum_sgxssl.txt +# if [ $? -ne 0 ]; then +# echo "File $sgxssl_dir/$sgxssl_file_name.zip checksum failure" +# rm -f $sgxssl_dir/$sgxssl_file_name.zip +# exit -1 +# fi unzip -qq $sgxssl_dir/$sgxssl_file_name.zip -d $sgxssl_dir/ || exit 1 mv $sgxssl_dir/intel-sgx-ssl-$sgxssl_file_name/* $sgxssl_dir/ || exit 1 rm $sgxssl_dir/$sgxssl_file_name.zip || exit 1 @@ -61,14 +63,15 @@ if [ ! -f $build_script ]; then fi if [ ! -f $openssl_out_dir/$openssl_ver_name.tar.gz ]; then - wget $full_openssl_url_old -P $openssl_out_dir || wget $full_openssl_url -P $openssl_out_dir || exit 1 - sha256sum $openssl_out_dir/$openssl_ver_name.tar.gz > $sgxssl_dir/check_sum_openssl.txt - grep $openssl_chksum $sgxssl_dir/check_sum_openssl.txt - if [ $? -ne 0 ]; then - echo "File $openssl_out_dir/$openssl_ver_name.tar.gz checksum failure" - rm -f $openssl_out_dir/$openssl_ver_name.tar.gz - exit -1 - fi +# wget $full_openssl_url_old -P $openssl_out_dir || wget $full_openssl_url -P $openssl_out_dir || exit 1 + mv ./$openssl_ver_name.tar.gz $openssl_out_dir || exit 1 +# sha256sum $openssl_out_dir/$openssl_ver_name.tar.gz > $sgxssl_dir/check_sum_openssl.txt +# grep $openssl_chksum $sgxssl_dir/check_sum_openssl.txt +# if [ $? -ne 0 ]; then +# echo "File $openssl_out_dir/$openssl_ver_name.tar.gz checksum failure" +# rm -f $openssl_out_dir/$openssl_ver_name.tar.gz +# exit -1 +# fi fi diff --git a/linux/installer/rpm/sgx-aesm-service/libsgx-ae-epid.spec b/linux/installer/rpm/sgx-aesm-service/libsgx-ae-epid.spec index e467f5c..a999311 100644 --- a/linux/installer/rpm/sgx-aesm-service/libsgx-ae-epid.spec +++ b/linux/installer/rpm/sgx-aesm-service/libsgx-ae-epid.spec @@ -66,7 +66,6 @@ rm -fr %{?buildroot}/%{name} %files -f %{_specdir}/list-%{name} -%debug_package %changelog * Mon Jul 29 2019 SGX Team diff --git a/linux/installer/rpm/sgx-aesm-service/libsgx-ae-le.spec b/linux/installer/rpm/sgx-aesm-service/libsgx-ae-le.spec index 6517977..4421b63 100644 --- a/linux/installer/rpm/sgx-aesm-service/libsgx-ae-le.spec +++ b/linux/installer/rpm/sgx-aesm-service/libsgx-ae-le.spec @@ -66,7 +66,6 @@ rm -fr %{?buildroot}/%{name} %files -f %{_specdir}/list-%{name} -%debug_package %changelog * Mon Jul 29 2019 SGX Team diff --git a/linux/installer/rpm/sgx-aesm-service/libsgx-ae-pce.spec b/linux/installer/rpm/sgx-aesm-service/libsgx-ae-pce.spec index a7ba0e4..9269552 100644 --- a/linux/installer/rpm/sgx-aesm-service/libsgx-ae-pce.spec +++ b/linux/installer/rpm/sgx-aesm-service/libsgx-ae-pce.spec @@ -65,7 +65,6 @@ rm -fr %{?buildroot}/%{name} %files -f %{_specdir}/list-%{name} -%debug_package %changelog * Mon Jul 29 2019 SGX Team -- 2.23.0