Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
sgxwallet
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董子豪
sgxwallet
Commits
e3e0f3d9
Unverified
Commit
e3e0f3d9
authored
Apr 28, 2021
by
Oleh Nikolaiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SKALE-4110 fix build base
parent
61fc39c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
42 deletions
+14
-42
install-psw-dcap-source.patch
docker/install-psw-dcap-source.patch
+7
-20
install-psw-linux-sgx.patch
docker/install-psw-linux-sgx.patch
+7
-22
No files found.
docker/install-psw-dcap-source.patch
View file @
e3e0f3d9
diff --git a/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile b/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile
index 1f3efdb..
cd8df2e
100644
index 1f3efdb..
42d7ed6
100644
--- a/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile
+++ b/tools/SGXPlatformRegistration/package/installer/common/sgx-ra-service/Makefile
@@ -42,13 +42,13 @@ RAD_CONF_DEL=$(if $(wildcard /run/systemd/system/.*),mpa_registration_tool.conf,
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/))
ifeq ($(RAD_CONF_NAME),)
-ifneq ($(shell awk -F/ '$$2 == "docker"' /proc/self/cgroup),)
-RAD_CONF_NAME=mpa_registration_tool.service
-RAD_CONF_DEL=mpa_registration.conf
-RAD_CONF_PATH=/lib/systemd/system
-else
@@ -47,7 +47,7 @@ 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!")
-endif
+ ifneq ($(shell awk -F/ '$$2 == "docker"' /proc/self/cgroup),)
+ RAD_CONF_NAME=mpa_registration_tool.service
+ RAD_CONF_DEL=mpa_registration.conf
+ RAD_CONF_PATH=/lib/systemd/system
+ else
+ @exit 0
+ endif
+@exit 0
endif
#install -d $(shell readlink -m $(DESTDIR)/$(SGX_RA_SERVICE_PACKAGE_NAME)/$(RAD_CONF_PATH))
endif
\ No newline at end of file
docker/install-psw-linux-sgx.patch
View file @
e3e0f3d9
...
...
@@ -50,29 +50,14 @@ index 042f83c..3043ad1 100755
fi
diff --git a/linux/installer/common/sgx-aesm-service/Makefile b/linux/installer/common/sgx-aesm-service/Makefile
index 89c5b21..
aa70c4b
100644
index 89c5b21..
c8a2036
100644
--- a/linux/installer/common/sgx-aesm-service/Makefile
+++ b/linux/installer/common/sgx-aesm-service/Makefile
@@ -42,14 +42,14 @@ AESMD_CONF_DEL=$(if $(wildcard /run/systemd/system/.*),aesmd.conf,$(if $(wildcar
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/))
ifeq ($(AESMD_CONF_NAME),)
-ifneq ($(shell awk -F/ '$$2 == "docker"' /proc/self/cgroup),)
-AESMD_CONF_NAME=aesmd.service
-AESMD_CONF_DEL=aesmd.conf
-AESMD_CONF_PATH=/lib/systemd/system
-$(warning "You may need to start aesmd manually after it's installed!")
-else
@@ -48,7 +48,7 @@ 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!")
-endif
+ ifneq ($(shell awk -F/ '$$2 == "docker"' /proc/self/cgroup),)
+ AESMD_CONF_NAME=aesmd.service
+ AESMD_CONF_DEL=aesmd.conf
+ AESMD_CONF_PATH=/lib/systemd/system
+ $(warning "You may need to start aesmd manually after it's installed!")
+ else
+ @exit 0
+ endif
+@exit 0
endif
endif
default:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment