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.

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

Make jexec and jspawnhelper executable #1516

Merged
merged 1 commit into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions java/testdata/java21_debian12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ fileExistenceTests:
- name: no-javac
path: "/usr/lib/jvm/temurin21_jre_amd64/bin/javac"
shouldExist: false
- name: jexec-executable
path: "/usr/lib/jvm/temurin21_jre_amd64/lib/jexec"
shouldExist: true
isExecutableBy: "any"
- name: jspawnhelper-executable
path: "/usr/lib/jvm/temurin21_jre_amd64/lib/jspawnhelper"
shouldExist: true
isExecutableBy: "any"
metadataTest:
envVars:
- key: 'JAVA_VERSION'
Expand Down
12 changes: 5 additions & 7 deletions private/remote/temurin_archive.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@ pkg_files(
srcs = glob(
["output/**/*"],
),
excludes = ["_bin_dir", "_cacerts"],
excludes = ["_executables", "_cacerts"],
strip_prefix = "output",
)

# special rules for bin files to make them executable
# special rules for bin files to make them executable and other executables
pkg_files(
name = "_bin_dir",
srcs = glob(
["output/bin/*"],
),
name = "_executables",
srcs = glob(["output/bin/*"]) + ["output/lib/jexec", "output/lib/jspawnhelper"],
attributes = pkg_attributes(
mode = "0755",
user = "root",
Expand All @@ -32,7 +30,7 @@ pkg_files(
# everything that needs to go into the jvm install dir
pkg_filegroup(
name = "_jvm_dir",
srcs = ["_bin_dir", "_most_files"],
srcs = ["_executables", "_most_files"],
prefix = "/usr/lib/jvm/{name}",
)

Expand Down
Loading