device-valve-jupiter: drop aport

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
linux-valve-jupiter: drop aport
2026-03-01 18:25:14 -08:00 · 2026-03-01 18:25:14 -08:00 · 2026-03-01 18:25:14 -08:00 · 2026-03-01 18:25:14 -08:00 · 2026-03-01 18:25:08 -08:00
797 changed files with 21915 additions and 75171 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/main
+	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/master
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi

@@ -1,4 +1,4 @@
-image: registry.alpinelinux.org/img/alpine:3.23
+image: registry.alpinelinux.org/img/alpine:latest
 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 %}
+{% for device in devices_under_test if device.is_present_in_ci %}
 prepare-{{ device.name }}:
  stage: hardware tests
  extends:
    .pmos-ci-tron-build-boot-artifacts
  {%- if device.has_kernel_variants %}
-  # Build all the boot artifacts for all the supported kernel variants in
+  # Let's 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,8 +112,10 @@ prepare-{{ device.name }}:

 .test-{{ device.name }}:
  stage: hardware tests
+  extends:
+    - .pmos-ci-tron-initramfs-test
  {%- if device.has_kernel_variants %}
-  # Test all the kernels in different jobs, but hide them behind a single
+  # Let's test all the kernels in different jobs, but hide them behind a single
  # job name so as not to pollute the pipeline.
  parallel:
    matrix:
@@ -133,6 +135,10 @@ 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/main
+	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/master
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi

@@ -129,17 +129,6 @@ 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/main:main/hello-world/APKBUILD"
+    # Run something like "git show upstream/master: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://docs.postmarketos.org/pmaports/main/packaging-guidelines.html#package-versioning-pkgver-pkgrel")
+                  "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
            error = True

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

-            # 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
+            # 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

        # 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 main and stable"
+                        " enough (all devices in pmaports master 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 main to retrieve the upstream branch.
+        channels.cfg from master 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/main:channels.cfg"])
+    channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"])
    channels_cfg = configparser.ConfigParser()
    channels_cfg.read_string(channels_cfg_str)
    assert channel in channels_cfg, \
@@ -139,14 +139,7 @@ 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/)
-        # * documentation
-        if (
-                not dirname
-                or file.startswith(".")
-                or "/." in file
-                or skip_archived and dirname.startswith("device/archived")
-                or dirname == "docs"
-        ):
+        if not dirname or file.startswith(".") or "/." in file or skip_archived and dirname.startswith("device/archived"):
            continue

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

 import common
-import glob
 import os.path
 import subprocess
 import sys
@@ -12,15 +11,9 @@ if __name__ == "__main__":
    if common.commit_message_has_string("[ci:skip-dint]"):
        print("WARNING: not linting deviceinfo files ([ci:skip-dint])")
        exit(0)
-
-    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/")}
+    # 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,6 +44,10 @@ 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
@@ -73,7 +77,7 @@ class Device:
        return {"postmarketos-mkinitfs-hook-ci"}

    @cached_property
