main/postmarketos-ui-asteroid: new aport

Back from the dead! Now modernized and using Qt6! This reverts commit b615a7bd13.
main/postmarketos-duranium: add packages for "dev tools" sysext
2026-05-19 20:54:49 +02:00 · 2026-04-18 00:11:19 -07:00 · 2026-04-17 20:21:18 +00:00 · 2026-04-17 10:10:03 -07:00 · 2026-04-17 15:38:22 +00:00 · 2026-04-17 15:06:07 +00:00
677 changed files with 56331 additions and 17886 deletions
@@ -11,7 +11,7 @@
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk -q add py3-pip make git
-	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/master
+	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/main
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi

@@ -1,4 +1,4 @@
-image: registry.alpinelinux.org/img/alpine:latest
+image: registry.alpinelinux.org/img/alpine:3.23
 stages:
  - build
  - hardware tests
@@ -82,13 +82,13 @@ build:

 # Include all the devices that need and can to be tested

-{% for device in devices_under_test if device.is_present_in_ci %}
+{% for device in devices_under_test %}
 prepare-{{ device.name }}:
  stage: hardware tests
  extends:
    .pmos-ci-tron-build-boot-artifacts
  {%- if device.has_kernel_variants %}
-  # Let's build all the boot artifacts for all the supported kernel variants in
+  # Build all the boot artifacts for all the supported kernel variants in
  # different jobs, but hide them behind a single job name so as not to pollute
  # the pipeline.
  parallel:
@@ -112,10 +112,8 @@ prepare-{{ device.name }}:

 .test-{{ device.name }}:
  stage: hardware tests
-  extends:
-    - .pmos-ci-tron-initramfs-test
  {%- if device.has_kernel_variants %}
-  # Let's test all the kernels in different jobs, but hide them behind a single
+  # Test all the kernels in different jobs, but hide them behind a single
  # job name so as not to pollute the pipeline.
  parallel:
    matrix:
@@ -135,10 +133,6 @@ prepare-{{ device.name }}:
      {%- endif %}
  variables:
    CI_TRON__PMB_BUILD_JOB: "prepare-{{ device.name }}{% if device.has_kernel_variants %}: [$KERNEL_VARIANT]{% endif %}"
-    # FIXME: cmdline is hardcoded here, but ideally would be built from
-    # fragments using generate-kernel-cmdline...
-    # See: https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/issues/317
-    CI_TRON_KERNEL_CMDLINE__DEVICEINFO: 'console=tty1 console=ttyS0,115200 PMOS_FORCE_PARTITION_RESIZE psi=1'

 # Include the gitlab ci yml fragment, as found in
 # `device/$category/device-$devicename/gitlab-ci.yml.j2` which defines the jobs
@@ -6,7 +6,7 @@
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk add git python3
-	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/master
+	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/main
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi

@@ -129,6 +129,17 @@ if [ -n "$CI_MERGE_REQUEST_DIFF_BASE_SHA" ]; then
 			exit_code=1
 		fi
 	fi
