general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the repository of Rust SGX SDK submodule

Browse Source
This commit is contained in:
He Sun 2021-01-27 16:55:58 +08:00 committed by Zongmin.Gu
parent fdde009e5d
commit c2aefcacf0
4 changed files with 3 additions and 1305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -1,7 +1,7 @@
[submodule "deps/rust-sgx-sdk"] [submodule "deps/rust-sgx-sdk"]
path = deps/rust-sgx-sdk path = deps/rust-sgx-sdk
url = https://github.com/apache/incubator-teaclave-sgx-sdk url = https://github.com/occlum/incubator-teaclave-sgx-sdk.git
branch = master branch = sgx_2.11_for_occlum
[submodule "deps/xmas-elf"] [submodule "deps/xmas-elf"]
path = deps/xmas-elf path = deps/xmas-elf
url = https://github.com/occlum/xmas-elf url = https://github.com/occlum/xmas-elf

1
Makefile
View File

@ -33,7 +33,6 @@ submodule: githooks
git submodule init git submodule init
git submodule update $(OCCLUM_GIT_OPTIONS) git submodule update $(OCCLUM_GIT_OPTIONS)
@# Try to apply the patches. If failed, check if the patches are already applied @# Try to apply the patches. If failed, check if the patches are already applied
cd deps/rust-sgx-sdk && git apply ../rust-sgx-sdk.patch >/dev/null 2>&1 || git apply ../rust-sgx-sdk.patch -R --check
cd deps/serde-json-sgx && git apply ../serde-json-sgx.patch >/dev/null 2>&1 || git apply ../serde-json-sgx.patch -R --check cd deps/serde-json-sgx && git apply ../serde-json-sgx.patch >/dev/null 2>&1 || git apply ../serde-json-sgx.patch -R --check
cd deps/ringbuf && git apply ../ringbuf.patch >/dev/null 2>&1 || git apply ../ringbuf.patch -R --check cd deps/ringbuf && git apply ../ringbuf.patch >/dev/null 2>&1 || git apply ../ringbuf.patch -R --check

2
deps/rust-sgx-sdk vendored

@ -1 +1 @@
Subproject commit 4fdac94b9f002f432d4a10e5de80c56d3f7a10eb Subproject commit 77c1d48ca310b1029b672dfc8903666292288632

1301
deps/rust-sgx-sdk.patch vendored
View File

File diff suppressed because it is too large Load Diff