linux-sgx/0002-fix-building-error-for-systemd.patch

From 0125754f2706de6d7218e0e78308389e9be9fb50 Mon Sep 17 00:00:00 2001
From: c00448856 <chenmaodong@huawei.com>
Date: Mon, 21 Dec 2020 20:18:13 +0800
Subject: [PATCH] systemd

---
 .../package/installer/common/sgx-ra-service/Makefile      | 6 +++---
 .../installer/rpm/sgx-ra-service/sgx-ra-service.spec      | 4 ++--
 linux/installer/common/psw/install.sh                     | 8 ++++----
 linux/installer/common/sgx-aesm-service/Makefile          | 6 +++---
 linux/installer/common/sgx-aesm-service/cleanup.sh        | 2 +-
 linux/installer/common/sgx-aesm-service/startup.sh        | 2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/external/dcap_source/tools/SGXPlatformRegistration/package/cleanup.sh b/external/dcap_source/tools/SGXPlatformRegistration/package/cleanup.sh
index ee16324..a3ce6d9 100755
--- a/external/dcap_source/tools/SGXPlatformRegistration/package/cleanup.sh
+++ b/external/dcap_source/tools/SGXPlatformRegistration/package/cleanup.sh
@@ -38,7 +38,7 @@ if test $(id -u) -ne 0; then
     exit 1
 fi
 
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl daemon-reload
     systemctl stop mpa_registration_tool
     systemctl disable mpa_registration_tool ||:
