fixup! systemd/networkmanager: upgrade to 1.54.3

This was downgraded in
https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7929
to workaround hotspot being broken, upstream issue
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1798

This commit exists to be able to test workarounds/fixes from upstream
easily using mrhlpr.

.ci/build-docs.sh

@@ -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
 

.ci/build-jobs.yaml.j2

@@ -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

.ci/dint.sh

@@ -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
 

.ci/grep.sh

@@ -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"

.ci/lib/check_changed_versions.py

@@ -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)

.ci/lib/check_devices_in_wiki.py

@@ -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"
@@ -108,7 +108,7 @@ def main() -> int:
     if args.all:
         devices = get_devices()
     else:
-        devices = common.get_changed_devices(skip_archived=True)
+        devices = common.get_changed_devices()
         # remove 'device-' prefix
         devices = [d[7:] for d in devices]
         devices = [d.removesuffix("-downstream") for d in devices]

.ci/lib/common.py

@@ -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":
@@ -182,9 +175,9 @@ def get_changed_kernels(skip_archived: bool = False):
             ret += [pkgname]
     return ret
 
-def get_changed_devices(skip_archived: bool = False):
+def get_changed_devices():
     ret = []
-    for pkgname in get_changed_packages(skip_archived):
+    for pkgname in get_changed_packages():
         if pkgname.startswith("device-"):
             ret += [pkgname]
     return ret

.ci/lib/deviceinfo_linting.py

@@ -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)

.ci/lib/generate_build_jobs.py

@@ -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
 

.ci/mypy.sh

@@ -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 .

.ci/pyproject.toml

@@ -1,2 +0,0 @@
-[tool.mypy]
-disable_error_code = ["import-not-found"]

.ci/shellcheck.sh

@@ -16,19 +16,10 @@ fi
 sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
