SKALE-4110 fix build base

DockerfileBase

@@ -8,7 +8,8 @@ RUN mkdir /opt/intel
 RUN mkdir /opt/intel/sgxsdk
 RUN mkdir /opt/intel/sgxsdk/include
 
-COPY docker/install-psw.patch ./
+COPY docker/install-psw-lunix-sgx.patch ./
+COPY docker/install-psw-dcap-source.patch ./
 
 RUN    apt update && \
        apt install -yq apt-utils && \
@@ -28,9 +29,10 @@ RUN    apt update && \
 
 RUN    git clone -b sgx_2.13 --depth 1 https://github.com/intel/linux-sgx && \
        cd linux-sgx && \
-       patch -p1 -i ../install-psw.patch && \
+       patch -p1 -i ../install-psw-linux-sgx.patch && \
        make preparation && \
-       cp external/toolset/ubuntu18.04/* /usr/local/bin && \
+       cd external/dcap_source && patch -p1 -i ../../../install-psw-dcap-source.patch && \
+       cd ../../ && cp external/toolset/ubuntu18.04/* /usr/local/bin && \
        which as ld ld.gold objdump
 
 RUN    cd linux-sgx && make -s -j$(nproc) sdk_install_pkg && \

docker/install-psw-dcap-source.patch

+diff --git a/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile b/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile
+index 1f3efdb..07ede24 100644
+--- a/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile
++++ b/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile
+@@ -47,7 +47,8 @@ RAD_CONF_NAME=mpa_registration_tool.service
+ RAD_CONF_DEL=mpa_registration.conf
+ RAD_CONF_PATH=/lib/systemd/system
+ else
+-$(error "Unsupported platform - neither systemctl nor initctl is found!")
++# $(error "Unsupported platform - neither systemctl nor initctl is found!")
++exit 0
+ endif
+ endif

docker/install-psw-linux-sgx.patch

+diff --git a/linux/installer/bin/install-sgx-psw.bin.tmpl b/linux/installer/bin/install-sgx-psw.bin.tmpl
+index 7d19987..7386ce7 100755
+--- a/linux/installer/bin/install-sgx-psw.bin.tmpl
++++ b/linux/installer/bin/install-sgx-psw.bin.tmpl
+@@ -30,33 +30,10 @@
+ #
+ #
+ 
+-grep 'sgx\.ko$\|intel_sgx\.ko$' /lib/modules/$(uname -r)/modules.builtin &> /dev/null
+-if [[ $? != "0" ]]; then
+-    /sbin/modinfo isgx &> /dev/null
+-    if [[ $? != "0" ]]; then
+-        /sbin/modinfo intel_sgx &> /dev/null
+-        if [[ $? != "0" ]]; then
+-            /sbin/lsmod 2> /dev/null | grep 'isgx\|intel_sgx'
+-            if [[ $? = "0" ]]; then
+-                echo "Warning: You did not follow the document to install the driver package."
+-                echo
+-            elif [[ ! -e /dev/isgx ]] && [[ ! -e /dev/sgx ]]; then
+-                echo -e "\033[31;49;1mWarning: You may need to activate the SGX module if SGX is enabled in the kernel (e.g., sudo modprobe sgx) or download and install the SGX driver if the kernel doesn't have SGX support.\033[39;49;0m"
+-                echo
+-            fi
+-        fi
+-    fi
+-fi
+-
+ set -e
+ 
+ PKG_NAME="Intel SGX PSW Package"
+ 
+-if test $(id -u) -ne 0; then
+-    echo "Root privilege is required to install $PKG_NAME."
+-    exit 4
+-fi
+-
+ 
+ PKG_ARCH=@arch@
+ ARCH=$(uname -m)
+diff --git a/linux/installer/common/psw/install.sh b/linux/installer/common/psw/install.sh
+index 042f83c..3043ad1 100755
+--- a/linux/installer/common/psw/install.sh
++++ b/linux/installer/common/psw/install.sh
+@@ -106,7 +106,7 @@ else
+         echo "Warning: No systemctl/initctl to start AESM. You may start AESM manually, e.g., /opt/intel/sgxpsw/aesm/aesm_service --no-daemon"
+     else
+         echo "Error: Unsupported platform - neither systemctl nor initctl is found."
+-        exit 5
++        retval=0
+     fi
+ fi
+ 
+diff --git a/linux/installer/common/sgx-aesm-service/Makefile b/linux/installer/common/sgx-aesm-service/Makefile
+index 89c5b21..2b4eb8f 100644
+--- a/linux/installer/common/sgx-aesm-service/Makefile
++++ b/linux/installer/common/sgx-aesm-service/Makefile
+@@ -48,7 +48,8 @@ AESMD_CONF_DEL=aesmd.conf
+ AESMD_CONF_PATH=/lib/systemd/system
+ $(warning "You may need to start aesmd manually after it's installed!")
+ else
+-$(error "Unsupported platform - neither systemctl nor initctl is found!")
++# $(error "Unsupported platform - neither systemctl nor initctl is found!")
++exit 0
+ endif
+ endif