diff --git a/external/dcap_source/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile b/external/dcap_source/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile
index 72c7557..2ca16b8 100644
--- a/external/dcap_source/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile
+++ b/external/dcap_source/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile
@@ -37,9 +37,9 @@ PACKAGES=$(notdir $(wildcard $(PACKAGE_ROOT_FOLDER)/*))
 VAR_OPT_PATH=/var/opt/sgxra
 USR_LIB_PATH=/usr/$(notdir $(shell gcc -print-multi-os-directory))/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2> /dev/null)
 
-RAD_CONF_NAME=$(if $(wildcard /run/systemd/system/.),mpa_registration_tool.service,$(if $(wildcard /etc/init/.),mpa_registration_tool.conf,))
-RAD_CONF_DEL=$(if $(wildcard /run/systemd/system/.),mpa_registration_tool.conf,$(if $(wildcard /etc/init/.),mpa_registration_tool.service,))
-RAD_CONF_PATH=$(if $(wildcard /run/systemd/system/.),$(if $(wildcard /lib/systemd/system/.),/lib/systemd/system,/usr/lib/systemd/system),$(if $(wildcard /etc/init/.),/etc/init/))
+RAD_CONF_NAME=$(if $(wildcard /run/systemd/users/.),mpa_registration_tool.service,$(if $(wildcard /etc/init/.),mpa_registration_tool.conf,))
+RAD_CONF_DEL=$(if $(wildcard /run/systemd/users/.),mpa_registration_tool.conf,$(if $(wildcard /etc/init/.),mpa_registration_tool.service,))
+RAD_CONF_PATH=$(if $(wildcard /run/systemd/users/.),$(if $(wildcard /lib/systemd/system/.),/lib/systemd/system,/usr/lib/systemd/system),$(if $(wildcard /etc/init/.),/etc/init/))
 
 ifeq ($(RAD_CONF_NAME),)
 ifneq ($(shell awk -F/ '$$2 == "docker"' /proc/self/cgroup),)
diff --git a/external/dcap_source/tools/SGXPlatformRegistration/package/startup.sh b/external/dcap_source/tools/SGXPlatformRegistration/package/startup.sh
index e596d99..21849fc 100755
--- a/external/dcap_source/tools/SGXPlatformRegistration/package/startup.sh
+++ b/external/dcap_source/tools/SGXPlatformRegistration/package/startup.sh
@@ -38,7 +38,7 @@ if test $(id -u) -ne 0; then
     exit 1
 fi
 
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl enable mpa_registration_tool
     systemctl start mpa_registration_tool
 elif [ -d /etc/init/ ]; then
diff --git a/linux/installer/common/psw/install.sh b/linux/installer/common/psw/install.sh
index 042f83c..1ab1e5b 100755
--- a/linux/installer/common/psw/install.sh
+++ b/linux/installer/common/psw/install.sh
@@ -56,7 +56,7 @@ chmod 0750 /var/opt/aesmd
 mkdir -p /var/run/aesmd
 chmod 0755 /var/run/aesmd
 
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl stop aesmd &> /dev/null || echo
     AESMD_NAME=aesmd.service
     AESMD_TEMP=$AESM_PATH/$AESMD_NAME
@@ -114,7 +114,7 @@ fi
 cp -rf $PSW_DST_PATH/udev /etc
 rm -rf $PSW_DST_PATH/udev
 
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl stop remount-dev-exec &> /dev/null || echo
     REMOUNT_DEV_EXEC_NAME=remount-dev-exec.service
     if [ -d /lib/systemd/system ]; then
@@ -168,7 +168,7 @@ fi
 $PSW_DST_PATH/cleanup.sh
 
 # Stop and disable remount-dev-exec service
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl stop remount-dev-exec
     systemctl disable remount-dev-exec
 fi
@@ -215,7 +215,7 @@ chmod +x $PSW_DST_PATH/startup.sh
 $PSW_DST_PATH/startup.sh
 
 # Enable and start remount-dev-exec service
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl enable remount-dev-exec
     systemctl start remount-dev-exec
 fi
diff --git a/linux/installer/common/sgx-aesm-service/Makefile b/linux/installer/common/sgx-aesm-service/Makefile
index 89c5b21..fd4c9b6 100644
--- a/linux/installer/common/sgx-aesm-service/Makefile
+++ b/linux/installer/common/sgx-aesm-service/Makefile
@@ -37,9 +37,9 @@ PACKAGES=$(notdir $(wildcard $(PACKAGE_ROOT_FOLDER)/*))
 VAR_OPT_PATH=/var/opt/aesmd
 USR_LIB_PATH=/usr/$(notdir $(shell gcc -print-multi-os-directory))/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2> /dev/null)
 
-AESMD_CONF_NAME=$(if $(wildcard /run/systemd/system/.*),aesmd.service,$(if $(wildcard /etc/init/.*),aesmd.conf,))
-AESMD_CONF_DEL=$(if $(wildcard /run/systemd/system/.*),aesmd.conf,$(if $(wildcard /etc/init/.*),aesmd.service,))
-AESMD_CONF_PATH=$(if $(wildcard /run/systemd/system/.*),$(if $(wildcard /lib/systemd/system/.*),/lib/systemd/system,/usr/lib/systemd/system),$(if $(wildcard /etc/init/.*),/etc/init/))
+AESMD_CONF_NAME=$(if $(wildcard /run/systemd/users/.*),aesmd.service,$(if $(wildcard /etc/init/.*),aesmd.conf,))
+AESMD_CONF_DEL=$(if $(wildcard /run/systemd/users/.*),aesmd.conf,$(if $(wildcard /etc/init/.*),aesmd.service,))
+AESMD_CONF_PATH=$(if $(wildcard /run/systemd/users/.*),$(if $(wildcard /lib/systemd/system/.*),/lib/systemd/system,/usr/lib/systemd/system),$(if $(wildcard /etc/init/.*),/etc/init/))
 
 ifeq ($(AESMD_CONF_NAME),)
 ifneq ($(shell awk -F/ '$$2 == "docker"' /proc/self/cgroup),)
diff --git a/linux/installer/common/sgx-aesm-service/cleanup.sh b/linux/installer/common/sgx-aesm-service/cleanup.sh
index 30f5fbe..95c9f7a 100755
--- a/linux/installer/common/sgx-aesm-service/cleanup.sh
+++ b/linux/installer/common/sgx-aesm-service/cleanup.sh
@@ -39,7 +39,7 @@ if test $(id -u) -ne 0; then
 fi
 
 # Kill AESM service
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl daemon-reload
     systemctl stop aesmd
     systemctl disable aesmd 2> /dev/null
diff --git a/linux/installer/common/sgx-aesm-service/startup.sh b/linux/installer/common/sgx-aesm-service/startup.sh
index e73c435..9170d7c 100755
--- a/linux/installer/common/sgx-aesm-service/startup.sh
+++ b/linux/installer/common/sgx-aesm-service/startup.sh
@@ -44,7 +44,7 @@ id -u aesmd &> /dev/null || \
     -d /var/opt/aesmd -s /sbin/nologin aesmd
 
 # Start the AESMD service
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl enable aesmd
     systemctl start aesmd
 elif [ -d /etc/init/ ]; then
 diff --git a/external/dcap_source/QuoteGeneration/installer/linux/common/sgx-dcap-pccs/Makefile b/external/dcap_source/QuoteGeneration/installer/linux/common/sgx-dcap-pccs/Makefile
index 06f81f5..721a516 100644
--- a/external/dcap_source/QuoteGeneration/installer/linux/common/sgx-dcap-pccs/Makefile
+++ b/external/dcap_source/QuoteGeneration/installer/linux/common/sgx-dcap-pccs/Makefile
@@ -35,7 +35,7 @@ PACKAGE_ROOT_FOLDER=pkgroot
 PACKAGES=$(notdir $(wildcard $(PACKAGE_ROOT_FOLDER)/*))
 
 PCCS_CONF=pccs.service
-PCCS_CONF_PATH=$(if $(wildcard /run/systemd/system/.),$(if $(wildcard /lib/systemd/system/.),/lib/systemd/system,/usr/lib/systemd/system),$(if $(wildcard /etc/init/.),/etc/init/))
+PCCS_CONF_PATH=$(if $(wildcard /run/systemd/users/.),$(if $(wildcard /lib/systemd/system/.),/lib/systemd/system,/usr/lib/systemd/system),$(if $(wildcard /etc/init/.),/etc/init/))
 
 ifeq ($(PCCS_CONF_PATH),)
 ifneq ($(shell awk -F/ '$$2 == "docker"' /proc/self/cgroup),)
diff --git a/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/Makefile b/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/Makefile
index fcf4b7f..538c658 100644
--- a/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/Makefile
+++ b/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/Makefile
@@ -34,9 +34,9 @@ include installConfig
 PACKAGE_ROOT_FOLDER=pkgroot
 PACKAGES=$(notdir $(wildcard $(PACKAGE_ROOT_FOLDER)/*))
 
-QGSD_CONF_NAME=$(if $(wildcard /run/systemd/system/.*),qgsd.service,$(if $(wildcard /etc/init/.*),qgsd.conf,))
-QGSD_CONF_DEL=$(if $(wildcard /run/systemd/system/.*),qgsd.conf,$(if $(wildcard /etc/init/.*),qgsd.service,))
-QGSD_CONF_PATH=$(if $(wildcard /run/systemd/system/.*),$(if $(wildcard /lib/systemd/system/.*),/lib/systemd/system,/usr/lib/systemd/system),$(if $(wildcard /etc/init/.*),/etc/init/))
+QGSD_CONF_NAME=$(if $(wildcard /run/systemd/users/.*),qgsd.service,$(if $(wildcard /etc/init/.*),qgsd.conf,))
+QGSD_CONF_DEL=$(if $(wildcard /run/systemd/users/.*),qgsd.conf,$(if $(wildcard /etc/init/.*),qgsd.service,))
+QGSD_CONF_PATH=$(if $(wildcard /run/systemd/users/.*),$(if $(wildcard /lib/systemd/system/.*),/lib/systemd/system,/usr/lib/systemd/system),$(if $(wildcard /etc/init/.*),/etc/init/))
 
 ifeq ($(QGSD_CONF_NAME),)
 ifneq ($(shell awk -F/ '$$2 == "docker"' /proc/self/cgroup),)
diff --git a/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/cleanup.sh b/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/cleanup.sh
index e0cf354..ba501a5 100755
--- a/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/cleanup.sh
+++ b/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/cleanup.sh
@@ -39,7 +39,7 @@ if test $(id -u) -ne 0; then
 fi
 
 # Kill qgsd service
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl daemon-reload
     systemctl stop qgsd
     systemctl disable qgsd 2> /dev/null
diff --git a/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/startup.sh b/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/startup.sh
index 230c666..4d09d54 100755
--- a/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/startup.sh
+++ b/external/dcap_source/QuoteGeneration/installer/linux/common/tdx-qgs/startup.sh
@@ -46,7 +46,7 @@ id -u qgsd &> /dev/null || \
 
 
 # Start the AESMD service
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl enable qgsd
     systemctl start qgsd 
 elif [ -d /etc/init/ ]; then
diff --git a/external/dcap_source/QuoteGeneration/pccs/cleanup.sh b/external/dcap_source/QuoteGeneration/pccs/cleanup.sh
index 7a9e827..aa55b84 100755
--- a/external/dcap_source/QuoteGeneration/pccs/cleanup.sh
+++ b/external/dcap_source/QuoteGeneration/pccs/cleanup.sh
@@ -43,7 +43,7 @@ rm -rf ${PCCS_HOME}/node_modules
 
 #Remove PCCS system service
 echo -n "Uninstalling PCCS service ..."
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl stop pccs || true
     systemctl disable pccs || true
     systemctl daemon-reload
diff --git a/external/dcap_source/QuoteGeneration/pccs/startup.sh b/external/dcap_source/QuoteGeneration/pccs/startup.sh
index c6e9993..86fa9a9 100755
--- a/external/dcap_source/QuoteGeneration/pccs/startup.sh
+++ b/external/dcap_source/QuoteGeneration/pccs/startup.sh
@@ -58,7 +58,7 @@ then
 fi
 #Install PCCS as system service
 echo -n "Installing PCCS service ..."
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl daemon-reload
     systemctl enable pccs
     if [ "$1" == "debian" ]; then 
diff --git a/linux/installer/common/psw-dcap/cleanup.sh b/linux/installer/common/psw-dcap/cleanup.sh
index 968d650..0e80d1b 100755
--- a/linux/installer/common/psw-dcap/cleanup.sh
+++ b/linux/installer/common/psw-dcap/cleanup.sh
@@ -39,7 +39,7 @@ if test $(id -u) -ne 0; then
 fi
 
 # Kill AESM service
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl daemon-reload
     systemctl stop aesmd
     systemctl disable aesmd 2> /dev/null
diff --git a/linux/installer/common/psw-dcap/startup.sh b/linux/installer/common/psw-dcap/startup.sh
index 0f6e99c..365373f 100755
--- a/linux/installer/common/psw-dcap/startup.sh
+++ b/linux/installer/common/psw-dcap/startup.sh
@@ -44,7 +44,7 @@ id -u aesmd &> /dev/null || \
     -d /var/opt/aesmd -s /sbin/nologin aesmd
 
 # Start the AESMD service
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl enable aesmd
     systemctl start aesmd
 elif [ -d /etc/init/ ]; then
diff --git a/linux/installer/common/psw-tdx/cleanup.sh b/linux/installer/common/psw-tdx/cleanup.sh
index cf750b1..1e3c1e5 100644
--- a/linux/installer/common/psw-tdx/cleanup.sh
+++ b/linux/installer/common/psw-tdx/cleanup.sh
@@ -39,7 +39,7 @@ if test $(id -u) -ne 0; then
 fi
 
 # Kill qgsd service
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl daemon-reload
     systemctl stop qgsd
     systemctl disable qgsd 2> /dev/null
diff --git a/linux/installer/common/psw-tdx/startup.sh b/linux/installer/common/psw-tdx/startup.sh
index 31c564c..0ab9604 100644
--- a/linux/installer/common/psw-tdx/startup.sh
+++ b/linux/installer/common/psw-tdx/startup.sh
@@ -44,7 +44,7 @@ id -u qgsd &> /dev/null || \
     -d /var/opt/qgsd -s /sbin/nologin qgsd
 
 # Start the QGSD service
-if [ -d /run/systemd/system ]; then
+if [ -d /run/systemd/users ]; then
     systemctl enable qgsd
     systemctl start qgsd
 elif [ -d /etc/init/ ]; then
-- 
2.23.0