chore: misc sysroot updates (#44)

* 6198526: [Sysroot] Fix missing libgcc.a on i386

https://chromium-review.googlesource.com/c/chromium/src/+/6198526

* 6200895: [Sysroot] Fix circular symlink

https://chromium-review.googlesource.com/c/chromium/src/+/6200895

* 6218214: Remove ppc64le localentry element in glibc reversion script

https://chromium-review.googlesource.com/c/chromium/src/+/6218214

* 6260961: Fix build/linux/sysroot_scripts/update-archive-timestamp.sh

https://chromium-review.googlesource.com/c/chromium/src/+/6260961

* 6263052: [Sysroot] Preserve files need to pass basic compiler sanity check

https://chromium-review.googlesource.com/c/chromium/src/+/6263052

* 6190511: [Sysroot] Add packages for building Mutter

https://chromium-review.googlesource.com/c/chromium/src/+/6190511

Author: codebytere

build/linux/sysroot_scripts/generated_package_lists/bullseye.amd64

@@ -1,4 +1,3 @@
-
 https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/a/acl/libacl1_2.2.53-10_ppc64el.deb
 https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/a/adduser/adduser_3.118+deb11u1_all.deb
 https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/a/adwaita-icon-theme/adwaita-icon-theme_3.38.0-1_all.deb
@@ -278,6 +277,9 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/libj/libjp
 https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/libj/libjsoncpp/libjsoncpp-dev_1.9.4-4_ppc64el.deb
 https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/libj/libjsoncpp/libjsoncpp24_1.9.4-4_ppc64el.deb
 https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/libm/libmd/libmd0_1.0.3-3_ppc64el.deb
+https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/libn/libnotify/gir1.2-notify-0.7_0.7.9-3_ppc64el.deb
+https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/libn/libnotify/libnotify-dev_0.7.9-3_ppc64el.deb
+https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/libn/libnotify/libnotify4_0.7.9-3_ppc64el.deb
 https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/libn/libnsl/libnsl-dev_1.3.0-2_ppc64el.deb
 https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/libn/libnsl/libnsl2_1.3.0-2_ppc64el.deb
 https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/libo/libogg/libogg-dev_1.3.4-0.1_ppc64el.deb

build/linux/sysroot_scripts/generated_package_lists/bullseye.arm64

@@ -39,6 +39,12 @@ def reversion_glibc(bin_file: str) -> None:
         ["readelf", "--dyn-syms", "--wide", bin_file])
     for line in stdout.decode("utf-8").split("\n"):
         cols = re.split("\s+", line)
+        # Remove localentry and next element which appears only in ppc64le
+        # readelf output. Keeping them causes incorrect symbol parsing
+        # leading to improper GLIBC version restrictions.
+        if len(cols) > 7 and cols[7] == "[<localentry>:":
+            cols.pop(7)
+            cols.pop(7)
         # Skip the preamble.
         if len(cols) < 9:
             continue

build/linux/sysroot_scripts/generated_package_lists/bullseye.armhf

@@ -36,7 +36,7 @@
 # gpg keyring file generated using generate_keyring.sh
 KEYRING_FILE = os.path.join(SCRIPT_DIR, "keyring.gpg")
 
