zishuo/Archive
1
0
Fork 0
mirror of https://github.com/bolucat/Archive.git synced 2026-04-22 16:07:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update On Thu Mar 6 19:36:08 CET 2025

Browse Source
This commit is contained in:
github-action[bot]
2025-03-06 19:36:08 +01:00
parent f19cde2a35
commit 2b9b4eca4f
133 changed files with 3064 additions and 1421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
naiveproxy/src/build/linux/sysroot_scripts/reversion_glibc.py
+2 -2
View File
@@ -12,7 +12,7 @@ import subprocess
# //chrome/installer/linux/rpm/dist_package_provides.json
MAX_ALLOWED_GLIBC_VERSION = [2, 26]
VERSION_PATTERN = re.compile("GLIBC_([0-9\.]+)")
VERSION_PATTERN = re.compile(r"GLIBC_([0-9\.]+)")
SECTION_PATTERN = re.compile(r"^ *\[ *[0-9]+\] +(\S+) +\S+ + ([0-9a-f]+) .*$")
# Some otherwise disallowed symbols are referenced in the linux-chromeos build.
@@ -34,7 +34,7 @@ def reversion_glibc(bin_file: str) -> None:
stdout = subprocess.check_output(
["readelf", "--dyn-syms", "--wide", bin_file])
for line in stdout.decode("utf-8").split("\n"):
cols = re.split("\s+", line)
cols = re.split(r"\s+", line)
# Skip the preamble.
if len(cols) < 9:
continue
naiveproxy/src/build/linux/sysroot_scripts/sysroot_creator.py
-6
View File
@@ -350,9 +350,6 @@ def hacks_and_patches(install_root: str, script_dir: str, arch: str) -> None:
lib_path = os.path.join(install_root, "lib", TRIPLES[arch], lib)
reversion_glibc.reversion_glibc(lib_path)
# Remove a cyclic symlink: /usr/bin/X11 -> /usr/bin
os.remove(os.path.join(install_root, "usr/bin/X11"))
def replace_in_file(file_path: str, search_pattern: str,
replace_pattern: str) -> None:
@@ -480,10 +477,8 @@ def removing_unnecessary_files(install_root, arch):
# Preserve these files.
gcc_triple = "i686-linux-gnu" if arch == "i386" else TRIPLES[arch]
ALLOWLIST = {
"usr/bin/cups-config",
f"usr/lib/gcc/{gcc_triple}/10/libgcc.a",
f"usr/lib/{TRIPLES[arch]}/libc_nonshared.a",
f"usr/lib/{TRIPLES[arch]}/libffi_pic.a",
}
for file in ALLOWLIST:
@@ -625,7 +620,6 @@ def build_sysroot(arch: str) -> None:
hacks_and_patches(install_root, SCRIPT_DIR, arch)
cleanup_jail_symlinks(install_root)
removing_unnecessary_files(install_root, arch)
strip_sections(install_root, arch)
restore_metadata(install_root, old_metadata)