-    def package_dependencies(self) -> set[str]:
+    def package_dependencies(self) -> list[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"}
@@ -125,7 +129,7 @@ class Device:
                    dev = cls(device.codename)

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

@@ -1,16 +0,0 @@
-#!/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 .
@@ -1,2 +0,0 @@
-[tool.mypy]
-disable_error_code = ["import-not-found"]
@@ -16,10 +16,6 @@ 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,18 +62,6 @@ 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
@@ -128,7 +116,6 @@ 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 (`main` branch)
+* [ ] edge (`master` branch)
 * [ ] `v25.12`

 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
@@ -1,11 +0,0 @@
-<!-- Use this template to kick off the discussion for a package with (presumably)
-     inactive maintainers and the future for the maintainership of the package.
-->
-
-### Information
-
-* Package name:
-* Maintainers of the package:
-* MR that had no maintainer response, if applicable:
-
-/label ~maintainership-status
@@ -5,12 +5,10 @@ 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)
-* [Approval rules](docs/approval-rules.md)
+* [Review and merging guidelines](./docs/modules/ROOT/pages/merging-rules.adoc)
 * [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=main
+branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge

@@ -1,31 +0,0 @@
-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,6 +1,7 @@
 # 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
@@ -22,7 +23,6 @@ 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=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ 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
@@ -797,7 +796,6 @@ 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
 "
@@ -1,31 +0,0 @@
-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,6 +1,7 @@
 # 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
@@ -22,7 +23,6 @@ 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=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ 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
@@ -797,7 +796,6 @@ 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
 "
@@ -1,31 +0,0 @@
-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,6 +1,7 @@
 # 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
@@ -22,7 +23,6 @@ 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=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ 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
@@ -797,7 +796,6 @@ 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
 "
@@ -1,31 +0,0 @@
-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,6 +1,7 @@
 # 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
@@ -22,7 +23,6 @@ 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=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for loongarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ 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
@@ -797,7 +796,6 @@ 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
 "
@@ -1,31 +0,0 @@
-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,6 +1,7 @@
 # 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
@@ -22,7 +23,6 @@ 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=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for ppc64le"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ 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
@@ -797,7 +796,6 @@ 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
 "
@@ -1,31 +0,0 @@
-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,6 +1,7 @@
 # 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
@@ -22,7 +23,6 @@ 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=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ 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
@@ -797,7 +796,6 @@ 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
 "
@@ -1,31 +0,0 @@
-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,6 +1,7 @@
 # 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
@@ -22,7 +23,6 @@ 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=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for x86"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -279,7 +279,6 @@ 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
@@ -797,7 +796,6 @@ 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
 "
@@ -1,31 +0,0 @@
-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,6 +1,7 @@
 # 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
@@ -22,7 +23,6 @@ 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=3
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="https://gcc.gnu.org"
 arch="aarch64"
@@ -279,7 +279,6 @@ 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
@@ -797,7 +796,6 @@ 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,10 +6,9 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 	arch_to_hostspec() { :; }
 fi

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 sha512sums="
-9f975dce6861853a817a7ceab18a24449a85d1bda6939b3a5173430c02a4d8a9a2b34ebb8cce1c51db9b0ff9078fcc65da7b0f44e3bdcbbe013b9e04bb6f0ff9  systemd-260.1.tar.gz
+1cb677c98a56210948bfc9a6e296aa92dde030ceeca6b6e4fe3f4014d051f4d0f1d83584cfdceb921d7d578952b85112b2ba497385faefca4d6c871bf8de48cf  systemd-259.2.tar.gz
 8ecb5e25c0d8b01c406fa3084b0910d517cabbf12894958b4d3d77462cb0924f0a52fe2bf1aa39af29b16fd78fe080a6a99daa18015c6059fb2e52c971d83ba9  0001-meson-disable-libintl-check-if-pam-is-disabled.patch
 ad54e2c7e7a21bfa9b5f9e8db1b6af6a6d78a3e5dfe2dafcec77488f6224865ab4d4c8a8c8ee1c54c99d1741361e9fb3a51e5d36bcbc7a1c3fdcc4d0c1672132  cross-x86.meson
 "
@@ -9,7 +9,6 @@ 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
@@ -29,6 +28,4 @@ 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,13 +10,7 @@ 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'
@@ -0,0 +1,147 @@
+# Archived: linux-radxa-dev packages x86_64 binaries in aarch64 package which makes akms part of this device fail when built on aarch64
+# Reference: <https://postmarketos.org/devicepkg>
+maintainer="Antoine Martin (ayakael) <dev@ayakael.net>"
+pkgname=device-clockworkpi-uconsole-radxa-cm5
+pkgdesc="Clockwork Tech ClockworkPi uConsole Radxa CM5"
+pkgver=6
+_commit=2e8040ec92f85e3d43caf3e44557cb0659db4531
+_dtso_commit=c2204834e1d7d0acfd64e1b7874d432bc142f1a4
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!archcheck"
+depends="
+	linux-radxa
+	postmarketos-base
+	u-boot-radxa-cm5
+"
+makedepends="
+	devicepkg-dev
+	clang
+	dtc
+	linux-radxa
+	linux-radxa-dev
+	"
+subpackages="
+	$pkgname-openrc
+	$pkgname-x11
+	$pkgname-akms
+"
+source="
+	clockworkradxa-linux-$_commit.tar.gz::https://github.com/ak-rex/ClockworkRadxa-linux/archive/$_commit.tar.gz
+	radxa-cm5-uconsole-$_dtso_commit.tar.gz::https://github.com/dev-null2019/radxa-cm5-uconsole/archive/$_dtso_commit.tar.gz
+
+	deviceinfo
+	kernel-cmdline.conf
+	modules-initfs
+	modules-load.conf
+	modprobe.conf
+	xorg.conf
+
+	driver-makefile.in
+	driver-akmbuild.in
+"
+builddir="$srcdir"/ClockworkRadxa-linux-$_commit
+
+# Location of out-of-tree drivers to be built using AKMS
+_drivers="
+	drivers/pinctrl/pinctrl-axp209.c
+	drivers/power/supply/axp20x_usb_power.c
+	drivers/iio/adc/axp20x_adc.c
+	drivers/iio/adc/ti-adc081c.c
+	drivers/mfd/axp20x-i2c.c
+	drivers/mfd/axp20x.c
+	drivers/regulator/axp20x-regulator.c
+	drivers/input/misc/axp20x-pek.c
+	drivers/power/supply/axp20x_ac_power.c
+	drivers/power/supply/axp20x_battery.c
+	drivers/video/backlight/ocp8178_bl.c
+	drivers/gpu/drm/panel/panel-cwu50.c
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+
+	local _modules=
+	local _objects=
+	local _file=
+
+	# setup akms folder
+	# this also generates information to complete AKMBUILD and Makefile
+	mkdir -p "$builddir"/akms
+	for driver in $_drivers; do
+		_file=${driver##*\/}
+		cp "$builddir"/$driver "$builddir"/akms/$_file
+		_modules="$_modules ${_file/.c/.ko}"
+		_objects="$_objects ${_file/.c/.o}"
+	done
+	sed -e "s/%%MODVER%%/$pkgver/" -e "s/%%DRIVER_MOD%%/$_modules/" "$srcdir"/driver-akmbuild.in > "$builddir"/akms/AKMBUILD
+	sed "s/%%DRIVER_OBJ%%/$_objects/" "$srcdir"/driver-makefile.in > "$builddir"/akms/Makefile
+
+	# generate dtbo for uconsole
+	_kernel_ver=$(find /lib/modules -maxdepth 1 -mindepth 1 | sed 's|.*/||g')
+	cp -r "$srcdir"/radxa-cm5-uconsole-$_dtso_commit/devicetree_overlays "$builddir"/dtso
+	echo ">>> Generating dtbo against $_kernel_ver"
+	for dts in "$builddir"/dtso/*.dts; do
+		cpp -nostdinc -I "/usr/src/linux-headers-$_kernel_ver/include" -I arch -undef -x assembler-with-cpp $dts $dts.preprocessed
+		dtc -O dtb -o ${dts/.dts/.dtbo} $dts.preprocessed
+	done
+}
+
+x11() {
+	install_if="$pkgname xorg-server"
+	install -Dm644 "$srcdir"/xorg.conf \
+		"$subpkgdir"/etc/X11/xorg.conf.d/10-monitor.conf
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	# merge dtbos with soc dtb for uconsole
+	mkdir -p "$pkgdir"/boot/dtbs/rockchip
+	fdtoverlay -i /boot/dtbs/rockchip/rk3588s-radxa-cm5-rpi-cm4-io.dtb "$builddir"/dtso/*.dtbo -o "$pkgdir"/boot/dtbs/rockchip/rk3588s-radxa-cm5-uconsole.dtb
+}
+
+# Test build of drivers against kernel
+check() {
+	_kernel_ver=$(find /lib/modules -maxdepth 1 -mindepth 1 | sed 's|.*/||g')
+	for ver in $_kernel_ver; do
+		echo ">>> Testing module build against $ver"
+		cp -R "$builddir"/akms "$builddir"/akms-$ver
+		(
+			cd "$builddir"/akms-$ver
+			make KVER=$ver
+		)
+	done
+}
+
+akms() {
+	pkgdesc="uConsole kernel module (AKMS)"
+	depends="akms linux-radxa-dev build-base"
+	install_if="$pkgname=$pkgver-r$pkgrel"
+
+	mkdir -p "$subpkgdir"/usr/src
+	cp -R "$builddir"/akms "$subpkgdir"/usr/src/clockworkpi-radxa
+	chmod -R u=rwX,go=rX-w "$subpkgdir"/usr/src/clockworkpi-radxa
+}
+
+openrc() {
+	depends=openrc
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	mkdir -p "$subpkgdir"
+}
+
+sha512sums="
+a9c48c3470d5641113e351456d6cfa1e2283e6577cf54eea9a2d49ba4f6269e46cba16039584b34e07c7d8006f6dec112e970148f155f2c3ff0670521568a5a7  clockworkradxa-linux-2e8040ec92f85e3d43caf3e44557cb0659db4531.tar.gz
+a15eb74d9db9114022e96ba04542d18350cf6d637c5efa49f4a5a65c33c5fd20a7997095a049a561fb7aac767a299f367489c5a342138a5259cc32ebb6152384  radxa-cm5-uconsole-c2204834e1d7d0acfd64e1b7874d432bc142f1a4.tar.gz
+0afdcebb4b42ab9d489bfeb32912f03de0ee30875eba760112b24def4bb04185eca5f827c737da4824081940ec998c2c26a99e9105267e90e9d852b0afa76539  deviceinfo
+fa6332b91b62572528b1f919370382d67f521b0a65c3c9f416df67545ebae7b01f31729340a42e656b5589cdbde676ec8fe0eb9537a34e02ec20f5309bf43b12  kernel-cmdline.conf
+85d573bfd51ac4aa502336452b0384af77b6ec095f5c4760e8f287b8452b3ccb4521051bc01c53fa0856440d52231f535f3f0258d62ad578161ad464344413e9  modules-initfs
+642cdb1b4ac02b8c3ab7b72f4eeef615ac4911b42bcd845b54305f0ff64c07b86f4a807a97d395cb6c0cd0a5f5eed15e68d9e4ccb69db8e38fb65c8be4acaeeb  modules-load.conf
+a5324ed5118168b846d359dc2c8e76ccdc624003d157a28e4c9728ddedd9b52c6deb95af9c3a9d94faf52413f2f830dc45ec6c0093458d27149ef17de5dceef5  modprobe.conf
+939cb4ca50e0f54258dd92bdfbf91e6fa7b33b386022d058ba0d4b4e4f6d855cba9f5fffda0652f18c8b9b95d5dbbfc766e0931f0de53841f96d9d8975bf27e7  xorg.conf
+51a1fc5ba9336e784fe8dfb97eed8d3f51fd181a9a76c5266e227e1670aa423fdaec04b869795a2abd5afca6d472a1f107f30a0f0efd242ee16c8910773ddcc2  driver-makefile.in
+576346f3e5611dcba4fd3a5f5bf97e51febb844ff8006b5e4e8aba429df0c1835f702548d61120439cf0279b56d337f4ab9e2389ae8fa0c024b0a3afd4422b2f  driver-akmbuild.in
+"
@@ -0,0 +1,26 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Clockwork Tech ClockworkPi uConsole Radxa CM5"
+deviceinfo_manufacturer="Clockwork Tech"
+deviceinfo_codename="clockworkpi-uconsole-radxa-cm5"
+deviceinfo_year="2023"
+deviceinfo_arch="aarch64"
+deviceinfo_disable_dhcpd="true"
+
+# Device related
+deviceinfo_drm="true"
+deviceinfo_chassis="embedded"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1280"
+deviceinfo_screen_height="720"
+deviceinfo_getty="ttyFIQ0;1500000"
+
+# Bootloader related
+deviceinfo_boot_filesystem="fat32"
+deviceinfo_dtb="rockchip/rk3588s-radxa-cm5-uconsole"
+deviceinfo_sd_embed_firmware="u-boot/radxa-cm5/rpi-cm4-io/idbloader.img:64,u-boot/radxa-cm5/rpi-cm4-io/u-boot.itb:16384"
+deviceinfo_sd_embed_firmware_step_size="512"
+deviceinfo_boot_part_start="32768"
+deviceinfo_generate_extlinux_config="true"
@@ -0,0 +1,3 @@
+modname=clockworkpi-radxa
+modver=%%MODVER%%
+built_modules='%%DRIVER_MOD%%'
@@ -0,0 +1,10 @@
+obj-m += %%DRIVER_OBJ%%
+USER  := $(shell whoami)
+KVER ?= $(shell uname -r)
+KDIR ?= /lib/modules/$(KVER)/build
+
+all:
+	make -C $(KDIR) M=$(PWD) modules
+
+clean:
+	make -C $(KDIR) M=$(PWD) clean
@@ -1,7 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-mako-downstream
-pkgver=5
+pkgver=4
 pkgrel=0
 pkgdesc="Google Nexus 4 (Downstream)"
 url="https://postmarketos.org"
@@ -45,7 +45,7 @@ package() {

 sha512sums="
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
-f266d3af15602fc04b33f7bb31d6d34562417ecec3c384e3996cc5f98d32bdf3db007f6d74369180041b2a92c77c0d940dc10e9fa581462a432519d9e719859f  deviceinfo
+b9984d44b6ce342fb02854eae0171741e0f65cf201f115904434796c77b1dc6f08a2599bad2aa1168f96649d3e6048060f46b306d004846adde1dcf823664c9b  deviceinfo
 67a15c9304112e80e54e62da1bfc6c4c0b942f3a125723f6d007afaa07232fe61ec14c515570ae9abf2ef35a8bdd2f4e7df892904b79b0c1b0f54073603ac157  kernel-cmdline.conf
 217bdf692ade75d57968299e29e9379ffcfc97addf735663b3e1e7dfce049f9d13b26347b4405ac724ae5fac2946012dcc58014b23b8df357e225b6718dbc0a6  fb.modes
 52b1465c75c51e2dc2e351a0609220af04b939b9edf7fca844cc00bb9eeb4e71f53e34817ba094e477fc43bf15101fcfd07963c791a36be5c52f199bba6a6d9d  pointercal
@@ -17,6 +17,7 @@ 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"
@@ -0,0 +1,145 @@
+# Archived: -dev packages x86_64 binaries in aarch64 package which makes akms part of device-clockworkpi-uconsole-radxa-cm5 fail when built on aarch64
+# Reference: <https://postmarketos.org/vendorkernel>
+# Kernel config based on: arch/arm64/configs/rockchip_linux_defconfig
+maintainer="Antoine Martin (ayakael) <dev@ayakael.net>"
+pkgname=linux-radxa
+pkgver=6.1.115
+pkgrel=1
+pkgdesc="Radxa kernel fork"
+arch="aarch64"
+_carch="arm64"
+_flavor="radxa"
+url="https://kernel.org"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps pmb:cross-native"
+subpackages="$pkgname-dev:_dev:$CBUILD_ARCH"
+makedepends="
+	bash
+	bc
+	bison
+	devicepkg-dev
+	dtc
+	flex
+	findutils
+	installkernel
+	linux-firmware
+	linux-headers
+	openssl-dev
+	perl
+	xz
+"
+
+# Source
+_repository="kernel"
+_commit="74729d7c051026f99138b6e0e60d580c0bf226db"
+_config="config-$_flavor.$arch"
+source="
+	$pkgname-$_commit.tar.gz::https://github.com/radxa/$_repository/archive/$_commit.tar.gz
+	$_config
+	postmarketos-defconfig.patch
+"
+builddir="$srcdir/$_repository-$_commit"
+_builddir="$srcdir"/build-$_flavor.$CARCH
+
+prepare() {
+	default_prepare
+
+	mkdir -p "$_builddir"
+	cp "$srcdir/config-$_flavor.$CARCH" "$_builddir"/.config
+
+	# copies missing library
+	mkdir -p "$_builddir"/drivers/gpu/arm/bifrost/
+	cp "$builddir"/drivers/gpu/arm/bifrost/mali_csffw.bin "$_builddir"/drivers/gpu/arm/bifrost/mali_csffw.bin
+
+	# remove and regenerate localversion
+	rm -f localversion*
+	echo "-$pkgrel-$_flavor" > "$_builddir"/localversion-postmarketos
+
+	make -C "$builddir" \
+		O="$_builddir" \
+		ARCH="$_carch" \
+		olddefconfig
+}
+
+build() {
+	unset LDFLAGS
+	cd "$_builddir"
+	local _kver=$(make kernelversion)
+	if [ "$_kver" != "$pkgver" ]; then
+		error "Version in Makefile ($_kver) does not correspond with pkgver ($pkgver)"
+		return 1
+	fi
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS"
+}
+
+package() {
+	downstreamkernel_package "$_builddir" "$pkgdir" "$_carch" "$_flavor"
+
+	cd "$_builddir"
+	mkdir -p "$pkgdir"/boot
+	make modules_install dtbs_install \
+		ARCH="$_carch" \
+		INSTALL_PATH="$pkgdir"/boot \
+		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_MOD_STRIP=1 \
+		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs
+	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
+}
+
+_dev() {
+	cd "$_builddir"
+	local _abi_release="$(make -s kernelrelease)"
+	# copy the only the parts that we really need for build 3rd party
+	# kernel modules and install those as /usr/src/linux-headers,
+	# simlar to what ubuntu does
+	#
+	# this way you dont need to install the 300-400 kernel sources to
+	# build a tiny kernel module
+	#
+	pkgdesc="Headers and script for third party modules for $_flavor kernel"
+	depends="$_depends_dev"
+
+	local dir="$subpkgdir"/usr/src/linux-headers-$_abi_release
+
+	# first we import config, run prepare to set up for building
+	# external modules, and create the scripts
+	mkdir -p "$dir"
+	cp "$_builddir"/.config "$dir"/.config
+	echo "-$pkgrel-$_flavor" > "$dir"/localversion-postmarketos
+
+	make -j1 -C "$builddir" ARCH="$_carch" O="$dir" \
+		syncconfig prepare modules_prepare scripts
+
+	# remove the stuff that points to real sources. we want 3rd party
+	# modules to believe this is the sources
+	rm "$dir"/Makefile "$dir"/source
+
+	# copy the needed stuff from real sources
+	#
+	# this is taken from ubuntu kernel build script
+	# http://kernel.ubuntu.com/git/ubuntu/ubuntu-zesty.git/tree/debian/rules.d/3-binary-indep.mk
+	cd "$builddir"
+	find .  -path './include/*' -prune \
+		-o -path './scripts/*' -prune -o -type f \
+		\( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \
+		   -name '*.sh' -o -name '*.pl' -o -name '*.lds' \) \
+		-print | cpio -pdm "$dir"
+
+	cp -a scripts include "$dir"
+	find $(find arch -name include -type d -print) -type f \
+		| cpio -pdm "$dir"
+
+	install -Dm644 "$_builddir"/Module.symvers \
+		"$dir"/Module.symvers
+
+	mkdir -p "$subpkgdir"/lib/modules/$_abi_release
+	ln -sf /usr/src/linux-headers-$_abi_release \
+		"$subpkgdir"/lib/modules/$_abi_release/build
+}
+
+sha512sums="
+3c268ca3eaaa6bbffce9759f963ec6030a4a4d2c3b8ed5e130ca5c29d25bad78e43faa575fbc6c1f90ffdbffea39db6a569f073d1917547a4bfbe7b8bf506578  linux-radxa-74729d7c051026f99138b6e0e60d580c0bf226db.tar.gz
+e23a8fb644bca3e18c399112b1f0f569ddcda37d1cceb2fdef82ef97993071ee085c16c35898a22222988876af5456bc422bb247d501ff6725aa7c6cc7367522  config-radxa.aarch64
+a9ec1018a798ee26cb864933dd3aa1d460e6e40a30c55cb0fdd56806031f3b2755d3823d6c30f7bcc1d2bb71d3cabe7a409f46a2e5ff78dc9ff5a31108709758  postmarketos-defconfig.patch
+"
@@ -2,14 +2,14 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.1.115 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 15.2.0) 15.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.3.0) 14.3.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=150200
+CONFIG_GCC_VERSION=140300
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24501
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24501
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -739,11 +739,10 @@ CONFIG_MODVERSIONS=y
 CONFIG_ASM_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS_NONE is not set
