Skip to content

Expose snapshot_common.utils.LD_NAME #14091

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

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

Expose snapshot_common.utils.LD_NAME #14091

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
17 changes: 12 additions & 5 deletions infra/base-images/base-builder/indexer/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
import subprocess
from typing import Final, Sequence

_LD_PATH = "/usr/bin/ld.so.2"
_LD_PATH: Final[pathlib.Path] = pathlib.Path("/lib64/ld-linux-x86-64.so.2")
LD_BINARY_NAME: Final[str] = "ld-linux-x86-64.so.2"
_LD_BINARY_PATH: Final[pathlib.Path] = pathlib.Path(
"/lib64/ld-linux-x86-64.so.2"
)


@dataclasses.dataclass(frozen=True)
Expand All @@ -45,14 +47,19 @@ def _parse_ld_trace_output(output: str) -> Sequence[SharedLibrary]:
# lib foo.so => /tmp/sharedlib/lib foo.so (0x00007f76b9367000)
# libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f76b9157000)
# /lib64/ld-linux-x86-64.so.2 (0x00007f76b9379000)
# The last line can also be:
# /grte/lib64/lib64/ld-linux-x86-64.so.2 => /lib64/ld-linux-x86-64.so.2
# (0x00007f76b9379000)
#
# The lines that do not have a => should be skipped.
# The dynamic linker should always be copied.
# The dynamic linker should always be copied AND have its executable bit set.
# The lines that have a => could contain a space, but we copy whatever is on
# the right side of the =>, removing the load address.
shared_libraries = [SharedLibrary(name="ld.so", path=_LD_PATH)]
shared_libraries = [SharedLibrary(name=LD_BINARY_NAME, path=_LD_BINARY_PATH)]
for lib_name, lib_path in re.findall(r"(\S+) => .*?(\S+) \(", output):
lib_path = pathlib.Path(lib_path)
if lib_path == _LD_BINARY_PATH:
continue
shared_libraries.append(SharedLibrary(name=lib_name, path=lib_path))

return shared_libraries
Expand All @@ -67,7 +74,7 @@ def get_shared_libraries(
env["LD_BIND_NOW"] = "1"

result = subprocess.run(
[_LD_PATH, binary_path],
[_LD_BINARY_PATH, binary_path],
capture_output=True,
env=env,
check=True,
Expand Down
Loading