From cb1b1a8712d5f6ed362417dc224db02a8a263972 Mon Sep 17 00:00:00 2001 From: Denis Date: Fri, 15 Mar 2024 19:12:03 +0400 Subject: [PATCH] Try jammy again --- docker/deb.Dockerfile | 2 +- sgxvm/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/deb.Dockerfile b/docker/deb.Dockerfile index 6892bdc4..aa0437cf 100644 --- a/docker/deb.Dockerfile +++ b/docker/deb.Dockerfile @@ -1,5 +1,5 @@ ############ Install Intel SGX SDK & SGX PSW -FROM ghcr.io/sigmagmbh/sgx:2.23-focal-77382c8 as base +FROM ghcr.io/sigmagmbh/sgx:2.23-jammy-554238b as base RUN wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add - RUN apt-get update diff --git a/sgxvm/Makefile b/sgxvm/Makefile index 6cb7a627..f57a44f6 100644 --- a/sgxvm/Makefile +++ b/sgxvm/Makefile @@ -80,7 +80,7 @@ define compile_unsigned_enclave @$(CXX) $(CURDIR)/Enclave_t.o -o $(CURDIR)/enclave.unsigned.so $(Enclave_Security_Link_Flags) -fPIC \ -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles -L/opt/intel/sgxsdk/lib64 \ -Wl,--whole-archive -l$(Trts_Library_Name) -Wl,--no-whole-archive \ - -Wl,--start-group -lsgx_tstdc -lsgx_tcxx -lsgx_dcap_tvl -l$(Service_Library_Name) -lsgx_tcrypto -lsgx_tprotected_fs -lpthread -L$(CURDIR)/sgx-artifacts/lib -lenclave -Wl,--end-group \ + -Wl,--start-group -lsgx_tstdc -lsgx_tcxx -lsgx_dcap_tvl -l$(Service_Library_Name) -lsgx_tcrypto -lsgx_tprotected_fs lsgx_pthread -L$(CURDIR)/sgx-artifacts/lib -lenclave -Wl,--end-group \ -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \ -Wl,-pie,-eenclave_entry -Wl,--export-dynamic \ -Wl,--gc-sections -Wl,--defsym,__ImageBase=0 \