+CONFIG_MODULE_COMPRESS_NONE=y
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS_XZ is not set
-CONFIG_MODULE_COMPRESS=y
-CONFIG_MODULE_COMPRESS_ZSTD=y
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
@@ -2399,7 +2398,7 @@ CONFIG_BCACHE=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_ASYNC_REGISTRATION is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=y
+CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
 # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
@@ -2426,7 +2425,6 @@ CONFIG_DM_MULTIPATH_ST=m
 # CONFIG_DM_MULTIPATH_IOA is not set
 CONFIG_DM_DELAY=m
 # CONFIG_DM_DUST is not set
-# CONFIG_DM_INIT is not set
 # CONFIG_DM_UEVENT is not set
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2885,11 +2883,8 @@ CONFIG_BRCMFMAC_PROTO_BCDC=y
 CONFIG_BRCMFMAC_SDIO=y
 # CONFIG_BRCMFMAC_USB is not set
 # CONFIG_BRCMFMAC_PCIE is not set
-# CONFIG_BRCMFMAC_BT_SHARED_SDIO is not set
-# CONFIG_INFFMAC_BT_SHARED_SDIO is not set
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
-# CONFIG_BRCMFMAC_PCIE_BARWIN_SZ is not set
 CONFIG_WLAN_VENDOR_CISCO=y
 CONFIG_WLAN_VENDOR_INTEL=y
 # CONFIG_IPW2100 is not set
@@ -3072,7 +3067,7 @@ CONFIG_INPUT_FF_MEMLESS=y
 #
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set

 #
@@ -3286,7 +3281,6 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
-CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PWM_BEEPER is not set
@@ -3389,7 +3383,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NULL_TTY=m
+CONFIG_NULL_TTY=y
 # CONFIG_HVC_DCC is not set
 # CONFIG_RPMSG_TTY is not set
 CONFIG_SERIAL_DEV_BUS=y
@@ -3612,7 +3606,6 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AXP209=m
 # CONFIG_PINCTRL_CY8C95X0 is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
@@ -3787,9 +3780,6 @@ CONFIG_BATTERY_SBS=y
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_MANAGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
-CONFIG_CHARGER_AXP20X=m
-CONFIG_BATTERY_AXP20X=m
-CONFIG_AXP20X_POWER=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -4074,8 +4064,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_ATMEL_HLCDC is not set
 # CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_BD9571MWV is not set
-CONFIG_MFD_AXP20X=y
-CONFIG_MFD_AXP20X_I2C=y
+# CONFIG_MFD_AXP20X_I2C is not set
 # CONFIG_MFD_MADERA is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
@@ -4210,7 +4199,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_ACT8865=y
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_ARM_SCMI is not set
-CONFIG_REGULATOR_AXP20X=y
 # CONFIG_REGULATOR_DA9121 is not set
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
@@ -5272,7 +5260,6 @@ CONFIG_DRM_PANEL_RASPITS_TC358762=y
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
-CONFIG_DRM_PANEL_CWU50=m
 # end of Display Panels

 CONFIG_DRM_BRIDGE=y
@@ -5325,7 +5312,7 @@ CONFIG_DRM_ANALOGIX_DP=y
 # CONFIG_DRM_CDNS_MHDP8546 is not set
 CONFIG_DRM_DW_HDMI=y
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=y
 # CONFIG_DRM_DW_HDMI_GP_AUDIO is not set
 CONFIG_DRM_DW_HDMI_CEC=y
 CONFIG_DRM_DW_MIPI_DSI=y
@@ -5518,7 +5505,6 @@ CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_ARCXCNN is not set
 # CONFIG_BACKLIGHT_LED is not set
-CONFIG_BACKLIGHT_OCP8178=m
 # end of Backlight & LCD device support

 #
@@ -5588,21 +5574,21 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_LOGO is not set
 # end of Graphics support

-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
 CONFIG_SND_PCM_ELD=y
 CONFIG_SND_PCM_IEC958=y
-CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_SEQ_DEVICE=m
-CONFIG_SND_RAWMIDI=m
+CONFIG_SND_DMAENGINE_PCM=y
+CONFIG_SND_HWDEP=y
+CONFIG_SND_SEQ_DEVICE=y
+CONFIG_SND_RAWMIDI=y
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
 # CONFIG_SND_OSSEMUL is not set
 CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_HRTIMER=m
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_SUPPORT_OLD_API is not set
@@ -5612,11 +5598,11 @@ CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_CTL_FAST_LOOKUP=y
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_CTL_INPUT_VALIDATION is not set
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER=y
+CONFIG_SND_SEQ_DUMMY=y
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=m
-CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EVENT=y
+CONFIG_SND_SEQ_MIDI=y
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_ALOOP is not set
@@ -5635,7 +5621,7 @@ CONFIG_SND_DRIVERS=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 # CONFIG_SND_SPI is not set
 CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 # CONFIG_SND_USB_UA101 is not set
 # CONFIG_SND_USB_CAIAQ is not set
