Skip to content

Commit

Permalink
cheribsd-sysroot, disk-image-minimal: Teach about P128's existence
Browse files Browse the repository at this point in the history
  • Loading branch information
jrtc27 committed Jan 26, 2024
1 parent ca1dc2b commit 29d93a0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions pycheribuild/projects/cross/cheribsd.py
Original file line number Diff line number Diff line change
Expand Up @@ -2080,6 +2080,7 @@ def create_sysroot(self) -> None:
"--include=./usr/lib/", "--include=./usr/libdata/",
"--include=./usr/lib32", "--include=./usr/lib64",
"--include=./usr/lib64c", "--include=./usr/lib64cb",
"--include=./usr/lib128", "--include=./usr/lib128g",
# only pack those files that are mentioned in METALOG
"@METALOG.world"]
rootfs_target = self.rootfs_source_class.get_instance(self)
Expand Down
4 changes: 2 additions & 2 deletions pycheribuild/projects/disk_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -987,14 +987,14 @@ def add_unlisted_files_to_metalog(self):
self.warning("default ABI runtime linker not present in rootfs at", ld_elf_path)
self.ask_for_confirmation("Are you sure you want to continue?")
# Add all compat ABI runtime linkers that we find in the rootfs:
for rtld_abi in ("elf32", "elf64", "elf64c", "elf64cb"):
for rtld_abi in ("elf32", "elf64", "elf64c", "elf64cb", "elf128", "elf128g"):
rtld_path = self.rootfs_dir / "libexec" / f"ld-{rtld_abi}.so.1"
if rtld_path.exists():
self.add_file_to_image(rtld_path, base_directory=self.rootfs_dir)

self.add_required_libraries(["lib", "usr/lib"])
# Add compat libraries (may not exist if it was built with -DWITHOUT_LIB64, etc.)
for libcompat_dir in ("lib32", "lib64", "lib64c", "lib64cb"):
for libcompat_dir in ("lib32", "lib64", "lib64c", "lib64cb", "lib128", "lib128g"):
fullpath = self.rootfs_dir / "usr" / libcompat_dir
if fullpath.is_symlink():
# add the libcompat symlinks to ensure that we can always use lib64/lib64c in test scripts
Expand Down

0 comments on commit 29d93a0

Please sign in to comment.