From ec89c47aeee8b58bff7375158870ee13bfae9c64 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 9 Nov 2022 08:05:03 +0100 Subject: [PATCH] Account for patchelf binaries when creating local bootstrap mirror (#33776) This was overlooked when we added binary patchelf buildcaches --- lib/spack/spack/cmd/bootstrap.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/spack/spack/cmd/bootstrap.py b/lib/spack/spack/cmd/bootstrap.py index 9c07c826f7..6a45e22f8e 100644 --- a/lib/spack/spack/cmd/bootstrap.py +++ b/lib/spack/spack/cmd/bootstrap.py @@ -52,6 +52,7 @@ CLINGO_JSON = "$spack/share/spack/bootstrap/github-actions-v0.4/clingo.json" GNUPG_JSON = "$spack/share/spack/bootstrap/github-actions-v0.4/gnupg.json" +PATCHELF_JSON = "$spack/share/spack/bootstrap/github-actions-v0.4/patchelf.json" # Metadata for a generated source mirror SOURCE_METADATA = { @@ -443,6 +444,7 @@ def write_metadata(subdir, metadata): abs_directory, rel_directory = write_metadata(subdir="binaries", metadata=BINARY_METADATA) shutil.copy(spack.util.path.canonicalize_path(CLINGO_JSON), abs_directory) shutil.copy(spack.util.path.canonicalize_path(GNUPG_JSON), abs_directory) + shutil.copy(spack.util.path.canonicalize_path(PATCHELF_JSON), abs_directory) instructions += cmd.format("local-binaries", rel_directory) print(instructions)