-ARCHIVE_TIMESTAMP = "20230611T210420Z"
+ARCHIVE_TIMESTAMP = "20250129T203412Z"
 
 ARCHIVE_URL = f"https://snapshot.debian.org/archive/debian/{ARCHIVE_TIMESTAMP}/"
 APT_SOURCES_LIST = [
@@ -81,6 +81,7 @@
     "libbluetooth-dev",
     "libc6-dev",
     "libcap-dev",
+    "libcolord-dev",
     "libcups2-dev",
     "libcupsimage2-dev",
     "libcurl4-gnutls-dev",
@@ -98,8 +99,10 @@
     "libjpeg-dev",
     "libjsoncpp-dev",
     "libkrb5-dev",
+    "liblcms2-dev",
     "liblzma-dev",
     "libminizip-dev",
+    "libmtdev-dev",
     "libncurses-dev",
     "libnss3-dev",
     "libopus-dev",
@@ -434,6 +437,9 @@ def hacks_and_patches(install_root: str, script_dir: str, arch: str) -> None:
     replace_in_file(gtk4_pc, r"pango [>=0-9. ]*", "pango")
     replace_in_file(gtk4_pc, r"pangocairo [>=0-9. ]*", "pangocairo")
 
+    # 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:
@@ -560,13 +566,17 @@ def removing_unnecessary_files(install_root, arch):
     Minimizes the sysroot by removing unnecessary files.
     """
     # Preserve these files.
+    gcc_triple = "i686-linux-gnu" if arch == "i386" else TRIPLES[arch]
     ALLOWLIST = {
         "usr/bin/cups-config",
-        f"usr/lib/gcc/{TRIPLES[arch]}/10/libgcc.a",
+        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:
+        assert os.path.exists(os.path.join(install_root, file))
+
     # Remove all executables and static libraries, and any symlinks that
     # were pointing to them.
     reverse_links = collections.defaultdict(list)
@@ -594,8 +604,15 @@ def removing_unnecessary_files(install_root, arch):
 def strip_sections(install_root: str, arch: str):
     """
     Strips all sections from ELF files except for dynamic linking and
-    essential sections. Skips static libraries (.a) and object files (.o).
+    essential sections. Skips static libraries (.a), object files (.o), and a
+    few files used by other Chromium-related projects.
     """
+    PRESERVED_FILES = (
+        'libc-2.31.so',
+        'libm-2.31.so',
+        'ld-2.31.so',
+    )
+
     PRESERVED_SECTIONS = {
         ".dynamic",
         ".dynstr",
@@ -608,9 +625,14 @@ def strip_sections(install_root: str, arch: str):
         ".note.gnu.build-id",
     }
 
+    preserved_files_count = 0
+    lib_arch_path = os.path.join(install_root, "lib", TRIPLES[arch])
     for root, _, files in os.walk(install_root):
         for file in files:
             file_path = os.path.join(root, file)
+            if file_path.startswith(lib_arch_path) and file in PRESERVED_FILES:
+                preserved_files_count += 1
+                continue
 
             if (os.access(file, os.X_OK) or file.endswith((".a", ".o"))
                     or os.path.islink(file_path)):
@@ -646,6 +668,8 @@ def strip_sections(install_root: str, arch: str):
                     for section in sections_to_remove
                 ] + [file_path])
                 subprocess.run(objcopy_cmd, check=True, stderr=subprocess.PIPE)
+    if preserved_files_count != len(PRESERVED_FILES):
+        raise Exception("Expected file to preserve missing")
 
 
 def record_metadata(install_root: str) -> dict[str, tuple[float, float]]:

build/linux/sysroot_scripts/generated_package_lists/bullseye.i386

@@ -12,7 +12,7 @@ ARCHIVE_URL="http://snapshot.debian.org/archive/debian"
 # Use 9999-01-01 as the date so that we get a redirect to the page with the
 # latest timestamp.
 TIMESTAMP=$(curl -s "${ARCHIVE_URL}/99990101T000000Z/pool/" | \
-  sed -n "s|.*${ARCHIVE_URL}/\([[:digit:]TZ]\+\)/pool/.*|\1|p" | head -n 1)
+  sed -n "s|.*/archive/debian/\([[:digit:]TZ]\+\)/pool/.*|\1|p" | head -n 1)
 
-sed -i "s/ARCHIVE_TIMESTAMP=.*$/ARCHIVE_TIMESTAMP=${TIMESTAMP}/" \
+sed -i "s/ARCHIVE_TIMESTAMP = .*$/ARCHIVE_TIMESTAMP = \"${TIMESTAMP}\"/" \
   "${SCRIPT_DIR}"/sysroot_creator.py