@@ -5646,7 +5632,7 @@ CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 # CONFIG_SND_USB_PODHD is not set
 # CONFIG_SND_USB_TONEPORT is not set
 # CONFIG_SND_USB_VARIAX is not set
-CONFIG_SND_SOC=m
+CONFIG_SND_SOC=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_DYNAMIC_DMA_CHAN is not set
 # CONFIG_SND_SOC_ADI is not set
@@ -5678,27 +5664,27 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
-CONFIG_SND_SOC_ROCKCHIP=m
-CONFIG_SND_SOC_ROCKCHIP_ASRC=m
-CONFIG_SND_SOC_ROCKCHIP_DLP=m
-CONFIG_SND_SOC_ROCKCHIP_DLP_PCM=m
+CONFIG_SND_SOC_ROCKCHIP=y
+CONFIG_SND_SOC_ROCKCHIP_ASRC=y
+CONFIG_SND_SOC_ROCKCHIP_DLP=y
+CONFIG_SND_SOC_ROCKCHIP_DLP_PCM=y
 # CONFIG_SND_SOC_ROCKCHIP_DUMMY_DAI is not set
-CONFIG_SND_SOC_ROCKCHIP_I2S=m
-CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
+CONFIG_SND_SOC_ROCKCHIP_I2S=y
+CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y
 # CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES is not set
-CONFIG_SND_SOC_ROCKCHIP_MULTI_DAIS=m
-CONFIG_SND_SOC_ROCKCHIP_PDM=m
-CONFIG_SND_SOC_ROCKCHIP_PDM_V2=m
-CONFIG_SND_SOC_ROCKCHIP_SAI=m
+CONFIG_SND_SOC_ROCKCHIP_MULTI_DAIS=y
+CONFIG_SND_SOC_ROCKCHIP_PDM=y
+CONFIG_SND_SOC_ROCKCHIP_PDM_V2=y
+CONFIG_SND_SOC_ROCKCHIP_SAI=y
 # CONFIG_SND_SOC_ROCKCHIP_SAI_VERBOSE is not set
-CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
-CONFIG_SND_SOC_ROCKCHIP_SPDIFRX=m
-CONFIG_SND_SOC_ROCKCHIP_TRCM=m
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
+CONFIG_SND_SOC_ROCKCHIP_SPDIFRX=y
+CONFIG_SND_SOC_ROCKCHIP_TRCM=y
 # CONFIG_SND_SOC_ROCKCHIP_VAD is not set
-CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
-CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=m
-CONFIG_SND_SOC_ROCKCHIP_RT5645=m
-CONFIG_SND_SOC_ROCKCHIP_HDMI=m
+CONFIG_SND_SOC_ROCKCHIP_MAX98090=y
+CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=y
+CONFIG_SND_SOC_ROCKCHIP_RT5645=y
+CONFIG_SND_SOC_ROCKCHIP_HDMI=y
 # CONFIG_SND_SOC_RK3288_HDMI_ANALOG is not set
 # CONFIG_SND_SOC_RK3399_GRU_SOUND is not set
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set
@@ -5712,7 +5698,7 @@ CONFIG_SND_SOC_ROCKCHIP_HDMI=m
 # CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
 # CONFIG_SND_SOC_XILINX_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
-CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_I2C_AND_SPI=y

 #
 # CODEC drivers
@@ -5767,19 +5753,19 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
 # CONFIG_SND_SOC_DMIC is not set
-CONFIG_SND_SOC_DUMMY_CODEC=m
-CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_DUMMY_CODEC=y
+CONFIG_SND_SOC_HDMI_CODEC=y
 # CONFIG_SND_SOC_ES7134 is not set
-CONFIG_SND_SOC_ES7202=m
+CONFIG_SND_SOC_ES7202=y
 CONFIG_SND_SOC_ES7202_MIC_MAX_CHANNELS=2
 CONFIG_SND_SOC_ES7202_I2C_BUS=1
 # CONFIG_SND_SOC_ES7210 is not set
 # CONFIG_SND_SOC_ES7241 is not set
-CONFIG_SND_SOC_ES7243E=m
-CONFIG_SND_SOC_ES8311=m
-CONFIG_SND_SOC_ES8316=m
-CONFIG_SND_SOC_ES8323=m
-CONFIG_SND_SOC_ES8326=m
+CONFIG_SND_SOC_ES7243E=y
+CONFIG_SND_SOC_ES8311=y
+CONFIG_SND_SOC_ES8316=y
+CONFIG_SND_SOC_ES8323=y
+CONFIG_SND_SOC_ES8326=y
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_ES8328_SPI is not set
 # CONFIG_SND_SOC_ES8396 is not set
@@ -5788,7 +5774,7 @@ CONFIG_SND_SOC_ES8326=m
 # CONFIG_SND_SOC_ICS43432 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
-CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98090=y
 # CONFIG_SND_SOC_MAX98357A is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9867 is not set
@@ -5814,28 +5800,28 @@ CONFIG_SND_SOC_MAX98090=m
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RK312X is not set
 # CONFIG_SND_SOC_RK3228 is not set
-CONFIG_SND_SOC_RK3308=m
-CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RK3308=y
+CONFIG_SND_SOC_RK3328=y
 # CONFIG_SND_SOC_RK3506 is not set
-CONFIG_SND_SOC_RK3528=m
+CONFIG_SND_SOC_RK3528=y
 # CONFIG_SND_SOC_RK730 is not set
-CONFIG_SND_SOC_RK817=m
-CONFIG_SND_SOC_RK_CODEC_DIGITAL=m
-CONFIG_SND_SOC_RK_DSM=m
-CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RK817=y
+CONFIG_SND_SOC_RK_CODEC_DIGITAL=y
+CONFIG_SND_SOC_RK_DSM=y
+CONFIG_SND_SOC_RL6231=y
 # CONFIG_SND_SOC_ROCKCHIP_SPI_CODEC is not set
-CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5616=y
 # CONFIG_SND_SOC_RT5631 is not set
-CONFIG_SND_SOC_RT5640=m
-CONFIG_SND_SOC_RT5645=m
-CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5640=y
+CONFIG_SND_SOC_RT5645=y
+CONFIG_SND_SOC_RT5651=y
 # CONFIG_SND_SOC_RT5659 is not set
 # CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_RV1106 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
-CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SPDIF=y
 # CONFIG_SND_SOC_SRC4XXX_I2C is not set
 # CONFIG_SND_SOC_SSM2305 is not set
 # CONFIG_SND_SOC_SSM2518 is not set
@@ -5868,7 +5854,7 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
 # CONFIG_SND_SOC_TLV320ADCX140 is not set
-CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TS3A227E=y
 # CONFIG_SND_SOC_TSCS42XX is not set
 # CONFIG_SND_SOC_TSCS454 is not set
 # CONFIG_SND_SOC_UDA1334 is not set
@@ -5919,8 +5905,8 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_IT6621 is not set
 # end of CODEC drivers

-CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_SIMPLE_CARD_UTILS=y
+CONFIG_SND_SIMPLE_CARD=y
 # CONFIG_SND_AUDIO_GRAPH_CARD is not set
 # CONFIG_SND_AUDIO_GRAPH_CARD2 is not set
 # CONFIG_SND_TEST_COMPONENT is not set
@@ -7214,8 +7200,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_ADI_AXI_ADC is not set
-CONFIG_AXP20X_ADC=m
-# CONFIG_AXP288_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HI8435 is not set
@@ -7241,7 +7225,7 @@ CONFIG_ROCKCHIP_SARADC=y
 # CONFIG_ROCKCHIP_SARADC_TEST_CHN is not set
 # CONFIG_RICHTEK_RTQ6056 is not set
 # CONFIG_SD_ADC_MODULATOR is not set
-CONFIG_TI_ADC081C=y
+# CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC0832 is not set
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC12138 is not set
@@ -8040,7 +8024,7 @@ CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=y
-CONFIG_PNFS_BLOCK=y
+CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_FLEXFILE_LAYOUT=y
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_NFS_V4_1_MIGRATION=y
@@ -2,16 +2,11 @@ diff --git a/./arch/arm64/configs/rockchip_linux_defconfig.orig b/./arch/arm64/c
 index 0a870e6c7a..7ce0610aec 100644
 --- a/./arch/arm64/configs/rockchip_linux_defconfig.orig
 +++ b/./arch/arm64/configs/rockchip_linux_defconfig
-@@ -1,3 +1,29 @@
-+CONFIG_MODULE_COMPRESS=y
-+CONFIG_MODULE_COMPRESS_ZSTD=y
-+CONFIG_BLK_DEV_DM=y
-+CONFIG_INPUT_EVDEV=m
-+CONFIG_PNFS_BLOCK=y
+@@ -1,3 +1,14 @@
 +CONFIG_UDMABUF=y
 +CONFIG_UEVENT_HELPER=y
 +CONFIG_UEVENT_HELPER_PATH=""
-+CONFIG_NULL_TTY=m
+CONFIG_NULL_TTY=y
 +CONFIG_PSI=y
 +CONFIG_FW_LOADER_PAGED_BUF=y
 +CONFIG_FW_LOADER_COMPRESS=y
