rebuild sgxsdk install package

(cherry picked from commit 39adc50b68c8873195ecad7e1d20f70a50a2905a)

linux-sgx.spec

@@ -1,6 +1,6 @@
 Name:           linux-sgx
 Version:        2.11.100
-Release:        9
+Release:        10
 Summary:        Intel(R) Software Guard Extensions for Linux* OS
 ExclusiveArch:	x86_64
 License:        BSD-3-Clause
@@ -29,7 +29,7 @@ developers seeking to protect select code and data from disclosure or modificati
 
 %package -n sgxsdk
 Summary:        Development files for linux sgx
-Requires:       glibc tar make
+Requires:       glibc tar
 Provides:       libsgx_urts_sim.so()(64bit)
 %description -n sgxsdk
 Development files for linux sgx
@@ -284,6 +284,11 @@ make -j2 psw
 %define LINUX_INSTALLER_COMMON_DIR linux/installer/common
 %define LINUX_INSTALLER_RPM_DIR linux/installer/rpm
 
+source ./%{LINUX_INSTALLER_COMMON_DIR}/sdk/installConfig.x64
+%{LINUX_INSTALLER_COMMON_DIR}/sdk/createTarball.sh
+mkdir -p %{LINUX_INSTALLER_RPM_DIR}/sdk/build
+tar -xvf %{LINUX_INSTALLER_COMMON_DIR}/sdk/output/${TARBALL_NAME} -C %{LINUX_INSTALLER_RPM_DIR}/sdk/build
+
 source ./%{DCAP_LINUX_INSTALLER_COMMON_DIR}/libsgx-ae-qe3/installConfig
 %{DCAP_LINUX_INSTALLER_COMMON_DIR}/libsgx-ae-qe3/createTarball.sh
 mkdir -p %{DCAP_LINUX_INSTALLER_RPM_DIR}/libsgx-ae-qe3/build
@@ -396,6 +401,23 @@ mkdir -p %{TOOLS_INSTALLER_RPM_DIR}/sgx-ra-service/build
 tar -xvf %{TOOLS_INSTALLER_COMMON_DIR}/sgx-ra-service/output/${TARBALL_NAME} -C %{TOOLS_INSTALLER_RPM_DIR}/sgx-ra-service/build
 
 %install
+pushd %{LINUX_INSTALLER_RPM_DIR}/sdk/build
+mkdir %{?buildroot}/sdk-dir/
+make DESTDIR=%{?buildroot}/sdk-dir/ install
+install -d %{?buildroot}/sdk-dir%{_docdir}/sgxsdk
+popd
+cp ./sgxsdk/environment %{?buildroot}/sdk-dir/opt/intel/sgxsdk
+sed -i 's/^.*export SGX_SDK.*$/export SGX_SDK=\/opt\/intel\/sgxsdk/g' %{?buildroot}/sdk-dir/opt/intel/sgxsdk/environment
+find %{LINUX_INSTALLER_RPM_DIR}/sdk/build/package/licenses/ -type f -print0 | xargs -0 -n1 cat >> %{?buildroot}/sdk-dir%{_docdir}/sgxsdk/COPYING
+echo "/opt/intel/sgxsdk" > %{LINUX_INSTALLER_RPM_DIR}/sdk/build/list-sgxsdk
+find %{?buildroot}/sdk-dir | sort | \
+awk '$0 !~ last "/" {print last} {last=$0} END {print last}' | \
+sed -e "s#^%{?buildroot}/sdk-dir##" | \
+grep -v "^/opt/intel/sgxsdk" >> %{LINUX_INSTALLER_RPM_DIR}/sdk/build/list-sgxsdk || :
+cp -r %{?buildroot}/sdk-dir/* %{?buildroot}/
+rm -rf %{?buildroot}/sdk-dir/
+rm -rf %{?buildroot}/opt/intel/sgxsdk/SampleCode
+
 pushd %{DCAP_LINUX_INSTALLER_RPM_DIR}/libsgx-ae-qe3/build
 mkdir -p %{?buildroot}/libsgx-ae-qe3-dir/
 make DESTDIR=%{?buildroot}/libsgx-ae-qe3-dir/ install
@@ -686,16 +708,11 @@ sed -i 's#^/etc/rad.conf#%config &#' %{TOOLS_INSTALLER_RPM_DIR}/sgx-ra-service/b
 cp -r %{?buildroot}/sgx-ra-service-dir/* %{?buildroot}/
 rm -rf %{?buildroot}/sgx-ra-service-dir/
 
-install -D ./linux/installer/bin/sgx_linux_x64_sdk_2.11.100.2.bin $RPM_BUILD_ROOT/opt/sgx_linux_x64_sdk_2.11.100.2.bin
 
 
 
 %pre
 
-%post -n sgxsdk
-/opt/sgx_linux_x64_sdk_2.11.100.2.bin -prefix=/opt/intel/
-source /opt/intel/sgxsdk/environment
-
 %post -n sgx-aesm-service
 if [ -x /opt/intel/sgx-aesm-service/startup.sh ]; then /opt/intel/sgx-aesm-service/startup.sh; fi
 
@@ -803,9 +820,6 @@ rm -f /var/log/mpa_registration.log
 
 echo -e "Uninstallation succeed!"
 
-%postun -n sgxsdk
-rm -rf /opt/intel/sgxsdk
-
 %postun -n sgx-pck-id-retrieval-tool
 # Removing SGX_PCK_ID_RETRIEVE_TOOL soft link file
 rm -f /usr/local/bin/PCKIDRetrievalTool
@@ -830,8 +844,7 @@ if [ -d /opt/intel/sgx-dcap-pccs ]; then
 fi
 
 
-%files -n sgxsdk
+%files -n sgxsdk -f %{LINUX_INSTALLER_RPM_DIR}/sdk/build/list-sgxsdk
-/opt/sgx_linux_x64_sdk_2.11.100.2.bin
 
 %files -n libsgx-ae-qe3 -f %{DCAP_LINUX_INSTALLER_RPM_DIR}/libsgx-ae-qe3/build/list-libsgx-ae-qe3
 
@@ -906,6 +919,9 @@ fi
 %files -n sgx-ra-service -f %{TOOLS_INSTALLER_RPM_DIR}/sgx-ra-service/build/list-sgx-ra-service
 
 %changelog
+* Wed Sep 8 2021 wangcheng <wangcheng156@huawei.com> - 2.11.100-10
+- rebuild sgxsdk install package
+
 * Mon Jul 19 2021 chenmaodong <chenmaodong@huawei.com> - 2.11.100-9
 - add glibc as requires for sgx-aesm-service