Clean up aecs client for Occlum

Signed-off-by: Zheng, Qi <huaiqing.zq@antgroup.com>

Author: qzheng527

client/cpp_occlum/bom_aecs_client_gnu.yaml

@@ -1,54 +1,26 @@
 # include other bom files
 includes:
   - base.yaml
-# This excludes will only take effect when copy directories. We will exclude files or dirs with following patterns.
-excludes:
-  - .git
-  - .gitignore
 targets:
   - target: /bin
     copy:
       - from: ../build/out
         files:
-          - aecs_client_get_secret
+          - name: aecs_client_get_secret
+            autodep: false
+      # Put here to help detect the valid loader for glibc
+      # Remove it in the script after copy_bom
+      - files:
+        - /opt/occlum/toolchains/busybox/glibc/busybox
   - target: /opt/occlum/glibc/lib/
     copy:
-      - from: ../build/out
-        files:
-          - libaecs_client.so
-          - libual.so
-  - target: /opt/occlum/glibc/lib/
-    copy:
-      - from: /usr/local/occlum/x86_64-linux-gnu/lib
-        files:
-          - libcurl.so.4
-          - libcrypto.so.1.1
-          - libssl.so.1.1
-  - target: /opt/occlum/glibc/lib/
-    copy:
-      - from: /usr/lib
-        files:
-          - libprotobuf.so.32
-          - libgrpc++.so
-          - libgrpc.so
-          - libgpr.so
-          - libcares.so.2
-          - libaddress_sorting.so
-  - target: /opt/occlum/glibc/lib/
-    copy:
-      - from: /usr/lib/x86_64-linux-gnu
-        files:
-          - libz.so.1
-  - target: /opt/occlum/glibc/lib/
-    copy:
-      - from: /opt/occlum/glibc/lib
-        files:
-          - libc.so.6
-          - libpthread.so.0
-          - libdl.so.2
-          - libnss_files.so.2
-          - libnss_dns.so.2
-          - libresolv.so.2
+      - files:
+        - ../build/out/libaecs_client.so
+        - ../build/out/libual.so
+        - /usr/local/occlum/x86_64-linux-gnu/lib/libcurl.so.4
+        - /opt/occlum/glibc/lib/libnss_files.so.2
+        - /opt/occlum/glibc/lib/libnss_dns.so.2
+        - /opt/occlum/glibc/lib/libresolv.so.2
   - target: /etc/kubetee
     copy:
       - from: ../../../third_party/unified_attestation/deployment/conf/

client/cpp_occlum/occlum_aecs_client_lib/CMakeLists.txt

@@ -36,7 +36,7 @@ add_library(
 target_link_libraries(
   ${AECS_CLIENT_LIB}
   -L/usr/local/occlum/x86_64-linux-gnu/lib
-  -Wl,--start-group ${${UAL_LIBS_LINK}} -lprotobuf -lgrpc++ -lgrpc++_reflection -Wl,--end-group
+  -Wl,--start-group ${${UAL_LIBS_LINK}} -lprotobuf -lcares -laddress_sorting -lgpr -lgrpc -lgrpc++ -lgrpc++_reflection -Wl,--end-group
   -Wl,-rpath=/lib
 )
 add_dependencies(${AECS_CLIENT_LIB} ${UAL_LIBS_NAME})

client/cpp_occlum/occlum_build_prepare.sh

@@ -6,7 +6,7 @@ THISDIR="$(dirname $(readlink -f $0))"
 
 DEPSDIR="$THISDIR/deps"
 
-ALL_COMPONENTS="openssl libcurl cares protobuf grpc"
+ALL_COMPONENTS="libcurl cares protobuf grpc"
 OPENSSLDIR=openssl
 CURLDIR=curl
 PROTOBUFDIR=protobuf
@@ -115,7 +115,7 @@ libcurl_build() {
     fi
     ./configure \
       --prefix=$OCCLUMINSTALLDIR \
-      --with-ssl=$OCCLUMINSTALLDIR \
+      --with-openssl \
       --without-zlib && \
     make -j && make install
 }
@@ -170,7 +170,6 @@ grpc_build() {
     cmake ../.. \
         -DCMAKE_INSTALL_PREFIX=$INSTALLDIR \
         -DgRPC_INSTALL=ON                \
-        -DBUILD_SHARED_LIBS=TRUE         \
         -DgRPC_CARES_PROVIDER=package    \
         -DgRPC_PROTOBUF_PROVIDER=package \
         -DgRPC_SSL_PROVIDER=package      \
@@ -231,7 +230,7 @@ BUILD_COMPONENTS="${1:-$ALL_COMPONENTS}"
 
 # Download all components once here together
 mkdir -p $DEPSDIR && cd $DEPSDIR || exit 1
-TRYGET $OPENSSLDIR https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_1k.tar.gz
+# TRYGET $OPENSSLDIR https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_1k.tar.gz
 TRYGET $CURLDIR https://github.com/curl/curl/archive/curl-7_70_0.tar.gz
 #TRYGET $PROTOBUFDIR https://github.com/protocolbuffers/protobuf/releases/download/v21.6/protobuf-all-21.6.tar.gz
 #TRYGET $CARESDIR https://c-ares.haxx.se/download/c-ares-1.14.0.tar.gz

client/cpp_occlum/occlum_run_aecs_client.sh

@@ -44,6 +44,9 @@ if [ "$ACTIONS" == "all" -o "$ACTIONS" == "build" ] ; then
       --file ${THISDIR}/bom_aecs_client_${OCCLUM_LIBC}.yaml \
       --root ./image
 
+  cp /lib/x86_64-linux-gnu/libcrypt.so.1 image/opt/occlum/glibc/lib/
+  rm image/bin/busybox
+
   new_json="$(jq '.env.default += ["LD_LIBRARY_PATH=/opt/occlum/glibc/lib"]' Occlum.json)" && \
   echo "${new_json}" > Occlum.json