@@ -19,16 +14,6 @@ index 0a870e6c7a..7ce0610aec 100644
 +CONFIG_FW_LOADER_COMPRESS_ZSTD=y
 +CONFIG_RT2800USB=m
 +CONFIG_RT2800USB_RT53XX=y
-+CONFIG_BACKLIGHT_OCP8178=m
-+CONFIG_DRM_PANEL_CWU50=m
-+CONFIG_INPUT_AXP20X_PEK=y
-+CONFIG_PINCTRL_AXP209=y
-+CONFIG_CHARGER_AXP20X=y
-+CONFIG_BATTERY_AXP20X=y
-+CONFIG_AXP20X_POWER=y
-+CONFIG_MFD_AXP20X=y
-+CONFIG_MFD_AXP20X_I2C=y
-+CONFIG_REGULATOR_AXP20X=y
 CONFIG_WERROR=y
 CONFIG_DEFAULT_HOSTNAME="localhost"
 CONFIG_SYSVIPC=y
@@ -1,6 +1,6 @@
 maintainer="Richard Acayan <mailingradian@gmail.com>"
 pkgname=alsa-ucm-conf-qcom-sdm670
-pkgver=1.2.9_git20260223
+pkgver=1.2.9_git20250707
 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="2f8edef47f67a308d5fe3370c73f29a021e6a885"
+_commit="abe7dee6d942965c7a7d5861beacc9cf0b6adbec"
 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="
-ff65e897310fcade9e2842ffd149dcedd8487e7cb191b7b6e3d702f5fbfadae61602445d5d5b70baff56d08367a85215ba008c6898a2806b61d9e38b4ab7d161  alsa-ucm-conf-2f8edef47f67a308d5fe3370c73f29a021e6a885.tar.gz
+beddfa4754a6e24deda3e0a78959a03afc93cb7a7c8e69880fc0f5b3011ea11ab9f36c21ca1c588062b8437f7c599234cad109f04887d35d8c480bf0d548a53d  alsa-ucm-conf-abe7dee6d942965c7a7d5861beacc9cf0b6adbec.tar.gz
 "
@@ -4,7 +4,7 @@ maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
 pkgver=24
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -39,7 +39,11 @@ _pmb_recommends="
 	oem-intel
 	oem-nvidia
 "
