Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove loader.entrypoint from manifest template #225

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −4
Open

Remove loader.entrypoint from manifest template #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion templates/centos/entrypoint.manifest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}
2 changes: 0 additions & 2 deletions templates/debian/entrypoint.manifest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}"}}"
Expand Down
2 changes: 1 addition & 1 deletion templates/entrypoint.common.manifest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}"}}"
Expand Down