Rebasing changes from PR 225

Signed-off-by: Davis Benny <[email protected]>
gramineproject · Nov 14, 2024 · e2e1ed1 · e2e1ed1
1 parent c72dcdf
commit e2e1ed1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git 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.uri = "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
@@ -1,8 +1,6 @@
 {% extends "entrypoint.common.manifest.template" %}
 
 {% block loader %}
-loader.entrypoint.uri = "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
@@ -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}}"}}"