-provides="device-tablet-x64uefi=$pkgver-r$pkgrel device-tablet-x86uefi=$pkgver-r$pkgrel"
+provides="
+	device-tablet-x64uefi=$pkgver-r$pkgrel
+	device-tablet-x86uefi=$pkgver-r$pkgrel
+	device-valve-jupiter
+"
 replaces="device-tablet-x64uefi device-tablet-x86uefi"

 build() {
@@ -4,7 +4,7 @@ maintainer="Sebastian Fleer <dev@dwurp.de>"
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=12
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,9 +51,6 @@ 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() {
@@ -68,6 +65,13 @@ 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=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ depends="
 	alsa-utils
 	depthcharge-tools
 	linux-postmarketos-mediatek-mt8173
-	mesa-vulkan-imagination
 	postmarketos-base
 	postmarketos-cros-common
 "
@@ -43,6 +42,6 @@ nonfree_firmware() {

 sha512sums="
 cab64e21c7710d875cac4ed459a7c6ca8547d7234704e8cb80e875a5cfc65cab6cac00be0c3d9b9300e96f9a45c1b315896708b488024dcffc7cb42c850127e0  deviceinfo
-09dfc86138379250bc72b3395a4a94257da81d359cb210ee871cfa8efe6450ca3bbd95a134f365bc509bebcde5e882433805d9b265bdd8df12fd85c86491d66f  kernel-cmdline.conf
+97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb  kernel-cmdline.conf
 4b0197eacfeeb4b13f5abc26950f570ee762742547674ce10110ccea63eb46630a2e3b5f87e9c9a1f9deda21baf05bec248ab7a65656687ec94d296b5657dafa  modules-initfs
 "
@@ -1,3 +1,2 @@
 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=1
+pkgrel=0
 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"/usr/share/X11/xorg.conf.d/90-tap-to-click.conf
+		"$subpkgdir"/etc/X11/xorg.conf.d/90-tap-to-click.conf
 }

 nonfree_firmware() {
@@ -1,2 +1,8 @@
+# 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=18
+pkgver=17
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -77,7 +77,7 @@ plasma_camera() {
 }

 sha512sums="
-e358f0565b95cd5d39dd5bc07645c6e0f94679c93b120b72bd2b6082b7f919e990a6a78e03edc0db045f8fc5e3363377c69fb8e42107298868ec319740c29210  81-libssc-google-sargo.rules
+089ce0acba4e1d789e337bedfca7570796a6416e7230ae9b8fc6b625747a40dbb064b1a707877cd6b7bdc73844c6571316e2ec0746a77060f13d98c52fdbfc00  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=5
+pkgrel=4
 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"/usr/share/X11/xorg.conf.d/40-xkb.conf
+		"$subpkgdir"/etc/X11/xorg.conf.d/40-xkb.conf
 	install -D -m644 "$srcdir"/xorg.conf \
-		"$subpkgdir"/usr/share/X11/xorg.conf.d/11-n900.conf
+		"$subpkgdir"/etc/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=6
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,7 +26,7 @@ package() {
 }

 sha512sums="
-0f1f9f655f9b73b18598ddd5690904861fa63ff6e8855d9b4bead3a40c69b6a97606267eb623fb23028cfa13da98feba687b9e7e6b3dff4f6f8d2846b808c8ba  deviceinfo
+ee1b15e55366bb7dbe45e35053f670aa68f74b8603239575cf41ad7bd209a90123670a70363d14fe3adf5ac323f1103dc638e3eb8c031c63e0b8d7fcf3654e5b  deviceinfo
 da521908455bec78086df8614e2a9f0cd871155f91d65d351670fdcf3e2880bfb1d578aab26f3dd3778ce3ebf27efbde67d65f39f5f733da5c750e33161ecc9b  kernel-cmdline.conf
-36ce87dcf1bbb49637e8ab7e75325ce41541ccfd7d6ac35edbc8269db319c2201f9d12c6263f8761424ad0d59b2bfa9c523b8200584f753b7264a7c7a2928d90  modules-initfs
+9f6c3cc0079e718ef0dfc221fadaf9bc092a8601b62794c2298eab893924af457612bd8a6e852fb2b181bee637e774dd2abea681eb72b1aa9c6672e686454795  modules-initfs
 "
@@ -9,6 +9,7 @@ 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,8 +1,5 @@
-exynosdrm
-hid_generic
+uas
+usb-storage
 scsi_mod
 sd_mod
 t10_pi
-uas
-usb-storage
-usbhid
@@ -0,0 +1,3 @@
+# iio-sensor-proxy with libssc: accelerometer mount matrix
+
+SUBSYSTEM=="misc", KERNEL=="fastrpc-*", ENV{ACCEL_MOUNT_MATRIX}+="-1, 0, 0; 0, -1, 0; 0, 0, -1"
@@ -2,7 +2,7 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=25
+pkgver=24
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -30,6 +30,7 @@ source="
 	modules-initfs
 	q6voiced.conf
 	80-device-oneplus-enchilada.preset
+	81-libssc-oneplus-enchilada.rules
 "
 install="
 	$pkgname-openrc.post-install
@@ -49,12 +50,12 @@ package() {
 	replaces="$pkgname-nonfree-firmware"
 	devicepkg_package $startdir $pkgname

+	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules \
+		-t "$pkgdir"/usr/lib/udev/rules.d/
 	install -Dm644 "$srcdir"/q6voiced.conf \
 		"$pkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/hexagonrpcd.confd \
 		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
-	install -Dm644 -t "$pkgdir"/usr/lib/systemd/system-preset \
-		"$srcdir"/80-device-oneplus-enchilada.preset
 }

 openrc() {
@@ -64,12 +65,18 @@ openrc() {
 }

 pmtest() {
-	depends="postmarketos-test-bootrr qrtr firmware-oneplus-sdm845 postmarketos-test-unl0kr"
+	depends="bootrr qrtr firmware-oneplus-sdm845 postmarketos-test-unl0kr"
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci"

 	mkdir -p "$subpkgdir"
 }

+systemd() {
+	install -Dm644 -t "$subpkgdir"/usr/lib/systemd/system-preset \
+		"$srcdir"/80-device-oneplus-enchilada.preset
+	default_systemd
+}
+
 sha512sums="
 73088bcff276b1e2f03efc3776be4c7d9a367ef898031686b88e5a853f8910373eb9f77b8e035d58149947929e908e745f255fbd24d02bed7bdc816afd703d2b  deviceinfo
 f16e550f623522be29027954c69a956eb6543f2f608a4c6b37c1a3983403a3edaa24e70aa42dbe88e76216991aba867b48c7341c9b8a81f675902d6223937b51  kernel-cmdline.conf
@@ -77,4 +84,5 @@ c8d3026e9f803ea823e35f83dab66fa8545e99af9655576476c194567113084d78200feab46f8498
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 a72de3293bc59e0afa0114d74030e4e725959f7619879ab616b0164595d57033affc3d1d4ccc9d8bc191b177a4c1593c1ad0a19fe7e452c3e0c9c847135c1102  80-device-oneplus-enchilada.preset
+2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-oneplus-enchilada.rules
 "
@@ -4,7 +4,7 @@ maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=24
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -65,7 +65,7 @@ openrc() {
 }

 pmtest() {
-	depends="postmarketos-test-bootrr qrtr postmarketos-test-unl0kr"
+	depends="bootrr qrtr postmarketos-test-unl0kr"
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci"

 	mkdir -p "$subpkgdir"
@@ -1,7 +1,7 @@
 maintainer="Antoine Martin (ayakael) <dev@ayakael.net>"
 pkgname=device-pine64-pinenote
 pkgdesc="Pine64 PineNote"
-pkgver=12
+pkgver=11
 pkgrel=0
 _commit="28d2c05ab4e80a7972611cd3188f3e8be4197f6a"
 url="https://postmarketos.org"
@@ -36,14 +36,12 @@ source="
 	30-eink-waveform.files
 	50-touchscreen.conf
 	panfrost.conf
-	tinydm-ebc-workaround-systemd.conf
-	tinydm-ebc-workaround-openrc.initd
+	tinydm-ebc-workaround-override.conf
 "
 subpackages="
 	$pkgname-nonfree-firmware
 	$pkgname-nonfree-firmware-openrc:firmware_openrc
 	$pkgname-nonfree-firmware-systemd:firmware_systemd
-	$pkgname-openrc
 	$pkgname-sway
 	$pkgname-sway-hrdl
 	$pkgname-systemd
@@ -106,6 +104,13 @@ package() {
 	# panfront sometimes insists on loading after rockchip_ebc
 	install -Dm644 "$srcdir"/panfrost.conf \
 		-t "$pkgdir"/usr/lib/modprobe.d
+
+	# rockchip_ebc sometimes fails to load the initial waveform.
+	# This forces a reload before starting tinydm
+	# TODO: openrc workaround
+	install -Dm644 \
+		"$srcdir"/tinydm-ebc-workaround-override.conf \
+		"$pkgdir"/usr/lib/systemd/system/tinydm.service.d/override.conf
 }

 hrdl() {
@@ -232,30 +237,12 @@ sway() {
 	mkdir -p "$subpkgdir"
 }

-openrc() {
-	# rockchip_ebc sometimes fails to load the initial waveform.
-	# This forces a reload before starting tinydm
-	install="$subpkgname.post-install"
-	install -Dm755 "$srcdir"/tinydm-ebc-workaround-openrc.initd \
-		"$subpkgdir"/etc/init.d/tinydm-ebc
-
-	# source `install_if`, `pkgdesc` and `depends`
-	default_openrc
-}
-
 systemd() {
 	# post-install enables tinydm if tinydm-ebc was enabled
 	# enables seamless upgrade 7-r0 to 8-r0
 	# TODO: remove in preparation for v26.06
 	install="$subpkgname.post-install"

-	# rockchip_ebc sometimes fails to load the initial waveform.
-	# This forces a reload before starting tinydm
-	install -Dm644 \
-		"$srcdir"/tinydm-ebc-workaround-systemd.conf \
-		"$subpkgdir"/usr/lib/systemd/system/tinydm.service.d/override.conf
-
-	# source `install_if`, `pkgdesc` and `depends`
 	default_systemd
 }

@@ -283,7 +270,7 @@ x11() {

 	# xorg touchscreen settings
 	install -Dm644 "$srcdir"/50-touchscreen.conf \
-		-t "$subpkgdir"/usr/share/X11/xorg.conf.d
+		-t "$subpkgdir"/etc/X11/xorg.conf.d
 }

 sha512sums="
@@ -301,6 +288,5 @@ df0565391a66eed53ed817d3d1415bef000f9ed33ef2e8aa3016be3ecc21dd4a357e57838979d271
 8f7a5ad2f407de8c474d54dfdb9cc099c96e8918fc123f8b2a8ff911d7e1c7ca6fe30f9cea8ee2f0c1ba5f3e53359193d0683ca912f0b66e79a12814ce38dd98  30-eink-waveform.files
 ac433eebbc35a48561837495997aee4e55510b979bc0d8e3bafb761bc1be5b4bdeed2f456369dcbc582688aefd07c63966b0d72b6ffa99e84cfd868e677f02c8  50-touchscreen.conf
 6ba6638754e00908243de2f73ed6898dac03638a200dcf7b7cd9684757355ee1eb0ac874af0f971ad2e054c1a8c471867bdaea4d9aaf7eea6d3cf81ac7dd73a2  panfrost.conf
-3b95a2292a7367d228f281a1f0e031fffb3d26748350d7010d26b18a3fb46bceb214b083e0c8e2d5fe318c67ae3776663ad78fef83ce9030529d3a89b581b703  tinydm-ebc-workaround-systemd.conf
-2432031a5785eecf84697c70e7ed17d4b10b9a36ebb73969b0016aefbc4feb1768b144031966fdf478c47f7b1032566975aa4affcbb66293c5f348e1d2151b37  tinydm-ebc-workaround-openrc.initd
+3b95a2292a7367d228f281a1f0e031fffb3d26748350d7010d26b18a3fb46bceb214b083e0c8e2d5fe318c67ae3776663ad78fef83ce9030529d3a89b581b703  tinydm-ebc-workaround-override.conf
 "
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update add tinydm-ebc
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-
-name=$RC_SVCNAME
-description="Restarts rockchip_ebc service before tinydm"
-
-depend() {
-    before tinydm
-}
-
-start() {
-    einfo "Reloading rockchip_ebc"
-    modprobe -r rockchip_ebc
-    modprobe rockchip_ebc
-    eend $?
-}
@@ -3,7 +3,7 @@
 maintainer="Arnav Singh <me@arnavion.dev>"
 pkgname=device-pine64-pinephone
 pkgver=11
-pkgrel=1
+pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -226,7 +226,7 @@ sway() {
 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
 	install -Dm644 "$srcdir"/x11-pinephone-keyboard.conf \
-		"$subpkgdir"/usr/share/X11/xorg.conf.d/pinephone-keyboard.conf
+		"$subpkgdir"/etc/X11/xorg.conf.d/pinephone-keyboard.conf
 }

 audio() {
@@ -3,7 +3,7 @@ maintainer="Jan Jasper de Kroon <jajadekroon@gmail.com>"
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
 pkgver=8
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -136,7 +136,7 @@ sway() {
 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
 	install -Dm644 "$srcdir"/x11-pinephone-keyboard.conf \
-		"$subpkgdir"/usr/share/X11/xorg.conf.d/pinephone-keyboard.conf
+		"$subpkgdir"/etc/X11/xorg.conf.d/pinephone-keyboard.conf
 }

 sha512sums="
@@ -4,7 +4,7 @@
 maintainer="Alistair Francis <alistair@alistair23.me>"
 pkgname=device-purism-librem5
 pkgver=12
-pkgrel=1
+pkgrel=0
 _confver=69
 _purismrel=2
 # <librem5-base ver>.<purism release>
@@ -142,7 +142,7 @@ usbguard() {
 x11() {
 	install_if="$pkgname xorg-server"
 	install -Dm644 "$srcdir"/xorg.conf \
-		"$subpkgdir"/usr/share/X11/xorg.conf.d/10-video.conf
+		"$subpkgdir"/etc/X11/xorg.conf.d/10-video.conf
 }

 package() {
@@ -3,7 +3,7 @@
 maintainer="Barnabas Czeman <barnabas.czeman@postmarketos.org>"
 pkgname=device-qcom-msm8953
 pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
-pkgver=13
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -64,7 +64,7 @@ xiaomi_daisy_fake_goodix() {
 sha512sums="
 fd541b7a48170fce536967ff96ffe5f30ed151490ea8eb618ae2e6b7fd51986e4e7c4229f805d4ae07f22ca58146045085162b1d49866630350f55f0038cc69c  deviceinfo
 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb  kernel-cmdline.conf
-29986b499f4b45e5112cb650685e9778bbfe6812fe2833d1eccca949323d69714b350ad3b1eaa3c9838f54088c95e7774c58937859685232f06fa18e8eb7fc5b  modules-initfs
+39db44cf9c9ae2179557f8137fe67a9935894e98cd1062344ba3a151b8d85363fa795cde674723cb8cdc0b6baa4fcffe54aa342f27876d13785109ec423762db  modules-initfs
 a2608b01b7b6e2dade694af355ff4f0f26cad49cf54bc332c77eb75d19fdc985f7f996fedb72753de447be0391deabf5fcea52406791d1e6e0d165703b63f145  90-device-xiaomi-daisy.rules
 17af1dabd211ec942bd8cbe63743c874ef87f0613ae08b8de3f77bdb87962eae402eee2b6604d6040700d4e7ae1b898cb67c1b01f2b86db23af31435953eaa51  61-gmobile-wakeup-lenovo-cd18781y.hwdb
 "
@@ -1,63 +1,56 @@
-atmel-mxt-ts
-edt-ft5x06
-goodix-ts
+atmel_mxt_ts
+edt_ft5x06
+goodix_ts
 msm
-novatek-nvt-ts
-panel-boe-bs052fhm-a00-6c01
-panel-flipkart-rimob-nt35532-cs
-panel-himax-hx83112b
-panel-himax-hx8399c-fhdplus
-panel-huawei-milan-boe-otm1906c
-panel-huawei-milan-boe-td4322
-panel-huawei-milan-boe-test1906c
-panel-huawei-milan-ctc-nt35596s
-panel-huawei-milan-ctc-otm1906c
-panel-huawei-milan-jdi-r63452
-panel-huawei-milan-tianma-fic8736
-panel-huawei-milan-tianma-focal8716
-panel-huawei-milan-tianma-otm1906c
-panel-lenovo-kuntao-549
-panel-mdss-ft8716-fhd
-panel-mdss-ili7807-fhd
-panel-mdss-ili7807-fhdplus
-panel-mdss-nt35596-ebbg
-panel-mdss-otm1911-fhd
-panel-mdss-otm1911-fhdplus
-panel-mdss-r63350
+novatek_nvt_ts
 panel-motorola-ali-boe
 panel-motorola-ali-tianma
-panel-motorola-ocean-622-ofilm
-panel-motorola-ocean-622-tianma
-panel-motorola-ocean-nt36672a-csot
-panel-motorola-river-624-boe
-panel-motorola-river-624-tianma
-panel-motorola-river-hx83112b-tianma
-panel-motorola-river-nt36672a-tianma
 panel-samsung-s6e3fa7
-panel-tianma-tl052vdxp02
-panel-xiaomi-boe-ili9885
-panel-xiaomi-ebbg-r63350
-panel-xiaomi-nt35532
-panel-xiaomi-nt36672-csot-fhdplus-e7
-panel-xiaomi-nt36672-tianma-fhdplus-e7
-panel-xiaomi-onclite-hx8394f
-panel-xiaomi-onclite-ili9881
-panel-xiaomi-onclite-otm1901a
-panel-xiaomi-otm1911
-panel-xiaomi-oxygen-r61322-auo
-panel-xiaomi-oxygen-r63350-tianma
 panel-xiaomi-rosy-ft8006m-boe
 panel-xiaomi-rosy-ft8613-csot
 panel-xiaomi-rosy-ft8613-ebbg
-panel-xiaomi-td4310-ebbg-fhdplus-e7
-panel-xiaomi-td4310-fhdplus-e7
-panel-xiaomi-td4310-fhdplus-e7-g55
-panel-xiaomi-tianma-nt35596
-panel-xiaomi-ysl-hx8394f
-panel-xiaomi-ysl-ili7807d
-panel-xiaomi-ysl-ili9881c
-rmi-core
-rmi-i2c
+panel_billion_rimob_nt35532_cs
+panel_boe_bs052fhm_a00_6c01
+panel_csot_622_v0
+panel_himax_hx8399c_fhdplus
+panel_huawei_milan_boe_otm1906c
+panel_huawei_milan_boe_td4322
+panel_huawei_milan_boe_test1906c
+panel_huawei_milan_ctc_nt35596s
+panel_huawei_milan_ctc_otm1906c
+panel_huawei_milan_jdi_r63452
+panel_huawei_milan_tianma_fic8736
+panel_huawei_milan_tianma_focal8716
+panel_huawei_milan_tianma_otm1906c
+panel_lenovo_kuntao_549
+panel_mdss_ft8716_fhd
+panel_mdss_ili7807_fhd
+panel_mdss_ili7807_fhdplus
+panel_mdss_nt35596_ebbg
+panel_mdss_otm1911_fhd
+panel_mdss_otm1911_fhdplus
+panel_mdss_r63350
+panel_ofilm_622_v0
+panel_tianma_622_v0
+panel_tianma_tl052vdxp02
+panel_xiaomi_boe_ili9885
+panel_xiaomi_ebbg_r63350
+panel_xiaomi_nt35532
+panel_xiaomi_nt36672_csot_fhdplus_e7
+panel_xiaomi_nt36672_tianma_fhdplus_e7
+panel_xiaomi_onclite_hx8394f
+panel_xiaomi_onclite_ili9881
+panel_xiaomi_onclite_otm1901a
+panel_xiaomi_otm1911
+panel_xiaomi_td4310_ebbg_fhdplus_e7
+panel_xiaomi_td4310_fhdplus_e7
+panel_xiaomi_td4310_fhdplus_e7_g55
+panel_xiaomi_tianma_nt35596
+panel_xiaomi_ysl_hx8394f
+panel_xiaomi_ysl_ili7807d
+panel_xiaomi_ysl_ili9881c
+rmi_core
+rmi_i2c
 s6sy761
 simple-mfd-i2c
 sm5708-charger
@@ -1 +0,0 @@
-../../.gitlab-ci/packages/single-runner-defined-in-ci-common.yml.j2
@@ -1 +0,0 @@
-../../.gitlab-ci/packages/single-runner-defined-in-ci-common.yml.j2
@@ -1,38 +1,31 @@
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer="Duje Mihanović <duje@dujemihanovic.xyz>"
+maintainer="Duje Mihanović <duje.mihanovic@skole.hr>"
 pkgname=device-samsung-coreprimevelte
 pkgdesc="Samsung Galaxy Core Prime VE LTE"
-pkgver=10
+pkgver=8
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="
-	dtc
-	firmware-samsung-pxa1908
+depends="dtc
 	linux-samsung-coreprimevelte
-	mkbootimg
-	postmarketos-base
-	pxa-mkbootimg
-	systemd-boot
 	u-boot-coreprimevelte
+	postmarketos-base
+	mkbootimg
 	u-boot-tools
-"
+	pxa-mkbootimg"
 makedepends="devicepkg-dev"
+_pmb_recommends="firmware-samsung-pxa1908"
 source="
+	boot-image.its
 	deviceinfo
-	kernel-cmdline.conf
-	modprobe.d_mwifiex.conf
 	modules-initfs
 	90-mlan-to-wlan.rules
 "
-subpackages="$pkgname-udev"

 build() {
 	devicepkg_build $startdir $pkgname
-
-	fallocate -l 4k dummy-initramfs
 }

 package() {
@@ -42,22 +35,13 @@ package() {
 		-t "$pkgdir"/usr/lib/udev/rules.d

 	mkdir -p "$pkgdir"/usr/share/u-boot/coreprimevelte/
-	install -Dm644 dummy-initramfs \
+	install -Dm644 "$srcdir"/boot-image.its \
 		-t "$pkgdir"/usr/share/u-boot/coreprimevelte/
-
-	install -Dm644 "$srcdir"/modprobe.d_mwifiex.conf \
-		"$pkgdir"/usr/lib/modprobe.d/mwifiex.conf
-}
-
-udev() {
-	default_udev
-	install_if="$pkgname=$pkgver-r$pkgrel udev"
 }

 sha512sums="
-59b0f7785ed4db79b4b78cc88a601d23e3bda7f0ff46f97ffe2a11ec70824955b65f4854a7cecfa4314fb5fee587723e443391bbab9afa915ed3d69eab0d308f  deviceinfo
-a9193f0e8190aca5820a5c96c575c87cf190e61a015cb7145ee47721fb543868207725ee9ba113981e1a158ea3cabfeedb26160692b32306d6d7c84791f71dd2  kernel-cmdline.conf
-d0f22c864f19d9d54c42a8397cb8c2412d43192211fb36a86d0bd61f9f420349f774282b9b6789b54e7a8be6d379f18e56b49ae19260a60d0b572e39729931c2  modprobe.d_mwifiex.conf
+fd8183975ed524f5f04f45abadd58bf7cccda5672262dcb733a180f1a9b3edbab1abda3e849f2c0a7a8d593ac804b9b07952955f7c8af8bad1263015ab02c242  boot-image.its
+452485d2da3802b0a8557f951c94085c31f5ba5bb67a6c446080cd3735766d75cfbaa4f54c4396d0ba7919717f79130e953b047223de2b7d37cbfb5badbc3e3e  deviceinfo
 b1617e4b116d60abb15003c5bf7d4e8fa13e57a4a12feadd1e128946238b0922e98810289690f0466fec39f54adcc9ef08346acdef0f5a0fbb62c68438c3a063  modules-initfs
 d51facbaa99f69964786e770dc8ed500bfb2609353a25aa344701c851131cc421ef3a2663fe4422a21a5f38e01f0c34235fa4fad75739fb614109a2fb268db8a  90-mlan-to-wlan.rules
 "
@@ -0,0 +1,46 @@
+/dts-v1/;
+
+/ {
+	description = "Samsung Galaxy Core Prime VE LTE FIT";
+	#address-cells = <1>;
+
+	images {
+		kernel {
+			description = "Kernel image";
+			data = /incbin/("vmlinuz");
+			type = "kernel";
+			arch = "arm64";
+			os = "linux";
+			compression = "gzip";
+			load = <0x1000000>;
+			entry = <0x1000000>;
+		};
+
+		fdt {
+			description = "Device tree";
+			data = /incbin/("/boot/dtbs/marvell/mmp/pxa1908-samsung-coreprimevelte.dtb");
+			type = "flat_dt";
+			compression = "none";
+		};
+
+		initramfs {
+			description = "Initramfs image";
+			data = /incbin/("initramfs");
+			type = "ramdisk";
+			arch = "arm64";
+			os = "linux";
+			compression = "none";
+		};
+	};
+
+	configurations {
+		default = "standard";
+
+		standard {
+			description = "Normal boot";
+			kernel = "kernel";
+			fdt = "fdt";
+			ramdisk = "initramfs";
+		};
+	};
+};
@@ -17,11 +17,15 @@ deviceinfo_screen_height="800"
 deviceinfo_drm="true"

 # Bootloader related
+deviceinfo_create_initfs_extra="true"
 deviceinfo_dtb="marvell/mmp/pxa1908-samsung-coreprimevelte"
+deviceinfo_generate_uboot_fit_images="true"
 deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_bootimg_pxa="true"
+deviceinfo_bootimg_override_payload="u-boot.uImage"
+deviceinfo_bootimg_override_initramfs="boot-image.itb"
 deviceinfo_flash_kernel_on_update="true"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
@@ -31,9 +35,3 @@ deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
 deviceinfo_flash_sparse_samsung_format="1"
 deviceinfo_bootimg_append_seandroidenforce="true"
-
-# U-Boot related stuff. U-Boot is wrapped into an uImage and chainloaded by
-# Samsung's bootloader, after which the OS is located and booted through UEFI.
-# We only need a dummy initfs for boot-deploy (inspired by jolla-c2).
-deviceinfo_bootimg_override_payload="u-boot.uImage"
-deviceinfo_bootimg_override_initramfs="dummy-initramfs"
@@ -1,3 +0,0 @@
-# Our U-Boot currently implements no shutdown or reboot methods, so relying on
-# EFI services to do either doesn't work.
-efi=noruntime
@@ -1,2 +0,0 @@
-# Load WLAN calibration data from a firmware file
-options mwifiex cal_data_cfg=mrvl/WlanCalData_ext.conf
@@ -1,9 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer="Mithil Bavishi <bavishimithil@gmail.com>"
+maintainer="Mighty17 <mightymb17@gmail.com>"
 pkgname=device-samsung-espresso10
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
 pkgver=6
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -1,10 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Co-Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
-maintainer="Mithil Bavishi <bavishimithil@gmail.com>"
+maintainer="Mighty17 <mightymb17@gmail.com>"
 pkgname=device-samsung-espresso7
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
 pkgver=7
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -3,7 +3,7 @@ maintainer="Dzmitry Sankouski <dsankouski@gmail.com>"
 pkgname=device-samsung-starqltechn
 pkgdesc="Samsung Galaxy S9 SM-G9600"
 pkgver=11
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-sdm845
 	dtc
-	firmware-samsung-sdm845
+	hexagonfs-firmware-loader
 	hexagonrpcd>=0.3.2-r3
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
@@ -5,7 +5,7 @@ maintainer="Alexander Martinz <amartinz@shiftphones.com>"
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
 pkgver=20
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -69,7 +69,7 @@ nonfree_firmware_openrc() {
 }

 pmtest() {
-	depends="postmarketos-test-bootrr qrtr firmware-shift-sdm845 postmarketos-test-unl0kr"
+	depends="bootrr qrtr firmware-shift-sdm845 postmarketos-test-unl0kr"
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci"

 	mkdir -p "$subpkgdir"
@@ -0,0 +1,3 @@
+# iio-sensor-proxy with libssc: accelerometer mount matrix
+
+SUBSYSTEM=="misc", KERNEL=="fastrpc-*", ENV{ACCEL_MOUNT_MATRIX}+="-1, 0, 0; 0, -1, 0; 0, 0, -1"
@@ -2,7 +2,7 @@
 maintainer="Joel Selvaraj <foss@joelselvaraj.com>"
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
-pkgver=18
+pkgver=16
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -19,6 +19,7 @@ makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	$pkgname-nonfree-firmware-udev:nonfree_firmware_udev
 	$pkgname-kernel-tianma:kernel_tianma
 	$pkgname-kernel-ebbg:kernel_ebbg
 "
@@ -30,6 +31,7 @@ source="
 	modules-initfs.ebbg
 	modules-initfs.tianma
 	q6voiced.conf
+	81-libssc-xiaomi-beryllium.rules
 "

 build() {
@@ -39,6 +41,8 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname

+	install -Dm644 "$srcdir"/81-libssc-xiaomi-beryllium.rules \
+		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-xiaomi-beryllium.rules
 	install -Dm644 "$srcdir"/q6voiced.conf \
 		"$pkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/hexagonrpcd.confd \
@@ -66,6 +70,12 @@ nonfree_firmware_openrc() {
 	mkdir -p "$subpkgdir"
 }

+nonfree_firmware_udev() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel udev"
+
+	default_udev
+}
+
 kernel_tianma() {
 	pkgdesc="Tianma Panel. To know which panel your device use and the status of the port, Visit the Poco F1 wiki page: https://wiki.postmarketos.org/wiki/Xiaomi_Poco_F1_(xiaomi-beryllium)"
 	depends="linux-postmarketos-qcom-sdm845"
@@ -80,9 +90,10 @@ kernel_ebbg() {

 sha512sums="
 5d48f17dcec44653e749191d4f236350e9ff0166df77b711f357dca6d74a1af7dfa768a2caa1dc309c2651d004edd0ab7846305513488f74d3ea7ae11da6168d  deviceinfo
-f16e550f623522be29027954c69a956eb6543f2f608a4c6b37c1a3983403a3edaa24e70aa42dbe88e76216991aba867b48c7341c9b8a81f675902d6223937b51  kernel-cmdline.conf
+003e5228a2b2825f24cb8b4842e3c3f72b99225f0aef3cda5bb2de4e4beb5e1c84800ba48c6cf1b84fe042bd039912e67c545c00981b604db0c0f0bcb546f7c5  kernel-cmdline.conf
 52079045a0c1f48628d891bf8867f5c1802152fce8e2c4bd787630f1f5e4c9b386bfc373e464cb053688350ac678dbc3c407a76a31a1ae700ca67764d0d384f1  hexagonrpcd.confd
 cab76675b9c48eb1ce0691b31667d17ee73ecf21439a7f7c9c2ba96344e3bf4ad713ebc685298d6e32ad589ba26f429cd6b0d200338b50d136ad1a29758e4214  modules-initfs.ebbg
 175a7d859956a029b91a1105b93c4113b07ab5cfe932294dd369808059ed03471625f64ce90e5146a65c0bb26417470d8f7c02e48dfacf2d016ce5b2c28cee76  modules-initfs.tianma
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
+2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-xiaomi-beryllium.rules
 "
@@ -1,4 +1 @@
 console=ttyMSM0,115200
-# FIXME: Console enabled to workaround a race condition with display initialisation
-# See https://gitlab.freedesktop.org/drm/msm/-/issues/46
-quiet
@@ -1,43 +0,0 @@
-From 21c36eefd5390fd80fc04eea0462ba49ca1457f7 Mon Sep 17 00:00:00 2001
-From: Dylan Van Assche <git@dylanvanassche.be>
-Date: Thu, 8 Jan 2026 16:25:00 +0100
-Subject: [PATCH] sargo: set mount matrix
-
---
- proprietary/vendor/etc/sensors/config/b4s4_bmi160.json | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/proprietary/vendor/etc/sensors/config/b4s4_bmi160.json b/proprietary/vendor/etc/sensors/config/b4s4_bmi160.json
-index aa47c9b..90a614e 100644
--- a/proprietary/vendor/etc/sensors/config/b4s4_bmi160.json
-+++ b/proprietary/vendor/etc/sensors/config/b4s4_bmi160.json
-@@ -236,7 +236,7 @@
-     ".placement":{
-       "owner": "sns_bmi160",
-       "0":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "1":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-@@ -248,7 +248,7 @@
-         "data": "0.0"
-       },
-       "4":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "5":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-@@ -260,7 +260,7 @@
-         "data": "0.0"
-       },
-       "8":{ "type": "flt", "ver": "0",
-        "data": "0.0"
-+        "data": "-1.0"
-       },
-       "9":{ "type": "flt", "ver": "0",
-         "data": "0.0"
-- 
-2.52.0
-
@@ -1,7 +1,7 @@
 maintainer="Richard Acayan <mailingradian@gmail.com>"
 pkgname=firmware-google-sargo
 pkgver=220505.008
-pkgrel=10
+pkgrel=9
 pkgdesc="Proprietary firmware blobs from the Google Pixel 3a factory image"
 url="https://github.com/TheMuppets/proprietary_vendor_google_sargo"
 arch="aarch64"
@@ -14,7 +14,6 @@ source="
 	https://github.com/TheMuppets/proprietary_vendor_google_sargo/archive/$_commit.tar.gz
 	https://gitlab.com/flamingradian/firmware-google-sargo-modem/-/archive/$_modemfw_commit/firmware-google-sargo-modem-$_modemfw_commit.tar.gz
 	https://raw.githubusercontent.com/LineageOS/android_device_google_bonito/$_device_android_commit/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb
-	0001-sargo-set-mount-matrix.patch
 "
 builddir="$srcdir/proprietary_vendor_google_sargo-$_commit"
 options="!check !archcheck !strip !tracedeps textrels pmb:cross-native"
@@ -103,5 +102,4 @@ sha512sums="
 fbbb852405bd521efa4add32136b25f5d07b0671953b05ec66f7b04b6de483269b1e57500f1a723b6b00abb7b9b405e01d14552c686c5c6ffbdb4d0c14f98af0  c631f0f2aa24ea60cfb505d327cd4ae56ca27f16.tar.gz
 53a71c7d51d6277375076dcf7d89c2189ba67272238a8efa89f712238c2474ee777c3b0d749e8e28eeaa8e6bfbbd6eb56949481029d5ca3505cac321ce8963ef  firmware-google-sargo-modem-34bbe2c27f35537f13747c9eba67ece6ae141806.tar.gz
 dc2418dd0a45e0a5ed2e31771f5039d085527e30af9541d4469de7a52071f6a9133d87e00f7697f1379ac1dc201c4f4e8f5031a2eaf27ae5831d35bc06b61578  Global_cal.acdb
-035251fa69d544bf8c39b0ebfbd193f792387d1b063b0a070e33054952db07471287ab56c5e07805f2189671baa2316d387bfa7d682ccfc2ff91dc647a9302e7  0001-sargo-set-mount-matrix.patch
 "
Author	SHA1	Message	Date
Clayton Craft	cca148aa31	device-valve-jupiter: drop aport Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>	2026-03-01 18:25:14 -08:00
Clayton Craft	bb1766d55e	linux-valve-jupiter: drop aport Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>	2026-03-01 18:25:14 -08:00
Clayton Craft	716ba7af3b	device-generic-x86_64: provide device-valve-jupiter So that this package can effectively replace the valve-jupiter device port on existing installs. Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>	2026-03-01 18:25:14 -08:00
Clayton Craft	33dd882b22	linux-postmarketos-stable: sync kconfig Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>	2026-03-01 18:25:14 -08:00
Clayton Craft	8c7a168b28	kconfig-generic: add kconfig for Steam Deck Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>	2026-03-01 18:25:08 -08:00
				`@@ -1 +0,0 @@`
				`../../.gitlab-ci/packages/single-runner-defined-in-ci-common.yml.j2`