From 855fd142ffb8631cd79cb4914205b287aa2565a4 Mon Sep 17 00:00:00 2001 From: Adrian Dombeck Date: Mon, 5 Dec 2016 14:01:04 +0100 Subject: [PATCH] Fix trusted_file entries in ls.manifest.template --- LibOS/shim/test/Makefile | 2 +- LibOS/shim/test/native/ls.manifest.template | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LibOS/shim/test/Makefile b/LibOS/shim/test/Makefile index 8e960845..41529966 100644 --- a/LibOS/shim/test/Makefile +++ b/LibOS/shim/test/Makefile @@ -39,7 +39,7 @@ manifest_rules = \ %manifest: %manifest.template @echo [ $@ ] - RELDIR=$(filter-out ./,$(python -c "import os.path; print os.path.relpath($(abspath $(dir $@)) $(PWD))")) && \ + RELDIR=$(filter-out ./,$(shell realpath --relative-to=$(abspath $(dir $@)) $(PWD))/) && \ sed $(manifest_rules) $< > $@ (grep -q '^#!' $@ && chmod +x $@) || true diff --git a/LibOS/shim/test/native/ls.manifest.template b/LibOS/shim/test/native/ls.manifest.template index e5660417..d39147ac 100644 --- a/LibOS/shim/test/native/ls.manifest.template +++ b/LibOS/shim/test/native/ls.manifest.template @@ -21,10 +21,10 @@ net.rules.1 = 127.0.0.1:8000:0.0.0.0:0-65535 net.rules.2 = 0.0.0.0:0-65535:127.0.0.1:8000 # sgx-related -sgx.trusted_files.ld.uri = file:$(LIBCDIR)/ld-linux-x86-64.so.2 -sgx.trusted_files.libc.uri = file:$(LIBCDIR)/libc.so.6 -sgx.trusted_files.libdl.uri = file:$(LIBCDIR)/libdl.so.2 -sgx.trusted_files.libselinux.uri = file:/lib/x86_64-linux-gnu/libselinux.so.1 -sgx.trusted_files.libacl.uri = file:/lib/x86_64-linux-gnu/libacl.so.1 -sgx.trusted_files.libpcre.uri = file:/lib/x86_64-linux-gnu/libpcre.so.3 -sgx.trusted_files.libattr.uri = file:/lib/x86_64-linux-gnu/libattr.so.1 +sgx.trusted_files.ld = file:$(LIBCDIR)/ld-linux-x86-64.so.2 +sgx.trusted_files.libc = file:$(LIBCDIR)/libc.so.6 +sgx.trusted_files.libdl = file:$(LIBCDIR)/libdl.so.2 +sgx.trusted_files.libselinux = file:/lib/x86_64-linux-gnu/libselinux.so.1 +sgx.trusted_files.libacl = file:/lib/x86_64-linux-gnu/libacl.so.1 +sgx.trusted_files.libpcre = file:/lib/x86_64-linux-gnu/libpcre.so.3 +sgx.trusted_files.libattr = file:/lib/x86_64-linux-gnu/libattr.so.1