-	./main/postmarketos-duranium/rootfs-usr-bin-duranium-set-channel
-	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-first-boot
-	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-mount-subpartitions
-	./main/postmarketos-duranium/rootfs-usr-libexec-duranium-usb-gadget-setup
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
-	./main/postmarketos-mkinitfs-hook/00-apx.sh
-	./main/postmarketos-mkinitfs-hook/00-kernel-panic.sh
-	./main/postmarketos-mkinitfs-hook/00-maximum-attention.sh
-	./main/postmarketos-mkinitfs-hook/00-netboot.sh
-	./main/postmarketos-mkinitfs-hook/05-ci.sh
-	./main/postmarketos-mkinitfs-hook/10-verbose-initfs.sh
+	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/postmarketos-ui-os-installer/rootfs-usr-bin-pmos_setup.sh
 	./main/postmarketos-usb-moded/rootfs-usr-lib-systemd-system-generators-umtprd-config-generator
 	./main/ttyescape/*.post-install

.ci/testcases/test_kernel.py

@@ -21,9 +21,6 @@ def test_aports_kernel():
         if aport_name == "linux-pam-pmos":
             continue  # This package isn't a linux kernel!
 
-        if aport_name == "linux-postmarketos-allwinner":
-            continue  # Hack to work around issue (see git blame)
-
         if "pmb:cross-native" not in apkbuild["options"]:
             raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
                                " options= line")

.gitlab-ci.yml

@@ -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
@@ -224,8 +211,6 @@ build-docs:
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-        - .ci/build-docs.sh
-        - deviceinfo_schema.toml
         - docs/**
 
 deploy-docs:
@@ -236,7 +221,6 @@ deploy-docs:
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "postmarketOS"
       changes:
-        - deviceinfo_schema.toml
         - docs/**
     - if: $CI_PIPELINE_SOURCE == "schedule"
       when: never

.gitlab/issue_templates/Default.md

@@ -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`
@@ -35,7 +35,7 @@
 #### Environments
 * [ ] COSMIC
 * [ ] GNOME Shell on Mobile
-* [ ] Phosh (*Please attach the debug information of the Mobile settings app, see [this video](https://peertube.debian.social/w/4GwDjCJNcAmp8cb7dqXz1T) or use `phosh-mobile-settings -d`*)
+* [ ] Phosh
 * [ ] Plasma Mobile
 * [ ] Sxmo (Wayland/Sway) **Please post the output of `sxmo_version.sh`**
 * [ ] Other: **Please fill out**

.gitlab/issue_templates/Maintainership_status_of_package.md

@@ -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

README.md

@@ -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)

channels.cfg

@@ -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
 

cross/gcc-aarch64/0042-libsanitizer-struct_sock_fprog_sz.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

cross/gcc-aarch64/APKBUILD

@@ -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
 "

cross/gcc-armhf/0042-libsanitizer-struct_sock_fprog_sz.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

cross/gcc-armhf/APKBUILD

@@ -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
 "

cross/gcc-armv7/0042-libsanitizer-struct_sock_fprog_sz.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

cross/gcc-armv7/APKBUILD

@@ -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
 "

cross/gcc-loongarch64/0042-libsanitizer-struct_sock_fprog_sz.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

cross/gcc-loongarch64/APKBUILD

@@ -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
 "

cross/gcc-ppc64le/0042-libsanitizer-struct_sock_fprog_sz.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

cross/gcc-ppc64le/APKBUILD

@@ -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
 "

cross/gcc-riscv64/0042-libsanitizer-struct_sock_fprog_sz.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

cross/gcc-riscv64/APKBUILD

@@ -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
 "

cross/gcc-x86/0042-libsanitizer-struct_sock_fprog_sz.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

cross/gcc-x86/APKBUILD

@@ -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
 "

cross/gcc-x86_64/0042-libsanitizer-struct_sock_fprog_sz.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

cross/gcc-x86_64/APKBUILD

@@ -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
 "

cross/grub-efi-x86/APKBUILD

@@ -1,10 +1,9 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen grub-efi-x86
 
-maintainer=""
 pkgname=grub-efi-x86
 pkgver=2.12
-pkgrel=9
+pkgrel=8
 
 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -23,5 +22,5 @@ package() {
 }
 
 sha512sums="
-ef8dd1fde9db54c71dd5024be62d09bf4f19dbdd2faf9772780373816050f23c594c6eefdc367f5b8cd93e97ae2f10dbd73cf7979377b72deb77acf8a3e37f71  grub-efi-2.12-r9-x86-edge.apk
+cca57dbed340ff4f9cc0f12c509c8213e8c83edbf80c8ace9ab5a46e7d48c19a7c8cb57a1c86bab3324dcfc071e289045e13ddf3b5011923e1a1a27713e86e0f  grub-efi-2.12-r8-x86-edge.apk
 "

cross/musl-aarch64/APKBUILD

@@ -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
 "

cross/musl-armhf/APKBUILD

@@ -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
 "

cross/musl-armv7/APKBUILD

@@ -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
 "

cross/musl-loongarch64/APKBUILD

@@ -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
 "

cross/musl-ppc64le/APKBUILD

@@ -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
 "

cross/musl-riscv64/APKBUILD

@@ -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
 "

cross/musl-x86/APKBUILD

@@ -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
 "

cross/musl-x86_64/APKBUILD

@@ -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
 "

cross/systemd-boot-x86/APKBUILD

@@ -2,7 +2,7 @@
 maintainer=""
 pkgname=systemd-boot-x86
 _pkgname=systemd-boot  # for monitoring
-pkgver=260.1
+pkgver=259
 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
+ef46b13661df43e3cfbeee1bc22f0b1eb902e8ebe39c19868c465efd08b35a199c2a2cd9d8021a6bc4d692fa0c6e0eab3f13eecd6ce24dde81d3945464a25b50  systemd-259.tar.gz
 8ecb5e25c0d8b01c406fa3084b0910d517cabbf12894958b4d3d77462cb0924f0a52fe2bf1aa39af29b16fd78fe080a6a99daa18015c6059fb2e52c971d83ba9  0001-meson-disable-libintl-check-if-pam-is-disabled.patch
 ad54e2c7e7a21bfa9b5f9e8db1b6af6a6d78a3e5dfe2dafcec77488f6224865ab4d4c8a8c8ee1c54c99d1741361e9fb3a51e5d36bcbc7a1c3fdcc4d0c1672132  cross-x86.meson
 "

device/.gitlab-ci/packages/single-runner-defined-in-ci-common-qcom-devicepkg-bootimg.yml.j2

@@ -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"

device/.gitlab-ci/packages/single-runner-defined-in-ci-common-with-vmlinuz-kernel-variant.yml.j2

@@ -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'

device/archived/device-alcatel-idol347-downstream/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-alcatel-idol347-downstream
 pkgdesc="Alcatel OneTouch Idol 3 (4.7) (Downstream)"
-pkgver=5
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -21,6 +21,6 @@ package() {
 }
 
 sha512sums="
-18ab6d8db91b707eea65784699164b9da3130553119d6e1da955b87c34ae28facb56d6b97cd6eb57588284c9acc4ea4e983e7093d8267f743edbf77808193135  deviceinfo
+f2e7527ef3b498147c311df678cfed15d2ca3049ebba87b93dbfcfc1d05237daf8f7d0943c24347d4d5ea4283dd03f412cf11575735f0d7724c7f49066e52e8c  deviceinfo
 928047af135afd6a3e76791628148eb7e5c8fe55465786655e47662b6baf07d251940357e278614b05de58898c03632dfcc7761f62c39765206b0cb70d054e9d  kernel-cmdline.conf
 "

device/archived/device-alcatel-idol347-downstream/deviceinfo

@@ -17,6 +17,7 @@ deviceinfo_screen_height="1280"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"

device/archived/device-amazon-mantis/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-mantis
 pkgdesc="Amazon Fire TV Stick 4K"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,5 +25,5 @@ package() {
 }
 
 sha512sums="
-4ce458d7aa08ed2b1fc6a11fb39e38e9a323232be9f8f220c31912650297141ed4997f0115b5a3e290e1f57ada5a1e706b8c623b0e48a1f596bed2d5ebd871ba  deviceinfo
+1b59ddbb22701e1921c58bc8cc1cd6832becd5e37ccac2d0cca08e002e7fdd8921a8cc500e1c9bfdf2b17e7890fd88073f533b41d2b0a4904041277fb5a4197a  deviceinfo
 "

device/archived/device-amazon-mantis/deviceinfo

@@ -11,12 +11,14 @@ deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="embedded"
+deviceinfo_external_storage="false"
 deviceinfo_screen_width="1920"
 deviceinfo_screen_height="1080"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x40000000"
 deviceinfo_flash_offset_kernel="0x00008000"

device/archived/device-amazon-suez/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Hadi Charara <hadicharara@ymail.com>"
 pkgname=device-amazon-suez
 pkgdesc="Amazon Fire HD 10"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -23,6 +23,6 @@ package() {
 
 
 sha512sums="
-7b822b61e88d98d848914692f432bcfbd69ad9a3c1a0a125e6b8257a0b1ac2db590e41df9cf9e8f0ddd5a9e3bc39870ec635e8f0d5ba9fd0e1235b184bd001a1  deviceinfo
+2b75dba63b6522bafa78ec359bc5fe3f519520caedbca188e1510e75f26555ad964f9f9ee6e3128570f989e70081317d2ab64bfb9af0db1f3f3cdbf38c70a047  deviceinfo
 d89b08ef9888faae6cb96a378421669e6119023307a3b5a109e18b7f9e2c70e1f8b240ba8f9b9d22d319fa28e416565d06074d34382f482c9b037b7ab3f4861c  kernel-cmdline.conf
 "

device/archived/device-amazon-suez/deviceinfo

@@ -17,6 +17,7 @@ deviceinfo_screen_height="1920"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x40078000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x03f88000"

device/archived/device-apple-d22/APKBUILD

@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-apple-d22
 pkgdesc="Apple iPhone X (Global)"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -27,5 +27,5 @@ package() {
 }
 
 sha512sums="
-ad10b6703985c160486d9f3159f77c0f4d1e1d14d2534b2f90934ac3a06affb7839b0f64c6030c4d2d54fb24ec2c8ec88e516d530e8d8e1230ffe0c1992a020f  deviceinfo
+ff755a83597c073aafbd1c6d0d0671129dd5a14c3133df0c53562e7322c904a3c228f863ddc33da0085b7a786b1d3af9430f2a03b7b38f5275ba3357c2351e8b  deviceinfo
 "

device/archived/device-apple-d22/deviceinfo

@@ -11,6 +11,7 @@ deviceinfo_arch="aarch64"
 
 # Device related
 deviceinfo_chassis="handset"
+deviceinfo_external_storage="false"
 deviceinfo_getty="ttySAC0;115200"
 deviceinfo_rootfs_image_sector_size="4096"
 deviceinfo_screen_width="1125"

device/archived/device-apple-iphone7/APKBUILD

@@ -4,7 +4,7 @@
 maintainer="Jonas Heinrich <onny@project-insanity.org>"
 pkgname=device-apple-iphone7
 pkgdesc="Apple iPhone 7"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -23,5 +23,5 @@ package() {
 }
 
 sha512sums="
-1c91367a815f8d9c3cc295af21928175d792607a37704bf99b7af8e73a00a9a91842cb2c98e16b9216962bf946f1947469d7432bac04710cf2397225ead68741  deviceinfo
+3c204cecf7a9c6d05eeee38e4be563877affdd957cb7952639747e457206fffb6b3d1637550558a9215c4384ed6e23b1b1649d4e03fc7596b96a0b92a87bdda4  deviceinfo
 "

device/archived/device-apple-iphone7/deviceinfo

@@ -10,6 +10,7 @@ deviceinfo_arch="aarch64"
 
 # Device related
 deviceinfo_chassis="handset"
+deviceinfo_external_storage="false"
 deviceinfo_screen_width="750"
 deviceinfo_screen_height="1334"
 

device/archived/device-apple-n61/APKBUILD

@@ -4,7 +4,7 @@
 maintainer="Aster Boese <asterboese@mailbox.org>"
 pkgname=device-apple-n61
 pkgdesc="Apple iPhone 6"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -28,6 +28,6 @@ package() {
 }
 
 sha512sums="
-205d8c2f9b5c9a1378e9fbfa1cf0ba7506c5ff8ba98fb690649f85d9d6ca89f40b474c92091847bf13185750a20cda9092d128010c0d521e88c8bccc13cdb51f  deviceinfo
+8ea21948631e391c48e0589dbf14c776eb24102771cc7eea994c2bf618ed71f5ef303c29f59be3cd8983b76b392967403435f6c6984ef3f0b5bfc69e5ca0aceb  deviceinfo
 f4df83d543efb5748743f56fbfeddc6734ad341fb623f796faa74b4f42cadfd9a7b1aea2bd3a6f7aa3f284bcb34c05b2ec2a1704ad6e88b043f92dc0de14a573  modules-initfs
 "

device/archived/device-apple-n61/deviceinfo

@@ -11,6 +11,7 @@ deviceinfo_arch="aarch64"
 
 # Device related
 deviceinfo_chassis="handset"
+deviceinfo_external_storage="false"
 deviceinfo_screen_width="750"
 deviceinfo_screen_height="1334"
 

device/archived/device-asus-sparrow-downstream/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-asus-sparrow-downstream
 pkgdesc="ASUS ZenWatch 2 (Downstream)"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,6 +26,6 @@ package() {
 }
 
 sha512sums="
-4945852133fff539967551344ddb80839a6369ef857c332fe444fc7b485eb09a4f3d089752267062b25683478a614cea046250a56f77b14317c83123c5b5dbb0  deviceinfo
+2a51794b31e52f92a4d50e34f82656331338d646128f547d8e14c4e40c1e40f15f147270ab634a312742dcce3b4e5894a33e87b0e485c8046641285ecf9a5cb1  deviceinfo
 4b7f1842dbbd6ec2990d7ea259de3f801a33e38a82f747549249cedcb64aa37935e9452a5f50f6d0cc6ce38a1db8e9d6f77440a7c52f61cd353ea75b7f3e395a  kernel-cmdline.conf
 "

device/archived/device-asus-sparrow-downstream/deviceinfo

@@ -11,6 +11,7 @@ deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="watch"
+deviceinfo_external_storage="false"
 deviceinfo_screen_width="320"
 deviceinfo_screen_height="320"
 
@@ -18,6 +19,7 @@ deviceinfo_screen_height="320"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"

device/archived/device-asus-x00td-downstream/APKBUILD

@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-asus-x00td-downstream
 pkgdesc="Asus Zenfone Max Pro M1 downstream"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="postmarketos.org"
 arch="aarch64"
@@ -22,6 +22,6 @@ package() {
 }
 
 sha512sums="
-dba81cd79eb19593fb886918cb2f9595e2b7b656eba4569e646f443c010671d5b48343cc203173036879a6c81c95eb90e02d20f8795c9b5d5f5dfe08740978d9  deviceinfo
+49572afe646d88e31e53b548912e588447e87de04834592210b191902e23401b3af5d968f6b90fb5c0ab29994605c6a95bdaeae85cd4a225a9e0a385c34986ad  deviceinfo
 4b2ea9d473de336b68db736b2b2ae44e8f952a948c016fbbceb205512f73548b85cb00a488f600f1346e92dc839d2ee2419fbd5bf56f9cba9df843419b69ec74  kernel-cmdline.conf
 "

device/archived/device-asus-x00td-downstream/deviceinfo

@@ -6,6 +6,7 @@ deviceinfo_name="Asus ZenFone Max Pro M1"
 deviceinfo_manufacturer="Asus"
 deviceinfo_codename="asus-x00td-downstream"
 deviceinfo_year="2018"
+deviceinfo_append_dtb="false"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -18,6 +19,7 @@ deviceinfo_screen_height="2160"
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_fastboot_partition_vbmeta="vbmeta"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"

device/archived/device-bq-tenshi/APKBUILD

@@ -4,7 +4,7 @@
 maintainer="Achill Gilgenast <achill@achill.org>"
 pkgname=device-bq-tenshi
 pkgdesc="BQ Aquaris U Plus"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -30,6 +30,6 @@ package() {
 }
 
 sha512sums="
-0b163bb1df42ddc914a36512aeb44ad7cb0bad6933a27ca801c501bfedef9773d4175ab443bb632e787d6658032f82e039e82b5b609e9eed4125afd21a31ee83  deviceinfo
+908c5002338a2aa70874ef2057d6bf917af9aabfd163af42c5507c266e9b5f6546933b3a893fbba42b63e71c9bd76a323f40253939732d0158b1824a112e47c6  deviceinfo
 cb07af75b15e2394d94df459d26b399371f18d24489763855388b1155dce4f6d17070716d8581fec178cd7848a7caea3431aad56e83b70e9f27287c4bccda2f2  kernel-cmdline.conf
 "

device/archived/device-bq-tenshi/deviceinfo

@@ -16,6 +16,7 @@ deviceinfo_external_storage="true"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_header_version="0"
 deviceinfo_flash_offset_base="0x80000000"

device/archived/device-bq-vegetahd/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-vegetahd
 pkgdesc="BQ Aquaris E5 HD"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -30,5 +30,5 @@ package() {
 }
 
 sha512sums="
-9f4b5430cc9c92e23531777f64e087a9d7025ed8973b3a001cf5d1adabaacef4481b2978c1cee5acb17528b688bc6da4891c8dc1cf039724d321125cf6b00f57  deviceinfo
+c6eb6140cbfbedfe9cde731329502db7c17366664dbc7813c5e7fc46a5914118d1dfec750ea27e435946d056077f2caf586a77798951caec565af8cd29edc6c6  deviceinfo
 "

device/archived/device-bq-vegetahd/deviceinfo

@@ -18,6 +18,7 @@ deviceinfo_screen_height="720"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_label_kernel="KERNEL"
 deviceinfo_bootimg_mtk_label_ramdisk="ROOTFS"
 deviceinfo_flash_pagesize="2048"

device/archived/device-clockworkpi-uconsole-radxa-cm5/APKBUILD

@@ -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
+"

device/archived/device-clockworkpi-uconsole-radxa-cm5/deviceinfo

@@ -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"

device/archived/device-clockworkpi-uconsole-radxa-cm5/driver-akmbuild.in

@@ -0,0 +1,3 @@
+modname=clockworkpi-radxa
+modver=%%MODVER%%
+built_modules='%%DRIVER_MOD%%'

device/archived/device-clockworkpi-uconsole-radxa-cm5/driver-makefile.in

@@ -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

device/archived/device-google-crosshatch-downstream/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-google-crosshatch-downstream
 pkgdesc="Google Pixel 3 XL (Downstream)"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,6 +25,6 @@ package() {
 }
 
 sha512sums="
-b14243e03fb9fef39d937e5a39e91ab3bdc4feac8eaf37478cd070a046d3da006d4b8c3e4c609af6650efb25a050f45d389b9aed877ce7df43526808a13093c2  deviceinfo
+cc909a06b9015b4aa0d19c04c3cce3b886d78c125712f0ab4956049b464c6cceb9b4b8e141d78951dfce5782c6663e2a27e074a82f6058a84bb0775f14366b27  deviceinfo
 c2762af3b8268599d2edf37f1dca6284e85e7fd6222a701c7699b9baedb3312bad766100a6bafcd2b2660f04241429b19d5f641f2b0a3915dd4cb079d52b0680  kernel-cmdline.conf
 "

device/archived/device-google-crosshatch-downstream/deviceinfo

@@ -10,6 +10,7 @@ deviceinfo_arch="aarch64"
 
 # Device related
 deviceinfo_chassis="handset"
+deviceinfo_external_storage="false"
 deviceinfo_screen_width="1440"
 deviceinfo_screen_height="2960"
 

device/archived/device-hisense-m470bsa/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-hisense-m470bsa
 pkgdesc="Hisense Sero 7 Pro"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -31,7 +31,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-184e54982c641f3454a575b6ec37ac2388fffec93c69b8e8fbc4e43c221927b7c80521dbfad83c4740916c83c8d7e3f37c60de5164a869bd03c9f43d4ebc058f  deviceinfo
+12d3230b8185f466e6679e84c86d8cf9029989565f3f80c8666a54fbb1fc201fd731e940a3451d76ad1c81e34ec18f6ea9e4fc26f65bc7cee6071b1f5304f1a4  deviceinfo
 c2ddf5b681d5f26cf9887f83d2202ff1f1ab415479d5d627966759ba19376a6d368e3fce2ebae02d2cbcf7abf06155ce774643cb0c6dd3b7af3a5748ea36ae8f  kernel-cmdline.conf
 6a53747e22b530dcd52ca523017edf422b36bcd6616d7b0df0ba23f50de0f91dff63913ec6aab5051eebc131879c235cfb724aacefc90a10b94a1790985144ec  modules-load.conf
 8fcb7330a660995bb1aabf3fd2f3a3536fed79e9369bda115874151e84651839c59d134ac3ca0919eff0770ac51c934b252e7d544a26c076614f7f1d10bfd016  pointercal

device/archived/device-hisense-m470bsa/deviceinfo

@@ -19,6 +19,7 @@ deviceinfo_dev_touchscreen_calibration="/etc/pointercal"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"

device/archived/device-htc-enrc2b/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Max Buchholz <2maxax2@gmx.de>"
 pkgname=device-htc-enrc2b
 pkgdesc="HTC One X+"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -23,5 +23,5 @@ package() {
 
 
 sha512sums="
-01a9257c552cd6dfd49e3e05fa2e09529e0a0b3ba0d73583e7d4778ac71768bbbcdd1e8f843b08889aa3a4488141ad5219fe3df14f81a2c68110902aac0be147  deviceinfo
+562c474510ded0b9189f93f0aa2bf8ea9f8edaa816f2127cf0d4ef575d64c140968bc5cc0a2a5b4aaced1784c76f9aad1f02ac81972148a19caa90dab416f058  deviceinfo
 "

device/archived/device-htc-enrc2b/deviceinfo

@@ -10,12 +10,14 @@ deviceinfo_chassis="handset"
 deviceinfo_arch="armv7"
 
 # Device related
+deviceinfo_external_storage="false"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"

device/archived/device-htc-flounder-downstream/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-flounder-downstream
 pkgdesc="Google Nexus 9"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="gpl-v3"
@@ -26,6 +26,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 sha512sums="
-fc86b19b073ddd6c24c24f45a87a1cef653db4f30eb03e13505b299ef55ae379572f68849fcab84b0eed9a060f4c1d8cab6056ac5fe0aaad697d505dc4226017  deviceinfo
+0625d17eec68504244885a0f746f23c4877cb96acbeb8e198b3aa9f93c5c061c8b2ccdb5ed8b42dc2e2d082a1eed2fa4917a3397aef9688b1ffe68a719b5511d  deviceinfo
 1cf6aa0cadb5032ed15ae0f0bbf4ff5d8848e01e10b87e803db82efa3a86edf0a97e01bef376178fc3414791a88a8a0dbde823aa515937edfe762ad375266eea  kernel-cmdline.conf
 "

device/archived/device-htc-flounder-downstream/deviceinfo

@@ -10,6 +10,7 @@ deviceinfo_arch="aarch64"
 
 # Device related
 deviceinfo_chassis="tablet"
+deviceinfo_external_storage="false"
 deviceinfo_screen_width="2048"
 deviceinfo_screen_height="1536"
 deviceinfo_dev_touchscreen="/dev/input/event2"
@@ -17,6 +18,7 @@ deviceinfo_dev_touchscreen="/dev/input/event2"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"

device/archived/device-huawei-alice/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-alice
 pkgdesc="Huawei P8 Lite"
-pkgver=5
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,6 +29,6 @@ package() {
 }
 
 sha512sums="
-23d0f92ebadf92e3f3fc5ee173023729c834a3786f9cdd43047e1d2a1daf9851dde9ebf634a02ac4d593805e23f8d826913716dc7e372a60fe7bcd279ae9e78c  deviceinfo
+b10e17152371dde14c394f51658c7a1fab6c0306e3270bec56487f325836ca51e9e3fc0627170dacdbb4348d8c12ed34fd7dfd5f5d250caf3a238b6fee6308ea  deviceinfo
 51f03864080afd57a9d8e990c15f92f27ed8159d642d2c7e575a3e91f34a866388154ddd04f4e506ba9f078e56c9f19ad2abc2def71d7d4a1d5b5b43269db03d  kernel-cmdline.conf
 "

device/archived/device-huawei-alice/deviceinfo

@@ -17,6 +17,7 @@ deviceinfo_screen_height="1280"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x07478000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x07b88000"

device/archived/device-huawei-angler-downstream/APKBUILD

@@ -1,7 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-angler-downstream
-pkgver=4
+pkgver=3
 pkgrel=0
 pkgdesc="Huawei Nexus 6P (Downstream)"
 url="https://postmarketos.org"
@@ -42,6 +42,6 @@ package() {
 sha512sums="
 262f9f3e28cbb28d236cf6edce4919766baabb18e5b0cf35d672d306efeaf12fd66ffba57e6d9bef0eee90203dc98f95aab17145e4c12383055afb58b922ae58  90-android-touch-dev.rules
 61fe1f91d7b0b570b77fcca76503373cbac2515ca3dcc2f2543b910dfaeb1e935a11975f824f6a72001df4e63329356a6aff2d016e9b4f5d8f7b739fee065c4e  bcmdhd.cal
-55a4bcd67d5bc57ed0d6b53a3c1b5903f19f908ba12d777d2d49520527458576e5fd6af98f3597ebfb2ca1b2064f3139da2985cc1a18f33d596bd75cd4f5b8db  deviceinfo
+dabdcb045c65ec477a01d0c1c1cb2d24d0a7feebcacba5e666b82ad12bbde1d3752c660cc49e0ed4283c9634571781ed718e7fe4ea4990c0c1d90eb6c0a8aa26  deviceinfo
 8b09f1c662be6c43069de23dcafdacd57a9a9a6f21dc51f79454647b5844695f3389c0efed0b0e216437fd1af48134ef16e0d8eba02e5dd80af6794b75dc1e16  kernel-cmdline.conf
 "

device/archived/device-huawei-angler-downstream/deviceinfo

@@ -7,6 +7,7 @@ deviceinfo_manufacturer="Huawei"
 deviceinfo_codename="huawei-angler-downstream"
 deviceinfo_year="2015"
 deviceinfo_chassis="handset"
+deviceinfo_external_storage="false"
 deviceinfo_flash_method="fastboot"
 deviceinfo_arch="aarch64"
 

device/archived/device-huawei-plank/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="gtrxAC <gtrxac2@gmail.com>"
 pkgname=device-huawei-plank
 pkgdesc="Huawei Honor 7"
-pkgver=5
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,6 +26,6 @@ package() {
 }
 
 sha512sums="
-c52e4b4436202d1b64a9cc2d22cc21f9a5963f8a79ec0f92d51b754198b4c7da0ab6e9b48f004e21cf747d510cc3fcd948305f5b88e0b8c9fcba812acb70b5f1  deviceinfo
+b4aab47dea2a8b682fa1a61ae3ad4cf9d9f876cb2db85beefe18ab079f37b41957de7f5fd974133e26a93d883a6055d1ccd5cd3fdefcac4201a424c3d169b68b  deviceinfo
 96aef56c34b780c1fc52bddfe19680485cf02aa6af17d9cd8b74980912887bac7693f757309ade7a72c365241e4ba7a041096cf3c8708c67d5ef55b370f45652  kernel-cmdline.conf
 "

device/archived/device-huawei-plank/deviceinfo

@@ -18,6 +18,7 @@ deviceinfo_screen_height="1920"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_header_version="0"
 deviceinfo_flash_offset_base="0x00678000"

device/archived/device-huawei-sturgeon-downstream/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-huawei-sturgeon-downstream
 pkgdesc="Huawei Watch"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -33,7 +33,7 @@ package() {
 }
 
 sha512sums="
-728b39211adf1f8fadadfc250f8e5c19bde5f392199eabc6a09698369472b3b599ae37980581f36ea23cbc48496f569259a6b10df58a77488ae680b847546486  deviceinfo
+0c1644bece252c0343d50aa6a16616009901e1e48862133e8399ef79b0f6c118563550f990c0d93d79db42c24eaabbde55257d0e4240f8d004e5b54154d5547c  deviceinfo
 15307969581076bbd48997d947fc74a79d331de83d13a6b327c6f0db6f9b35f91a47486838d83f6d21634a267d5ac7d8d7c0e9a08b0198be240a519973f8618a  kernel-cmdline.conf
 a19923f30ac1d328a85ab1162e44442da28dd1ae45529fb73e21d8004594487f61c8f5372e5bbaadfefd27fe27c8a22ce430b81891ac1965e5704bbfec108b82  networkmanager.conf
 "

device/archived/device-huawei-sturgeon-downstream/deviceinfo

@@ -11,6 +11,7 @@ deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="watch"
+deviceinfo_external_storage="false"
 deviceinfo_screen_width="400"
 deviceinfo_screen_height="400"
 
@@ -18,6 +19,7 @@ deviceinfo_screen_height="400"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02000000"

device/archived/device-klipad-rel/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-klipad-rel
 pkgdesc="KLIPAD Klipad Tablet"
-pkgver=5
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,6 +25,6 @@ package() {
 }
 
 sha512sums="
-9c0ec7c355b5cf6b3225f92be10ff8c167949b411ee2843eeabebeb59647dcbf5af5a223bf30c638652b9195819a016c1d8186fc037438636220c303dba1c10c  deviceinfo
+854abfb82a35cc9c5fdef905827794b0b18a31e53b0ce49db6938cfe7746e907453313fba319879fff79b543353c1a4420a059b56fc565017a9de1f1e2fa5b65  deviceinfo
 8add76f3b67dfca9c451fdda99b7594b453dbe2ae9e8a1ddbad07285d8d8f92ad03162fa5e9797043d7a4d63d41bd0283512d7af844258bf1916c12d5982a230  kernel-cmdline.conf
 "

device/archived/device-klipad-rel/deviceinfo

@@ -19,6 +19,7 @@ deviceinfo_screen_height="600"
 
 # pmbootstrap bootimg_analyze
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"

device/archived/device-lenovo-kuntao/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-kuntao
 pkgdesc="Lenovo P2"
-pkgver=7
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -30,7 +30,7 @@ package() {
 }
 
 sha512sums="
-92c34c51d12cf5ace1a76d2980e0979da8a2adbde0f73e8df8c76ad48a88ff4ac537f703953c817956feee93c0ba7f2f36011854445e311058521dad147d31a8  deviceinfo
+192a36d6cfb1deb7b32437f617a40e2d7eb635b1f26d2ab97854270513f9e044bdfb7a94270fd7be9148c733259411ff4a25c2cefdc26d8f23f5c8a648e89160  deviceinfo
 7025641401411a9dc58a99b420a9ae3a764dfb9af0381b0dcc407330d18781889baab3a00667a24fe6caea92298a1ec8b9bd79b6eb588e2be6b2b611d8d77935  kernel-cmdline.conf
 2ce6911ef54351f46819b3323e361ce60297b30f94e81a77e2d20b1bc294e51e3a0fa859ad8e257fa3fdef404a47dd3b64c247222cb7ca73f03cb4dcd083d1f8  modules-initfs
 "

device/archived/device-lenovo-kuntao/deviceinfo

@@ -23,6 +23,7 @@ deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"

device/archived/device-lg-bullhead-downstream/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-bullhead-downstream
 pkgdesc="Google Nexus 5X"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -27,6 +27,6 @@ package() {
 }
 
 sha512sums="
-156ad8e8c9777d3a5f0283aa6913ce0735e01802e2283a790bd5ad767cc2f6ddd77807e1f4c9bb485fe43325f3ce002454279eae308250e60d821c431eb9fb7f  deviceinfo
+57002a0ea6a64eb67ece5d05a819d36805a1ff539f53d83e5af3ffd2a23b9c67ae72d034a53bee40e62fc00e6ec56263df509a2ca78a8edf2b953854d7927463  deviceinfo
 c1c1d614b2ae7af332e98160c6bbc9bda280171284a059a0a270bcacc8d928febef1db9d208909d9af4e5efaff48461c003a4bb0fedf1ab72e76fba8f8057034  kernel-cmdline.conf
 "

device/archived/device-lg-bullhead-downstream/deviceinfo

@@ -10,6 +10,7 @@ deviceinfo_arch="aarch64"
 
 # Device related
 deviceinfo_chassis="handset"
+deviceinfo_external_storage="false"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
 deviceinfo_dev_touchscreen="/dev/input/event0"
@@ -17,6 +18,7 @@ deviceinfo_dev_touchscreen="/dev/input/event0"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02000000"

device/archived/device-lg-d802/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-d802
 pkgdesc="LG G2"
-pkgver=5
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -21,6 +21,6 @@ package() {
 }
 
 sha512sums="
-c3da0e80a51ef410c066370675591c868c2ac63182a3f222bb146e36a1bda19b50f615d6285fe06ad25e67fade2ca2237f23d5ab06bffdda4672af31bd958d6a  deviceinfo
+170d490437c666ea6e6ead02c25b3c16cb0c9e6b9dbc802797254c2c5f9fab3ad0d2628f6f9fa5616e140bcda93a802dbfdb8203016b1abafc624ad0cc7d23c8  deviceinfo
 1af4fa5857be3f4656c7efb446148060fdb225436d291a4b96a9df801a511651d42a5e213e5df43e7b901ad8d83da0d2a1f8c1740366b8b67a9174d7cfd0b166  kernel-cmdline.conf
 "