Skip to content

Commit

Permalink
Temporarily Patch Entrypoint Changes from gsc pull gramineproject#225
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] committed Dec 6, 2024
1 parent e606464 commit 803a428
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion templates/centos/entrypoint.manifest.template
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
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
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

0 comments on commit 803a428

Please sign in to comment.