From 5bc65a7bc2a862e9f9ab5029f0d1fc6330e5ac06 Mon Sep 17 00:00:00 2001 From: Kailun Qin Date: Tue, 12 Nov 2024 21:47:52 -0500 Subject: [PATCH] Remove `loader.entrypoint` from manifest template This is a commit corresponding to commit 87c752f "[PAL] Drop deprecated syntax of loader.entrypoint" in core Gramine repository. Signed-off-by: Kailun Qin --- templates/centos/entrypoint.manifest.template | 1 - templates/debian/entrypoint.manifest.template | 2 -- templates/entrypoint.common.manifest.template | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/templates/centos/entrypoint.manifest.template b/templates/centos/entrypoint.manifest.template index 787f1545..77dc7c43 100644 --- a/templates/centos/entrypoint.manifest.template +++ b/templates/centos/entrypoint.manifest.template @@ -1,6 +1,5 @@ {% extends "entrypoint.common.manifest.template" %} {% block loader %} -loader.entrypoint = "file:/gramine/meson_build_output/lib64/gramine/libsysdb.so" loader.env.LD_LIBRARY_PATH = "/gramine/meson_build_output/lib64/gramine/runtime/glibc:/usr/lib64:{{"{{library_paths}}"}}" {% endblock %} diff --git a/templates/debian/entrypoint.manifest.template b/templates/debian/entrypoint.manifest.template index d4075af4..7c648316 100644 --- a/templates/debian/entrypoint.manifest.template +++ b/templates/debian/entrypoint.manifest.template @@ -1,8 +1,6 @@ {% extends "entrypoint.common.manifest.template" %} {% block loader %} -loader.entrypoint = "file:/gramine/meson_build_output/lib/x86_64-linux-gnu/gramine/libsysdb.so" - # Add "/usr/lib/x86_64-linux-gnu" explicitly because ldconfig in Ubuntu 21.04 doesn't # produce it; note that this Debian template is used by Ubuntu templates as well loader.env.LD_LIBRARY_PATH = "/gramine/meson_build_output/lib/x86_64-linux-gnu/gramine/runtime/glibc:/usr/lib/x86_64-linux-gnu:{{"{{library_paths}}"}}" diff --git a/templates/entrypoint.common.manifest.template b/templates/entrypoint.common.manifest.template index 2239f9b2..1a49f8c1 100644 --- a/templates/entrypoint.common.manifest.template +++ b/templates/entrypoint.common.manifest.template @@ -1,6 +1,6 @@ libos.entrypoint = "/gramine/app_files/{{binary_basename}}" -# Add distro-specific `loader.entrypoint` and `loader.env.LD_LIBRARY_PATH` +# Add distro-specific `loader.env.LD_LIBRARY_PATH` {% block loader %}{% endblock %} loader.env.PATH = "{{"{{env_path}}"}}"