+
+	# Disallow adding packages without a maintainer set
+	NEW_APKBUILDS=$(git show --pretty="" --name-only --diff-filter=A "$CI_MERGE_REQUEST_DIFF_BASE_SHA"..HEAD | grep APKBUILD || true)
+
+	if [ -n "$NEW_APKBUILDS" ]; then
+		if [ -n "$(grep -L '^maintainer="[^"]\+"$' $NEW_APKBUILDS || true)" ]; then
+			echo "ERROR: A new package does not have a maintainer set."
+			grep --color=always -L '^maintainer="[^"]\+"$' $NEW_APKBUILDS
+			exit_code=1
+		fi
+	fi
 fi

 exit "$exit_code"
@@ -24,7 +24,7 @@ def get_package_contents(package, revision, check=True):
    if not check:
        stderr = subprocess.DEVNULL

-    # Run something like "git show upstream/master:main/hello-world/APKBUILD"
+    # Run something like "git show upstream/main:main/hello-world/APKBUILD"
    pmaports_dir = common.get_pmaports_dir()
    pattern = pmaports_dir + "/**/" + package + "/APKBUILD"
    path = glob.glob(pattern, recursive=True)[0][len(pmaports_dir + "/"):]
@@ -137,7 +137,7 @@ def check_versions(packages):
        pkgver = head.rpartition('-r')[0]
        if package.startswith('device-') and not pkgver.isdigit():
            print(f" - {package}: invalid pkgver \"{pkgver}\""
-                  "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+                  "See: https://docs.postmarketos.org/pmaports/main/packaging-guidelines.html#package-versioning-pkgver-pkgrel")
            error = True

        # Additional checks for device packages
@@ -145,27 +145,11 @@ def check_versions(packages):
            head_parsed = get_package_contents(package, "HEAD", False)
            upstream_parsed = get_package_contents(package, commit, False)

-            # checksums did not change
-            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
-                # Check that pkgver did not change
-                if head_parsed["pkgver"] != upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should not change when package source checksums did not change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # We do not check for a bumped pkgrel, because not everything
-                # needs it, e.g: pmb_recommends
-            # checksums changed
-            else:
-                # Check that pkgrel was reset to 0
-                if head_parsed["pkgrel"] != "0":
-                    print(f" - {package}: pkgrel should be 0 when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # Check that pkgver was changed
-                if head_parsed["pkgver"] == upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should change when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
+            # Check that pkgrel was reset to 0 when pkgver was changed
+            if head_parsed["pkgver"] != upstream_parsed["pkgver"] and head_parsed["pkgrel"] != "0":
+                print(f" - {package}: pkgrel should be 0 when pkgver changes."
+                      "See: https://docs.postmarketos.org/pmaports/main/packaging-guidelines.html#package-versioning-pkgver-pkgrel")
+                error = True

        # Compare head and upstream versions
        result = pmb.parse.version.compare(head, upstream)
@@ -90,7 +90,7 @@ def main() -> int:
    parser = argparse.ArgumentParser()
    parser.add_argument("--booting", help="devices must be in the upper table,"
                        " being in the 'not booting' table below is not"
-                        " enough (all devices in pmaports master and stable"
+                        " enough (all devices in pmaports main and stable"
                        " branches and should be in the upper table)",
                        action="store_true")
    parser.add_argument("--path", help="instead of downloading the devices"
@@ -48,7 +48,7 @@ def run_pmbootstrap(parameters):
@cache
 def get_upstream_branch():
    """ Use pmaports.cfg from current branch (e.g. "v20.05_fix-ci") and
-        channels.cfg from master to retrieve the upstream branch.
+        channels.cfg from main to retrieve the upstream branch.

        :returns: branch name, e.g. "v20.05" """

@@ -65,7 +65,7 @@ def get_upstream_branch():

    # Get branch_pmaports (e.g. "v20.05") from channels.cfg
    # https://postmarketos.org/channels.cfg
-    channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"])
+    channels_cfg_str = run_git(["show", "upstream/main:channels.cfg"])
    channels_cfg = configparser.ConfigParser()
    channels_cfg.read_string(channels_cfg_str)
    assert channel in channels_cfg, \
@@ -139,7 +139,14 @@ def get_changed_packages(skip_archived: bool = False):
        # Skip files:
        # * in the root dir of pmaports (e.g. README.md)
        # * path with a dot (e.g. .ci/, device/.shared-patches/)
-        if not dirname or file.startswith(".") or "/." in file or skip_archived and dirname.startswith("device/archived"):
+        # * documentation
+        if (
+                not dirname
+                or file.startswith(".")
+                or "/." in file
+                or skip_archived and dirname.startswith("device/archived")
+                or dirname == "docs"
+        ):
            continue

        if filename != "APKBUILD":
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 import common
+import glob
 import os.path
 import subprocess
 import sys
@@ -11,9 +12,15 @@ if __name__ == "__main__":
    if common.commit_message_has_string("[ci:skip-dint]"):
        print("WARNING: not linting deviceinfo files ([ci:skip-dint])")
        exit(0)
-    # only lint deviceinfo files in the devices repo
-    deviceinfo_files = {file for file in common.get_changed_files()
-                        if os.path.basename(file) == "deviceinfo" and file.startswith("device/")}
+
+    if "deviceinfo_schema.toml" in common.get_changed_files():
+        print("deviceinfo_schema.toml changed -> checking all deviceinfo files")
+        pmaports_dir = common.get_pmaports_dir()
+        deviceinfo_files = set(glob.glob(pmaports_dir + "/device/*/*/deviceinfo"))
+    else:
+        # only lint deviceinfo files in the devices repo
+        deviceinfo_files = {file for file in common.get_changed_files()
+                            if os.path.basename(file) == "deviceinfo" and file.startswith("device/")}

    try:
        subprocess.run(["dint", "check", *deviceinfo_files], text=True, check=True)
@@ -44,10 +44,6 @@ class Device:

        return Template(fragment_tmpl).render(device=self)

-    @property
-    def is_present_in_ci(self):
-        return bool(self.gitlab_ci_fragment)
-
    @cached_property
    def pmaports_path(self) -> Path:
        # Find the root of pmaports
@@ -77,7 +73,7 @@ class Device:
        return {"postmarketos-mkinitfs-hook-ci"}

    @cached_property
-    def package_dependencies(self) -> list[str]:
+    def package_dependencies(self) -> set[str]:
        # HACK: Work around a bug in depends_recurse which prevents listing all the dependencies
        # Bug: https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues/2623
        return {"postmarketos-initramfs"}
@@ -129,7 +125,7 @@ class Device:
                    dev = cls(device.codename)

                    # Ignore devices that do not have a gitlab ci fragment,
-                    # since we won't be able to make use of them
+                    # since adding that fragment is how we mark them as DUTs
                    if not dev.gitlab_ci_fragment:
                        continue

@@ -0,0 +1,16 @@
+#!/bin/sh -e
+# Description: static type checking for python scripts
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add py3-argcomplete py3-pip py3-pytest
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+set -x
+
+pip install --break-system-packages --no-warn-script-location mypy
+# Need to change directory for pyproject.toml to be picked up.
+cd .ci
+python -m mypy .
@@ -0,0 +1,2 @@
+[tool.mypy]
+disable_error_code = ["import-not-found"]
@@ -16,6 +16,10 @@ fi
 sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
+	./main/postmarketos-duranium/rootfs-usr-bin-duranium-set-channel
+	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-first-boot
+	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-mount-subpartitions
+	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-usb-gadget-setup
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
@@ -62,6 +62,18 @@ ruff:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/ruff.sh

+# testcases typechecking
+mypy:
+  stage: lint
+  rules:
+    - if: *mr_rule
+      changes:
+        - .ci/**/*
+        - .gitlab-ci.yml
+  script:
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/mypy.sh
+
 # shellcheck and various grep checks
 shellcheck-grep:
  stage: lint
@@ -116,6 +128,7 @@ dint:
        - .ci/**/*
        - .gitlab-ci.yml
        - device/*/device-*/deviceinfo
+        - deviceinfo_schema.toml
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/dint.sh
@@ -26,7 +26,7 @@
 <!--
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
-* [ ] edge (`master` branch)
+* [ ] edge (`main` branch)
 * [ ] `v25.12`

 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
@@ -5,10 +5,12 @@ This repository contains the APKBUILD files for postmarketOS-specific packages,
 There are many more packages defined in the [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/) on which these packages depend.

 Helpful resources:
+
+* [Issues](https://gitlab.postmarketos.org/postmarketOS/pmaports/-/work_items)
 * [How to create a package](https://wiki.postmarketos.org/wiki/Create_a_package)
 * [APKBUILD reference](https://wiki.alpinelinux.org/wiki/APKBUILD_Reference)
 * [pmaports commit style](./COMMITSTYLE.md)
-* [Review and merging guidelines](./docs/modules/ROOT/pages/merging-rules.adoc)
+* [Approval rules](docs/approval-rules.md)
 * [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/)
 * [Alpine Linux package search](https://pkgs.alpinelinux.org/packages)
 * [postmarketOS package search](https://pkgs.postmarketos.org/packages)
@@ -4,7 +4,7 @@ recommended=edge

 [edge]
 description=Rolling release / Most devices / Occasional breakage: https://postmarketos.org/edge
-branch_pmaports=master
+branch_pmaports=main
 branch_aports=master
 mirrordir_alpine=edge

@@ -0,0 +1,31 @@
+Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
+
+With `#include <linux/filter.h>` `struct sock_fprog` is available when
+linux headers are available. It seems that glibc is just including that header
+as an implementation detail, while musl does not.
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
+@@ -74,6 +74,7 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+#include <linux/filter.h>
+ #if SANITIZER_ANDROID
+ #include <linux/fs.h>
+ #endif
+@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
+   unsigned struct_synth_info_sz = sizeof(struct synth_info);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #endif // SANITIZER_LINUX
+ 
+ #if SANITIZER_GLIBC
+@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+ 
+   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
+   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
+-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #  endif  // SANITIZER_GLIBC
+ 
+ #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,7 +1,6 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-aarch64
 # Based on: main/gcc (from Alpine)
-
 CTARGET_ARCH=aarch64
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -23,6 +22,7 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

+maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-aarch64
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,6 +279,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -796,6 +797,7 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -0,0 +1,31 @@
+Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
+
+With `#include <linux/filter.h>` `struct sock_fprog` is available when
+linux headers are available. It seems that glibc is just including that header
+as an implementation detail, while musl does not.
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
+@@ -74,6 +74,7 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+#include <linux/filter.h>
+ #if SANITIZER_ANDROID
+ #include <linux/fs.h>
+ #endif
+@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
+   unsigned struct_synth_info_sz = sizeof(struct synth_info);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #endif // SANITIZER_LINUX
+ 
+ #if SANITIZER_GLIBC
+@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+ 
+   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
+   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
+-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #  endif  // SANITIZER_GLIBC
+ 
+ #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,7 +1,6 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-armhf
 # Based on: main/gcc (from Alpine)
-
 CTARGET_ARCH=armhf
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -23,6 +22,7 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

+maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-armhf
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,6 +279,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -796,6 +797,7 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -0,0 +1,31 @@
+Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
+
+With `#include <linux/filter.h>` `struct sock_fprog` is available when
+linux headers are available. It seems that glibc is just including that header
+as an implementation detail, while musl does not.
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
+@@ -74,6 +74,7 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+#include <linux/filter.h>
+ #if SANITIZER_ANDROID
+ #include <linux/fs.h>
+ #endif
+@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
+   unsigned struct_synth_info_sz = sizeof(struct synth_info);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #endif // SANITIZER_LINUX
+ 
+ #if SANITIZER_GLIBC
+@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+ 
+   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
+   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
+-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #  endif  // SANITIZER_GLIBC
+ 
+ #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,7 +1,6 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-armv7
 # Based on: main/gcc (from Alpine)
-
 CTARGET_ARCH=armv7
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -23,6 +22,7 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

+maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-armv7
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,6 +279,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -796,6 +797,7 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -0,0 +1,31 @@
+Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
+
+With `#include <linux/filter.h>` `struct sock_fprog` is available when
+linux headers are available. It seems that glibc is just including that header
+as an implementation detail, while musl does not.
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
+@@ -74,6 +74,7 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+#include <linux/filter.h>
+ #if SANITIZER_ANDROID
+ #include <linux/fs.h>
+ #endif
+@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
+   unsigned struct_synth_info_sz = sizeof(struct synth_info);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #endif // SANITIZER_LINUX
+ 
+ #if SANITIZER_GLIBC
+@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+ 
+   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
+   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
+-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #  endif  // SANITIZER_GLIBC
+ 
+ #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,7 +1,6 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-loongarch64
 # Based on: main/gcc (from Alpine)
-
 CTARGET_ARCH=loongarch64
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -23,6 +22,7 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

+maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-loongarch64
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-loongarch64
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for loongarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,6 +279,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -796,6 +797,7 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -0,0 +1,31 @@
+Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
+
+With `#include <linux/filter.h>` `struct sock_fprog` is available when
+linux headers are available. It seems that glibc is just including that header
+as an implementation detail, while musl does not.
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
+@@ -74,6 +74,7 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+#include <linux/filter.h>
+ #if SANITIZER_ANDROID
+ #include <linux/fs.h>
+ #endif
+@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
+   unsigned struct_synth_info_sz = sizeof(struct synth_info);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #endif // SANITIZER_LINUX
+ 
+ #if SANITIZER_GLIBC
+@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+ 
+   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
+   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
+-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #  endif  // SANITIZER_GLIBC
+ 
+ #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,7 +1,6 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-ppc64le
 # Based on: main/gcc (from Alpine)
-
 CTARGET_ARCH=ppc64le
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -23,6 +22,7 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

+maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-ppc64le
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-ppc64le
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for ppc64le"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,6 +279,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -796,6 +797,7 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -0,0 +1,31 @@
+Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
+
+With `#include <linux/filter.h>` `struct sock_fprog` is available when
+linux headers are available. It seems that glibc is just including that header
+as an implementation detail, while musl does not.
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
+@@ -74,6 +74,7 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+#include <linux/filter.h>
+ #if SANITIZER_ANDROID
+ #include <linux/fs.h>
+ #endif
+@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
+   unsigned struct_synth_info_sz = sizeof(struct synth_info);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #endif // SANITIZER_LINUX
+ 
+ #if SANITIZER_GLIBC
+@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+ 
+   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
+   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
+-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #  endif  // SANITIZER_GLIBC
+ 
+ #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,7 +1,6 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-riscv64
 # Based on: main/gcc (from Alpine)
-
 CTARGET_ARCH=riscv64
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -23,6 +22,7 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

+maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-riscv64
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-riscv64
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,6 +279,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -796,6 +797,7 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -0,0 +1,31 @@
+Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
+
+With `#include <linux/filter.h>` `struct sock_fprog` is available when
+linux headers are available. It seems that glibc is just including that header
+as an implementation detail, while musl does not.
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
+@@ -74,6 +74,7 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+#include <linux/filter.h>
+ #if SANITIZER_ANDROID
+ #include <linux/fs.h>
+ #endif
+@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
+   unsigned struct_synth_info_sz = sizeof(struct synth_info);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #endif // SANITIZER_LINUX
+ 
+ #if SANITIZER_GLIBC
+@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+ 
+   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
+   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
+-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #  endif  // SANITIZER_GLIBC
+ 
+ #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,7 +1,6 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-x86
 # Based on: main/gcc (from Alpine)
-
 CTARGET_ARCH=x86
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -23,6 +22,7 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

+maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-x86
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-x86
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for x86"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,6 +279,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -796,6 +797,7 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -0,0 +1,31 @@
+Provide struct_sock_fprog_sz on Linux, rather than on Linux+glibc.
+
+With `#include <linux/filter.h>` `struct sock_fprog` is available when
+linux headers are available. It seems that glibc is just including that header
+as an implementation detail, while musl does not.
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2025-08-08 08:51:45.621434001 +0200
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp	2026-02-25 20:29:28.519492722 +0100
+@@ -74,6 +74,7 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
+#include <linux/filter.h>
+ #if SANITIZER_ANDROID
+ #include <linux/fs.h>
+ #endif
+@@ -507,6 +508,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+   unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
+   unsigned struct_synth_info_sz = sizeof(struct synth_info);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #endif // SANITIZER_LINUX
+ 
+ #if SANITIZER_GLIBC
+@@ -534,7 +536,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+ 
+   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
+   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
+-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
+ #  endif  // SANITIZER_GLIBC
+ 
+ #  if !SANITIZER_ANDROID && !SANITIZER_APPLE
@@ -1,7 +1,6 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen gcc-x86_64
 # Based on: main/gcc (from Alpine)
-
 CTARGET_ARCH=x86_64
 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
 LANG_D=false
@@ -23,6 +22,7 @@ CBUILDROOT="/"

 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

+maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=gcc-x86_64
 pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-x86_64
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="https://gcc.gnu.org"
 arch="aarch64"
@@ -279,6 +279,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+	0042-libsanitizer-struct_sock_fprog_sz.patch

 	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
@@ -796,6 +797,7 @@ eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd
 9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+5dd452a80c496a587a8826b04a4917045e4028631606e85cabd8e87e0460642d188a2156c4e0cf37a5d88e66ebd08a08393d48a6065045178c69eaba2edd063e  0042-libsanitizer-struct_sock_fprog_sz.patch
 c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
 e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "
@@ -6,9 +6,10 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

+maintainer=""
 pkgname=musl-aarch64
-pkgver=1.2.5
-pkgrel=21
+pkgver=1.2.6
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

@@ -57,6 +58,6 @@ package_dev() {
 }

 sha512sums="
-dce3b131910f7596f8f1d7c2662805b619a151313c7822cf56a7529b6a8b3baf708bfab649be42d920b173dbd7caf33c667ab120779728b9c271439e1190d4ce  musl-1.2.5-r21-aarch64-edge.apk
-e635424ca037e3d949f793de68218e43fc25f0633aa27d1c330d96d97a8473643683f37bd545022bcb25c8298b8ed54288cf48ccc9633b6dda849cfa187d1019  musl-dev-1.2.5-r21-aarch64-edge.apk
+03134d5e7b840db09a10f1f34254840dd86d69f960f3eb38a0944df06d897cc603a1a82af380f0ee975a10708c51430d77618debc8ae500d1bbef705fd77681b  musl-1.2.6-r2-aarch64-edge.apk
+d95f9907bd7c0e818ffde40481bf0a8c23ca038e83f260f4ecb583fe164a581c978f76df3623be312400d75e23e2ca4b0742d59855cd908a9d411829ac017de7  musl-dev-1.2.6-r2-aarch64-edge.apk
 "
@@ -6,9 +6,10 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

+maintainer=""
 pkgname=musl-armhf
-pkgver=1.2.5
-pkgrel=21
+pkgver=1.2.6
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

@@ -57,6 +58,6 @@ package_dev() {
 }

 sha512sums="
-b5411d6b4e03c1c8767906733d091e3438b5ca61959395e5de969a311c131d460052d6ad0c776740bce51a57ea7956ceb11e76355ddc9cc7b045804dfea9927e  musl-1.2.5-r21-armhf-edge.apk
-cb52d3a273cfe102f1c782412d0fa5cb24d735527c99e6702aa456d04655bb09f2939c8c64db86c7e256579cc4179c5fbf1f56b6461596a5e298494c4464c35d  musl-dev-1.2.5-r21-armhf-edge.apk
+0f2a24ee0f23612adfb578ccda1b9dccd24a37f78c90d1ba655cdcf0e094dd95f4ec34288c87f98804714cb8fc0865bf0fe079c7a1902b39c4d992bb46e10e64  musl-1.2.6-r2-armhf-edge.apk
+8b5175848776267bee95be058595e538eaa06cb63522d519b6760920faac40c16fa59a57a6be545c121f1e4d1c7cd2e4b2b8fdded57cbdb7e8585b08ca349d86  musl-dev-1.2.6-r2-armhf-edge.apk
 "
@@ -6,9 +6,10 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

+maintainer=""
 pkgname=musl-armv7
-pkgver=1.2.5
-pkgrel=21
+pkgver=1.2.6
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

@@ -57,6 +58,6 @@ package_dev() {
 }

 sha512sums="
-440fa575b03ca4253d9d25fbe5a59ae3164ba945c012d12224ef829786afa14c654a2ff3868fedbd200bbbadd5789539f6d88def7831ca207e63a1d753021e5e  musl-1.2.5-r21-armv7-edge.apk
-3b7ce82a7ab3c02cb302614898ca68356ed18512f37f3632b1ef8df44b242b40b528c60c42cc19cb6b31c1e197019bf712713eb3b7998b4efbf96dc2aac29723  musl-dev-1.2.5-r21-armv7-edge.apk
+a5847eb6b71a52d8b348e8ef09953bf9df858f3d3a141a75bba8db7525a83b3143e7ead4b00bdddffad0a21af6a9c01e4d4c8bb27aa8d69ce13dceb58eb43309  musl-1.2.6-r2-armv7-edge.apk
+01ed9d094bee237e8794678572769ec456709e9f58511be2e301f495518ab82f86ceedc2ad03727fe43925c5e3a5a0f18a1d7b244f57107c3f7593edd14e84c4  musl-dev-1.2.6-r2-armv7-edge.apk
 "
@@ -6,9 +6,10 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

+maintainer=""
 pkgname=musl-loongarch64
-pkgver=1.2.5
-pkgrel=21
+pkgver=1.2.6
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-loongarch64:package_dev"

@@ -57,6 +58,6 @@ package_dev() {
 }

 sha512sums="
-ec3cafd077ad5d07aadd75fdefadb6bcb625979eec47f2ac4ac675471c4d57c956c563bbcb1a455fe30b72212047cff8a1d7f4e4d143ad681a1f3c71c98614fd  musl-1.2.5-r21-loongarch64-edge.apk
-6bfff1beebaa45f409e414e3213c1260a98fc6a1345e11f41d23dcc1a7d37380ae21c538e28e72ab1c4ce5370f3e776dad6e827f741358ce85888bf5ab4e027c  musl-dev-1.2.5-r21-loongarch64-edge.apk
+112265a3a4c20cbc03a67fe23c69338332e127d51d3a4ad137547fcc8554a8878425f74f46765a032ba1c36c2782a1f3dcf3102e7bbb3c93a671fb85eba4e000  musl-1.2.6-r2-loongarch64-edge.apk
+45a0953693e6eaa3434e799bc79608dccedfb711cf816ac7dc1bb7ab15ed4a934dfbd0b2ad0b286ac8b8b00f901b99c8e4b06b9f7e50fb69e2d96cc83bbc0304  musl-dev-1.2.6-r2-loongarch64-edge.apk
 "
@@ -6,9 +6,10 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

+maintainer=""
 pkgname=musl-ppc64le
-pkgver=1.2.5
-pkgrel=21
+pkgver=1.2.6
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-ppc64le:package_dev"

@@ -57,6 +58,6 @@ package_dev() {
 }

 sha512sums="
-0e2720a11cd9c4417c96301d71f97dcc65ebe990e0115628aa30fe95debce12db75a716def86b4326074110c5e515f5f6876691c693c72ae211d641a43ba73cf  musl-1.2.5-r21-ppc64le-edge.apk
-fcea40a1616b49350f90fb1f0ba99ea8e7cf40544044133553ef4d70f24376d489fa5ff85c15aa4550e4283915eb172c14429ef439a51cd1ec7e08f3a231ce04  musl-dev-1.2.5-r21-ppc64le-edge.apk
+fa1484bf04b70b27bf6540d8b3f506a334623a160c7d86dd5c58f418dd751eb641c35a0166b485c8ba1bba57f4e929b277352eae5e55cd740a0b73e741f72cc7  musl-1.2.6-r2-ppc64le-edge.apk
+4ea8db19500bcc05e31c1e9c37e43742b150e9218ba585f98b4cde918abd1896431797921f19ff6a82f42d2db245ccfe368ab552c01637d17f19a8ff33db0396  musl-dev-1.2.6-r2-ppc64le-edge.apk
 "
@@ -6,9 +6,10 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

+maintainer=""
 pkgname=musl-riscv64
-pkgver=1.2.5
-pkgrel=21
+pkgver=1.2.6
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

@@ -57,6 +58,6 @@ package_dev() {
 }

 sha512sums="
-c3f9b76c99bd9c1426f4f87b1d60405e3b4fc6c93451d08b72338496b4cefae6692ef0b0ab9f09b78317d944289060b38c0a7072737d92b3f75fbb0fd8e81132  musl-1.2.5-r21-riscv64-edge.apk
-2b28646a759b54c3b2846499c04df7d9b8195da8892a004cbefb69625bbbb874bbc1748ce3d49738931e1e321ab5d90482b08783d07efe28f55d8d1657d451dd  musl-dev-1.2.5-r21-riscv64-edge.apk
+3113c288563199b52e9fbb93a34e16eb87bfe4b7e0872ba0349eec1fc532ea8583565f862b82130fcf416fc006ff661afad1bf549e25d688aa6b055287089c39  musl-1.2.6-r2-riscv64-edge.apk
+8bf4503998a50581af7965407bd25aa41c2716526e6db7683dfb9cce134d9cf401bdeeafd060fd6e5d83ac52852e745c6eafdd406dd59d8f5eea256445f21a3d  musl-dev-1.2.6-r2-riscv64-edge.apk
 "
@@ -6,9 +6,10 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

+maintainer=""
 pkgname=musl-x86
-pkgver=1.2.5
-pkgrel=21
+pkgver=1.2.6
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"

@@ -57,6 +58,6 @@ package_dev() {
 }

 sha512sums="
-6b0da8df450dc4f9b15851a0cdcfc8249f5cc6bedf91ce0d04d6b810b6d2970337345bb8ea83d6b66927be24b88395779b0f660c3511ac2adedbbae76e5c2dc2  musl-1.2.5-r21-x86-edge.apk
-771c4002ede113c134bc00586dcafba4004c3860ca715723d680c5d8916d42a0a888094276d24405a8e6a39ff79e4690f0021fff075909398ae3f7379cdb6c25  musl-dev-1.2.5-r21-x86-edge.apk
+f731bafa153e7b3ea212cc4e13d5c843227374a13530188131184c32f13907057f66af65ff7889a01f7c2b46bae7087f712b09e97ff879e2ed263ebec37432bf  musl-1.2.6-r2-x86-edge.apk
+afc7894a31de08bcfa6b28604625ad7e6cf8cd61394d34bd2ed50ea07c9d4e7ad212cb668439f51599ce2c946a326e196ee01503fe196a4a8dce973ae51d57ef  musl-dev-1.2.6-r2-x86-edge.apk
 "
@@ -6,9 +6,10 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

+maintainer=""
 pkgname=musl-x86_64
-pkgver=1.2.5
-pkgrel=21
+pkgver=1.2.6
+pkgrel=2
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"

@@ -57,6 +58,6 @@ package_dev() {
 }

 sha512sums="
-a378f3015c9222161aaa8ffd34038880f923e7a86cb400dac886d1c1adcf691e55798844f8fa6a4ee3ca9ee4d1a1a5d5ea616a550ac0d99933e64a68c2d65332  musl-1.2.5-r21-x86_64-edge.apk
-87296e7eb778ba4153c6fb27f596561ea7997ee5aa67346aeee9b42687ccb6a5d45e1c1faa2f13d1742e45f47898d78629db3320f640ef8700b55f710584662a  musl-dev-1.2.5-r21-x86_64-edge.apk
+5a10449984203c8f1c3f243310cec43aad11023bf83f5e08f9a15771a6c3545e678ab98a57f9f9b9528f4096d2efa1cda5620006eacef3feb459156588f5b44a  musl-1.2.6-r2-x86_64-edge.apk
+2454ee23df3c3b93aaa366554692a0ab7258b7c9865247c0acde3903ebbe796e4dda982d11f7556b635b3b9cf7cf238628b276f95eabc426d5045c24830c3b2d  musl-dev-1.2.6-r2-x86_64-edge.apk
 "
@@ -2,7 +2,7 @@
 maintainer=""
 pkgname=systemd-boot-x86
 _pkgname=systemd-boot  # for monitoring
-pkgver=259.3
+pkgver=260.1
 pkgrel=0
 pkgdesc="systemd's EFI boot manager for x86 EFI on x86_64."
 url="https://systemd.io/"
@@ -118,7 +118,7 @@ efistub() {
 }

 sha512sums="
-ea7314fcde3c0e541c9399f2d165f114bd7bf37cec294680964352da374435ddd3949432f939f35ecb49f0ce6a3b7aaaddf2b65cc8107abc65e2ec3806c99dac  systemd-259.3.tar.gz
+9f975dce6861853a817a7ceab18a24449a85d1bda6939b3a5173430c02a4d8a9a2b34ebb8cce1c51db9b0ff9078fcc65da7b0f44e3bdcbbe013b9e04bb6f0ff9  systemd-260.1.tar.gz
 8ecb5e25c0d8b01c406fa3084b0910d517cabbf12894958b4d3d77462cb0924f0a52fe2bf1aa39af29b16fd78fe080a6a99daa18015c6059fb2e52c971d83ba9  0001-meson-disable-libintl-check-if-pam-is-disabled.patch
 ad54e2c7e7a21bfa9b5f9e8db1b6af6a6d78a3e5dfe2dafcec77488f6224865ab4d4c8a8c8ee1c54c99d1741361e9fb3a51e5d36bcbc7a1c3fdcc4d0c1672132  cross-x86.meson
 "
@@ -9,6 +9,7 @@ test-{{ device.name }}:
  extends:
    # Extended from jobs defined in ci-common/ci-tron/common.yml
    - .pmos-ci-tron-runner-{{ device.name }}
+    - .pmos-ci-tron-initramfs-test

    # Extended from build-jobs.yaml.j2
    - .device-boot-flow-separate-artifacts
@@ -28,4 +29,6 @@ test-{{ device.name }}:
    CI_TRON_FASTBOOT__RAMDISK_OFFSET: 0x01000000
    CI_TRON_FASTBOOT__TAGS_OFFSET: 0x00000100
    CI_TRON_FASTBOOT__PAGESIZE: 4096
+    # Devices should not have the serial console enabled, but we want it
+    # to be able to get logs. And all qcom devices use the same one!
    CI_TRON_KERNEL_CMDLINE__CONSOLE: "console=ttyMSM0,115200"
@@ -10,7 +10,13 @@ test-{{ device.name }}:
  extends:
    # Extended from jobs defined in ci-common's ci-tron/common.yml
    - .pmos-ci-tron-runner-{{ device.name }}
+    - .pmos-ci-tron-initramfs-test

    # Extended from build-jobs.yaml.j2
    - .device-boot-flow-separate-artifacts
    - .test-{{ device.name }}
+  variables:
+    # FIXME: cmdline is hardcoded here, but ideally would be built from
+    # fragments using generate-kernel-cmdline...
+    # See: https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/issues/317
+    CI_TRON_KERNEL_CMDLINE__DEVICEINFO: 'console=tty1 console=ttyS0,115200 pmos.force-partition-resize psi=1'
@@ -1,3 +1,4 @@
+# Archived: linux-postmarketos-allwinner-d1 moved to archived
 # Reference: <https://postmarketos.org/devicepkg>
 maintainer=""
 pkgname=device-dongshanpi-nezhastu
@@ -1,3 +1,4 @@
+# Archived: the only maintainter don't want to maintain this package anymore
 # Reference: <https://postmarketos.org/devicepkg>
 maintainer="exkc <exxxxkc@getgoogleoff.me>"
 pkgname=device-lenovo-lxf-p5100
@@ -1,7 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-mako-downstream
-pkgver=4
+pkgver=5
 pkgrel=0
 pkgdesc="Google Nexus 4 (Downstream)"
 url="https://postmarketos.org"
@@ -45,7 +45,7 @@ package() {

 sha512sums="
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
-b9984d44b6ce342fb02854eae0171741e0f65cf201f115904434796c77b1dc6f08a2599bad2aa1168f96649d3e6048060f46b306d004846adde1dcf823664c9b  deviceinfo
+f266d3af15602fc04b33f7bb31d6d34562417ecec3c384e3996cc5f98d32bdf3db007f6d74369180041b2a92c77c0d940dc10e9fa581462a432519d9e719859f  deviceinfo
 67a15c9304112e80e54e62da1bfc6c4c0b942f3a125723f6d007afaa07232fe61ec14c515570ae9abf2ef35a8bdd2f4e7df892904b79b0c1b0f54073603ac157  kernel-cmdline.conf
 217bdf692ade75d57968299e29e9379ffcfc97addf735663b3e1e7dfce049f9d13b26347b4405ac724ae5fac2946012dcc58014b23b8df357e225b6718dbc0a6  fb.modes
 52b1465c75c51e2dc2e351a0609220af04b939b9edf7fca844cc00bb9eeb4e71f53e34817ba094e477fc43bf15101fcfd07963c791a36be5c52f199bba6a6d9d  pointercal
@@ -17,7 +17,6 @@ deviceinfo_dev_touchscreen="/dev/input/event2"

 # Fastboot related
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_bootimg="true"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x80200000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -1,3 +1,4 @@
+# Archived: the only maintainter don't want to maintain this package anymore
 # Reference: <https://postmarketos.org/devicepkg>
 maintainer="exkc <exkc@exkc.moe>"
 pkgname=device-linksys-jamaica
@@ -1,3 +1,4 @@
+# Archived: the only maintainter don't want to maintain this package anymore
 # Reference: <https://postmarketos.org/devicepkg>
 maintainer="exkc <exxxxkc@getgoogleoff.me>"
 pkgname=device-mangopi-mq-pro
@@ -1,6 +1,7 @@
+# Archived: Downstream port, only for testing. Use mainline port (qcom-msm89x7)!
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-nokia-panther
-pkgdesc="Nokia 4.2"
+pkgname=device-nokia-panther-downstream
+pkgdesc="Nokia 4.2 (Downstream)"
 pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
@@ -24,6 +25,6 @@ package() {
 }

 sha512sums="
-abd87faa48c0d915ac77c4586241572d3d105593641b3e63f87aa2b467209918d1f661b0a572f2c97adaa0321797d6ff0a5071201a9eb0e69804fa48cf6e2e9a  deviceinfo
+9baec307ae208cf93b1fb2fec9736fde7ab8a5cc2ddc7ee7d1db59153783db8dde210e15f02dc5c8e998516e0dc9ae7f8d6bfabbf5d73a8e8e04865b9bfffdc7  deviceinfo
 b92e49138aed7efa5d4e79a47f1fcd665a159bf59a644a801c8c5af4c62afc6e276901d5bb0829064fa8b77f94493f79f62595d9068de02890c62a8d07516fea  kernel-cmdline.conf
 "
@@ -5,7 +5,7 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Nokia 4.2"
 deviceinfo_manufacturer="Nokia"
-deviceinfo_codename="nokia-panther"
+deviceinfo_codename="nokia-panther-downstream"
 deviceinfo_year="2019"
 deviceinfo_arch="aarch64"

@@ -1,5 +1,6 @@
+# Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-sony-tulip
+pkgname=device-sony-tulip-downstream
 pkgdesc="Sony Xperia M4 Aqua"
 pkgver=4
 pkgrel=0
@@ -1,3 +1,4 @@
+# Archived: depends on firmware-xiaomi-fire
 # Reference: <https://postmarketos.org/devicepkg>
 maintainer="Eray Tutmaz <tarkanttmz261@gmail.com>"
 pkgname=device-xiaomi-fire
@@ -1,3 +1,4 @@
+# Archived: the only maintainter don't want to maintain this package anymore
 maintainer=""
 pkgname=firmware-linksys-jamaica
 pkgver=1
@@ -1,3 +1,4 @@
+# Archived: git repo doesn't exist
 pkgname=firmware-xiaomi-fire
 pkgver=1
 pkgrel=0
@@ -6,13 +7,11 @@ url="https://github.com/mt6768-mainline/firmware-xiaomi-fire"
 arch="aarch64"
 license="proprietary"
 options="!check !tracedeps pmb:cross-native"
-source="$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/1.tar.gz"
+# taken out of source to satisfy checksums
+# $pkgname-$pkgver.tar.gz::$url/archive/refs/tags/1.tar.gz
+source=""
 builddir="$srcdir/firmware-xiaomi-fire-1/lib/firmware"

 package() {
-	install -Dm644 * -t "$pkgdir/lib/firmware/postmarketos"
+	mkdir -p "$pkgdir"
 }
-
-sha512sums="
-86ea073f7fa6da489b671b2b85771bff20138e3b98563eeb70799db4ae0ef7a21af2733afde1c8e8de458a6d25a3ae9bb35dcc15f841bf183d06c03df71b9232  firmware-xiaomi-fire-1.tar.gz
-"
@@ -1,3 +1,4 @@
+# Archived: the only maintainter don't want to maintain this package anymore
 # Kernel config based on : device/community/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.armv7
 maintainer="exkc <exkc@exkc.moe>"
 _flavor="linksys-jamaica"
@@ -1,9 +1,10 @@
+# Archived: Downstream port, only for testing. Use mainline port (qcom-msm89x7)!
 # Reference: <https://postmarketos.org/vendorkernel>

-pkgname=linux-nokia-panther
+pkgname=linux-nokia-panther-downstream
 pkgver=4.9.186
 pkgrel=0
-pkgdesc="Nokia 4.2 Kernel"
+pkgdesc="Nokia 4.2 Kernel (Downstream)"
 arch="aarch64"
 _carch="arm64"
 _flavor="nokia-panther"
@@ -41,6 +42,6 @@ package() {


 sha512sums="
-f903fa4fb6c4f79e9bcc61f332ccc90746a3339bc3a3b2cf60e3ac47799362b99da9fa3ae89b74c8fc5271e00fc7fa887fb9af3b9c3ae5f7153371348c970b6a  linux-nokia-panther-7eb6784e9116b3f4008a18d5740005d0d788f120.tar.gz
+f903fa4fb6c4f79e9bcc61f332ccc90746a3339bc3a3b2cf60e3ac47799362b99da9fa3ae89b74c8fc5271e00fc7fa887fb9af3b9c3ae5f7153371348c970b6a  linux-nokia-panther-downstream-7eb6784e9116b3f4008a18d5740005d0d788f120.tar.gz
 85ffb4ed3dd0b5a75c15d9299b3289bc33a3d788b9a79585dee542000b9b52dca73f5bfece958478938a541435de89d8a64ac15784f6186645047de46be01283  config-nokia-panther.aarch64
 "
@@ -1,3 +1,4 @@
+# Archived: the only maintainter don't want to maintain this package anymore
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: https://github.com/150balbes/build/blob/risc-v/config/kernel/linux-d1-current.config
 # Kernel config based on: arch/riscv/configs/nezha_defconfig
@@ -1,3 +1,4 @@
+# Archived: Downstream port, only for testing, use mainline port instead
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/aosp_kanuti_tulip_defconfig

@@ -1,3 +1,4 @@
+# Archived: depended on by device-xiaomi-fire
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/fire_defconfig
 pkgname=linux-xiaomi-fire
@@ -1,6 +1,6 @@
 maintainer="Richard Acayan <mailingradian@gmail.com>"
 pkgname=alsa-ucm-conf-qcom-sdm670
-pkgver=1.2.9_git20250707
+pkgver=1.2.9_git20260223
 pkgrel=0
 pkgdesc="ALSA UCM configuration for SDM670 devices"
 url="https://gitlab.com/sdm670-mainline/alsa-ucm-conf"
@@ -8,7 +8,7 @@ arch="aarch64"
 license="BSD-3-Clause"
 provides="alsa-ucm-conf"
 provider_priority=1
-_commit="abe7dee6d942965c7a7d5861beacc9cf0b6adbec"
+_commit="2f8edef47f67a308d5fe3370c73f29a021e6a885"
 source="https://gitlab.com/sdm670-mainline/alsa-ucm-conf/-/archive/$_commit/alsa-ucm-conf-$_commit.tar.gz"
 options="!check"

@@ -19,5 +19,5 @@ package() {
 }

 sha512sums="
-beddfa4754a6e24deda3e0a78959a03afc93cb7a7c8e69880fc0f5b3011ea11ab9f36c21ca1c588062b8437f7c599234cad109f04887d35d8c480bf0d548a53d  alsa-ucm-conf-abe7dee6d942965c7a7d5861beacc9cf0b6adbec.tar.gz
+ff65e897310fcade9e2842ffd149dcedd8487e7cb191b7b6e3d702f5fbfadae61602445d5d5b70baff56d08367a85215ba008c6898a2806b61d9e38b4ab7d161  alsa-ucm-conf-2f8edef47f67a308d5fe3370c73f29a021e6a885.tar.gz
 "
@@ -4,7 +4,7 @@ maintainer="Sebastian Fleer <dev@dwurp.de>"
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=12
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,6 +51,9 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/systemd-gru-watchdog.conf \
+	  "$pkgdir"/usr/lib/systemd/system.conf.d/90-gru-watchdog.conf
 }

 nonfree_firmware() {
@@ -65,13 +68,6 @@ openrc() {
 	mkdir "$subpkgdir"
 }

-systemd() {
-	install_if="$pkgname=$pkgver-r$pkgrel systemd"
-	install -Dm644 "$srcdir"/systemd-gru-watchdog.conf \
-	  "$subpkgdir"/usr/lib/systemd/system.conf.d/90-gru-watchdog.conf
-	default_systemd
-}
-
 sha512sums="
 aa8ded3034eae5bca4c3cfd8add13d8aaa4f1f1dde3e86b4c6f001507d4b5a4d89a532adc9813f42a0fa2526db8223643481736eeffaf13bd673d312ecd06adf  deviceinfo
 a750a0c41068082e0b82351d5aec91715e1a5215b09b26fec644dfe259cea2d662e878433a732a8c06dab2a9b420baec2bcc6161d8357cf3ed770239c5165090  modules-initfs
@@ -6,7 +6,7 @@ maintainer="Adam Thiede <me@adamthiede.com>"
 pkgname=device-google-oak
 pkgdesc="Google Oak Chromebooks"
 pkgver=10
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	alsa-utils
 	depthcharge-tools
 	linux-postmarketos-mediatek-mt8173
+	mesa-vulkan-imagination
 	postmarketos-base
 	postmarketos-cros-common
 "
@@ -42,6 +43,6 @@ nonfree_firmware() {

 sha512sums="
 cab64e21c7710d875cac4ed459a7c6ca8547d7234704e8cb80e875a5cfc65cab6cac00be0c3d9b9300e96f9a45c1b315896708b488024dcffc7cb42c850127e0  deviceinfo
-97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb  kernel-cmdline.conf
+09dfc86138379250bc72b3395a4a94257da81d359cb210ee871cfa8efe6450ca3bbd95a134f365bc509bebcde5e882433805d9b265bdd8df12fd85c86491d66f  kernel-cmdline.conf
 4b0197eacfeeb4b13f5abc26950f570ee762742547674ce10110ccea63eb46630a2e3b5f87e9c9a1f9deda21baf05bec248ab7a65656687ec94d296b5657dafa  modules-initfs
 "
@@ -1,2 +1,3 @@
 quiet
 loglevel=2
+powervr.exp_hw_support=1
@@ -3,7 +3,7 @@ maintainer="Henrik Grimler <henrik@grimler.se>"
 pkgname=device-google-peach-pit
 pkgdesc="Samsung Chromebook 2 (11.6 inch)"
 pkgver=10
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -48,7 +48,7 @@ package() {
 i3wm() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
 	install -Dm644 "$srcdir"/90-tap-to-click.conf \
-		"$subpkgdir"/etc/X11/xorg.conf.d/90-tap-to-click.conf
+		"$subpkgdir"/usr/share/X11/xorg.conf.d/90-tap-to-click.conf
 }

 nonfree_firmware() {
@@ -1,8 +1,2 @@
-# Invert the acceleration so it is directed downwards, at rest on a planet.
-# This is for compatibility with iio-sensor-proxy.
-#
-# https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/issues/375
-SUBSYSTEM=="misc", KERNEL=="fastrpc-adsp*", ENV{ACCEL_MOUNT_MATRIX}="-1, 0, 0; 0, -1, 0; 0, 0, -1"
-
 # Be compatible with the fix to CVE 2024-41024.
 SUBSYSTEM=="misc", KERNEL=="fastrpc-adsp-secure", SYMLINK="fastrpc-adsp"
@@ -2,7 +2,7 @@
 maintainer="Richard Acayan <mailingradian@gmail.com>"
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
-pkgver=17
+pkgver=18
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -77,7 +77,7 @@ plasma_camera() {
 }

 sha512sums="
-089ce0acba4e1d789e337bedfca7570796a6416e7230ae9b8fc6b625747a40dbb064b1a707877cd6b7bdc73844c6571316e2ec0746a77060f13d98c52fdbfc00  81-libssc-google-sargo.rules
+e358f0565b95cd5d39dd5bc07645c6e0f94679c93b120b72bd2b6082b7f919e990a6a78e03edc0db045f8fc5e3363377c69fb8e42107298868ec319740c29210  81-libssc-google-sargo.rules
 6625f41b5348bd45e47f56dc3b4a8aa07430939ae76e082d645397db6680182a7174a1b897ad8b7019e6211220a8f3712eeac6eb2e9b55c4e1434e964729de97  deviceinfo
 b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd.confd
 925d8b176a8f1b47a86a1026cc920ffae99ceb35c3e52c222654c15078907579d23c4d68ed65a98ab937f59aaba2bbdd74da8d273e8b9c1ac87a52f718d383d6  modules-initfs
@@ -2,7 +2,7 @@
 maintainer="Danct12 <danct12@disroot.org>"
 pkgname=device-nokia-n900
 pkgver=51
-pkgrel=4
+pkgrel=5
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -182,9 +182,9 @@ x11() {
 	install -D -m644 "$srcdir"/acpi.map \
 		"$pkgdir"/etc/acpi.map
 	install -D -m644 "$srcdir"/40-xkb.conf \
-		"$subpkgdir"/etc/X11/xorg.conf.d/40-xkb.conf
+		"$subpkgdir"/usr/share/X11/xorg.conf.d/40-xkb.conf
 	install -D -m644 "$srcdir"/xorg.conf \
-		"$subpkgdir"/etc/X11/xorg.conf.d/11-n900.conf
+		"$subpkgdir"/usr/share/X11/xorg.conf.d/11-n900.conf
 	install -Dm755 "$srcdir"/lock.sh \
 		"$subpkgdir"/usr/bin/lock.sh
 	install -Dm644 "$srcdir"/xresources \
@@ -2,7 +2,7 @@
 maintainer="Henrik Grimler <henrik@grimler.se>"
 pkgname=device-odroid-xu4
 pkgdesc="ODROID XU4"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,7 +26,7 @@ package() {
 }

 sha512sums="
-ee1b15e55366bb7dbe45e35053f670aa68f74b8603239575cf41ad7bd209a90123670a70363d14fe3adf5ac323f1103dc638e3eb8c031c63e0b8d7fcf3654e5b  deviceinfo
+0f1f9f655f9b73b18598ddd5690904861fa63ff6e8855d9b4bead3a40c69b6a97606267eb623fb23028cfa13da98feba687b9e7e6b3dff4f6f8d2846b808c8ba  deviceinfo
 da521908455bec78086df8614e2a9f0cd871155f91d65d351670fdcf3e2880bfb1d578aab26f3dd3778ce3ebf27efbde67d65f39f5f733da5c750e33161ecc9b  kernel-cmdline.conf
-9f6c3cc0079e718ef0dfc221fadaf9bc092a8601b62794c2298eab893924af457612bd8a6e852fb2b181bee637e774dd2abea681eb72b1aa9c6672e686454795  modules-initfs
+36ce87dcf1bbb49637e8ab7e75325ce41541ccfd7d6ac35edbc8269db319c2201f9d12c6263f8761424ad0d59b2bfa9c523b8200584f753b7264a7c7a2928d90  modules-initfs
 "
@@ -9,7 +9,6 @@ deviceinfo_codename="odroid-xu4"
 deviceinfo_year="2015"
 deviceinfo_dtb="exynos5422-odroidxu4"
 deviceinfo_arch="armv7"
-deviceinfo_no_framebuffer="true"
 deviceinfo_getty="ttySAC2;115200"
 deviceinfo_disable_dhcpd="true"

@@ -1,5 +1,8 @@
-uas
-usb-storage
+exynosdrm
+hid_generic
 scsi_mod
 sd_mod
 t10_pi
+uas
+usb-storage
+usbhid