systemd/systemd: lower systemd-resolved provider_priority

Currently we do not package the configurations needed to use systemd-resolved
as a replacement for openresolv. Without this patch current systems that have
wireguard-tools installed will automatically pull systemd-resolved.

See https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/80058/diffs

.ci/apkbuild-lint.sh

@@ -11,4 +11,12 @@ if [ "$(id -u)" = 0 ]; then
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi
 
+# Wrap pmbootstrap to use this repository for --aports
+pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
+_pmbootstrap="$(command -v pmbootstrap)"
+pmbootstrap() {
+	"$_pmbootstrap" --aports="$pmaports" "$@"
+}
+
 .ci/lib/apkbuild_linting.py
+

.ci/build-jobs.yaml.j2

@@ -1,80 +0,0 @@
-image: alpine:latest
-stages:
-  - build
-
-workflow:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "parent_pipeline"
-
-{% if archs|length == 0 %}
-# Needed because gitlab fails if no jobs are created, e.g: nothing should be
-# built: https://gitlab.com/gitlab-org/gitlab/-/issues/368248
-placeholder:
-  stage: build
-  script:
-    - 'true'
-{% endif %}
-
-.build:
-  stage: build
-  interruptible: true
-  before_script:
-    # upgrade is mostly needed for "qemu" runners that run edge based on a VM
-    # The other build jobs run natively in docker on latest alpine stable and
-    # those should always have whatever we need
-    - apk upgrade -U
-    - .ci/lib/gitlab_prepare_ci.sh
-  after_script:
-    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
-    - .ci/lib/move_logs.sh $CI_PROJECT_DIR
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - packages/
-  timeout: 10 h
-
-{% if ('x86_64' in archs) %}
-build-x86_64:
-  extends: .build
-  script:
-    - .ci/build-x86_64.sh
-{% endif %}
-
-{% if ('x86' in archs) %}
-build-x86:
-  extends: .build
-  script:
-    - .ci/build-x86.sh
-{% endif %}
-
-{% if ('aarch64' in archs) %}
-build-aarch64:
-  extends: .build
-  tags: [arm64]
-  script:
-    - .ci/build-aarch64.sh
-{% endif %}
-
-{% if ('armv7' in archs) %}
-build-armv7:
-  extends: .build
-  tags: [qemu]
-  script:
-    - .ci/build-armv7.sh
-{% endif %}
-
-{% if ('armhf' in archs) %}
-build-armhf:
-  extends: .build
-  tags: [qemu]
-  script:
-    - .ci/build-armhf.sh
-{% endif %}
-
-{% if ('riscv64' in archs) %}
-build-riscv64:
-  extends: .build
-  tags: [qemu]
-  script:
-    - .ci/build-riscv64.sh
-{% endif %}

.ci/codeowners.sh

@@ -0,0 +1,43 @@
+#!/bin/sh -e
+# Description: verify CODEOWNERS file is sane
+# https://postmarketos.org/pmb-ci
+
+# TODO Future improvements:
+# * Check that all devices in main/community have someone in CODEOWNERS
+# * Check that GitLab user actually exists (e.g. deleted account, account with
+#   changed user name)
+
+if grep -q "  " CODEOWNERS; then
+	echo
+	echo "ERROR: Found space indentation in CODEOWNERS."
+	echo "ERROR: Please indent with tab characters."
+	grep "  " CODEOWNERS
+	echo
+	exit 1
+fi
+
+fail=0
+tmppipe=$(mktemp -u)
+mkfifo "$tmppipe"
+grep -v "^#" CODEOWNERS | cut -d'	' -f1  > "$tmppipe" &
+while IFS= read -r line; do
+	[ -z "$line" ] && continue
+
+	# Check if entry generally exists
+	# shellcheck disable=SC2086
+	ls $line >/dev/null 2>&1 || { fail=1; echo "Non-existing: $line"; }
+
+	# Check that directories end with a slash
+	# shellcheck disable=SC2086
+	if test -d "$(ls -d $line)"; then
+		echo "$line" | grep -q '/$' || { fail=1; echo "Missing trailing slash: $line"; }
+	fi
+done < "$tmppipe"
+rm "$tmppipe"
+
+if [ "$fail" = 1 ]; then
+	echo
+	echo "ERROR: Invalid CODEOWNERS entries, see above."
+	echo
+	exit 1
+fi

.ci/lib/build_changed_aports.py

@@ -24,6 +24,23 @@ def build_strict(packages, arch):
                             "--arch", arch, ] + list(packages))
 
 
+def verify_checksums(packages, arch):
+    # Only do this with one build-{arch} job
+    arch_verify = "x86_64"
+    if arch != arch_verify:
+        print(f"NOTE: doing checksum verification in build-{arch_verify} job,"
+              " not here.")
+        return
+
+    if len(packages) == 0:
+        print("no packages changed, not doing any checksums verification")
+        return
+
+    common.run_pmbootstrap(["build_init"])
+    common.run_pmbootstrap(["--details-to-stdout", "checksum", "--verify"] +
+                           list(packages))
+
+
 if __name__ == "__main__":
     # Architecture to build for (as in build-{arch})
     if len(sys.argv) != 2:
@@ -76,9 +93,18 @@ if __name__ == "__main__":
     # No packages: skip build
     if len(packages) == 0:
         print(f"no packages changed, which can be built for {arch}")
-        sys.exit(0)
 
-    build_strict(packages, arch)
+    else:
+        verify_only = common.commit_message_has_string("[ci:skip-build]")
+        if verify_only:
+            # [ci:skip-build]: verify checksums and stop
+            print("WARNING: not building changed packages ([ci:skip-build])!")
+            print("verifying checksums: " + ", ".join(packages))
+            verify_checksums(packages, arch)
+        else:
+            # Build packages
+            print(f"building in strict mode for {arch}: {', '.join(packages)}")
+            build_strict(packages, arch)
 
     # Build packages in extra-repos/systemd
     # FIXME: this should probably be more generic, if other repos are added later?
@@ -101,6 +127,15 @@ if __name__ == "__main__":
         # No packages: skip build
         if len(systemd_pkgs) == 0:
             print(f"no packages changed, which can be built for {arch}")
-            sys.exit(0)
 
-        build_strict(systemd_pkgs, arch)
+        else:
+            verify_only = common.commit_message_has_string("[ci:skip-build]")
+            if verify_only:
+                # [ci:skip-build]: verify checksums
+                print("WARNING: not building changed packages for extra-repos/systemd: ([ci:skip-build])!")
+                print("verifying checksums: " + ", ".join(systemd_pkgs))
+                verify_checksums(systemd_pkgs, arch)
+            else:
+                # Build packages
+                print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(systemd_pkgs)}")
+                build_strict(systemd_pkgs, arch)

.ci/lib/common.py

@@ -41,9 +41,7 @@ def add_upstream_git_remote():
 
 
 def commit_message_has_string(needle):
-    base_commit = get_base_commit()
-
-    return needle in run_git(["log", "--pretty=format:%B", f"{base_commit}..HEAD"])
+    return needle in run_git(["show", "-s", "--format=full", "HEAD"])
 
 
 def run_pmbootstrap(parameters):
@@ -88,10 +86,12 @@ def get_upstream_branch():
     return ret
 
 
-def get_base_commit() -> str:
-    """Get the base commit that can be compared with HEAD to get all commits in the
-    given branch/merge request."""
-
+def get_changed_files(removed=True):
+    """ Get all changed files and print them, as well as the branch and the
+        commit that was used for the diff.
+        :param removed: also return removed files (default: True)
+        :returns: set of changed files
+    """
     branch_upstream = f"upstream/{get_upstream_branch()}"
     commit_head = run_git(["rev-parse", "HEAD"])[:-1]
     commit_upstream = run_git(["rev-parse", branch_upstream])[:-1]
@@ -107,17 +107,6 @@ def get_base_commit() -> str:
         commit = run_git(["merge-base", branch_upstream, "HEAD"])[:-1]
     print("comparing HEAD with: " + commit)
 
-    return commit
-
-
-def get_changed_files(removed=True):
-    """ Get all changed files and print them, as well as the branch and the
-        commit that was used for the diff.
-        :param removed: also return removed files (default: True)
-        :returns: set of changed files
-    """
-    commit = get_base_commit()
-
     # Changed files
     ret = set()
     print("changed file(s):")

.ci/lib/generate_build_jobs.py

@@ -1,56 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2025 Pablo Correa Gomez
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from pathlib import Path
-import shutil
-import sys
-
-from jinja2 import Template
-import add_pmbootstrap_to_import_path
-import pmb.parse
-import pmb.helpers.logging
-from pmb.core.arch import Arch
-
-# Same dir
-import common
-
-if __name__ == "__main__":
-    # Needs input to output if we should create the jobs
-    if len(sys.argv) != 3:
-        print("usage: generate_build_jobs.py TEMPLATE CHILD_PIPELINE")
-        print(sys.argv)
-        sys.exit(1)
-    template = sys.argv[1]
-    child_pipeline = sys.argv[2]
-
-    # pmb logging has to be initialized for later pmb commands to work, setting
-    # to /dev/null since we don't care about the output. Later this could
-    # be changed to a file and added as a CI artifact if we need to debug
-    # something.
-    pmb.logging.init(Path("/dev/null"), False)
-    archs = set()
-    # Get and print modified packages
-    common.add_upstream_git_remote()
-    for file in common.get_changed_files():
-        path = Path(file)
-        if path.name != "APKBUILD":
-            continue
-        elif not path.exists():
-            continue  # APKBUILD was deleted
-        apkbuild = pmb.parse.apkbuild(path)
-        archs.update(apkbuild["arch"])
-
-    if common.commit_message_has_string("[ci:skip-build]"):
-        print("User requested skipping build, not creating child pipeline file")
-        archs = set()
-
-    # This ignores things like !armv7, that could be a follow-up optimization
-    if 'noarch' in archs or 'all' in archs:
-        archs = set([str(arch) for arch in Arch.supported()])
-
-    print(archs)
-    with open(template) as f:
-        rendered = Template(f.read()).render(archs=archs)
-        with open(child_pipeline, "w") as fw:
-            fw.write(rendered)

.ci/lib/testlib.sh

@@ -1,199 +0,0 @@
-#!/bin/sh
-# Unit testing framework for shell scripts
-# Invoke with the path to a tests/ subdir of a package and the
-# package name as arguments. Or source it with the following
-# variables set:
-# * results_dir - second argument to the test script
-
-set -e
-
-# Colors :D
-RED="\e[31m"
-GREEN="\e[32m"
-YELLOW="\e[33m"
-BLUE="\e[34m"
-BOLDBLUE="\e[1;34m"
-RESET="\e[0m"
-
-testlib_path="$(realpath "$0")"
-
-_test_assert_failed=""
-_test_testn=1
-_test_passedn=0
-_test_failedn=0
-_test_current_test=""
-_test_statefile="$(mktemp)"
-# Set by each test
-results_dir="${results_dir:-}"
-
-test_log() {
-	# ash supports echo -e
-	# shellcheck disable=SC3037
-	echo -e "$*" >&2
-}
-
-test_info() {
-	# shellcheck disable=SC3037
-	echo -e "${BLUE}$*${RESET}" >&2
-}
-
-test_debug() {
-	# shellcheck disable=SC3037
-	echo -e "${YELLOW}$*${RESET}" >&2
-}
-
-assert_strequal() {
-	# $1: first string
-	# $2: second string
-	if [ -z "$1" ] || [ -z "$2" ]; then
-		test_log "ERROR: assert_equal: not enough arguments given"
-		exit 1
-	fi
-	if [ "$1" != "$2" ]; then
-		_test_assert_failed="$1 != $2"
-		test_log "    ❌ $_test_assert_failed"
-		return
-	fi
-	test_log "    ✅ $1 == $2"
-}
-
-assert_equal() {
-	# $1: name of variable
-	# $2: value to compare
-	if [ -z "$1" ] || [ -z "$2" ]; then
-		test_log "ERROR: assert_equal: not enough arguments given"
-		exit 1
-	fi
-	val="$(eval echo "\$$1")"
-	if [ "$val" != "$2" ]; then
-		_test_assert_failed="\$$1 != $2 (got $val)"
-		test_log "    ❌ $_test_assert_failed"
-		return
-	fi
-	test_log "    ✅ \$$1 == $2"
-}
-
-assert_unset() {
-	if [ -z "$1" ]; then
-		test_log "ERROR: assert_unset: not enough arguments given"
-		exit 1
-	fi
-	val="$(eval echo \$"$1")"
-	if [ -n "$val" ]; then
-		_test_assert_failed="\$$1 should be unset (has value '$val')"
-		test_log "    ❌ $_test_assert_failed"
-		return
-	fi
-	test_log "    ✅ \$$1 is unset"
-}
-
-# Log some expression and evaluate it
-logeval() {
-	eval "$*"
-	test_log "${YELLOW}+ $*${RESET}"
-}
-
-# Start a test. Shell scripts involved in the test should be sourced AFTER calling this function!
-start_test() {
-	if [ -n "$_test_current_test" ]; then
-		test_log "ERROR: multiple calls to start_test without calling end_test first!"
-		test_log "Current test: $_test_current_test"
-		exit 1
-	fi
-	test_log "==> Test $_test_testn: $1"
-	_test_current_test="$1"
-	set > "$_test_statefile"
-}
-
-# End a test and reset the environment.
-end_test() {
-	local msg
-	local save_assert_failed
-
-	# Restore environment
-	save_assert_failed="$_test_assert_failed"
-
-	# Splitting is intentional
-	# shellcheck disable=SC2046
-	unset $(set | grep "='" | cut -d= -f1 | grep -vE "(PATH|IFS|TERM|LANG|HOME|PWD|SHELL|USER|save_assert_failed|_test_statefile)" )
-
-	# shellcheck disable=SC1090
-	. "$_test_statefile"
-	_test_assert_failed="$save_assert_failed"
-
-	if [ -n "$_test_assert_failed" ]; then
-		msg="${RED}Failed! ❌ ${_test_assert_failed}${RESET}"
-		echo "Test $_test_testn: $_test_assert_failed" >> "$results_dir/failed"
-		_test_failedn=$((_test_failedn+1))
-		echo "$_test_failedn" > "$results_dir/failedn"
-		unset _test_assert_failed
-	else
-		msg="${GREEN}Passed!${RESET}"
-		_test_passedn=$((_test_passedn+1))
-		echo "$_test_passedn" > "$results_dir/passedn"
-	fi
-	test_log "<== Test $_test_testn: $msg $_test_current_test\n"
-	_test_testn=$((_test_testn+1))
-	_test_current_test=""
-}
-
-# Call at the end of each testsuite shell script
-end_testsuite() {
-	if [ -n "$_test_current_test" ]; then
-		test_log "${RED}ERROR: end_testsuite called without calling end_test first!${RESET}"
-		test_log "${RED}Current test: $_test_current_test${RESET}"
-		exit 1
-	fi
-	if [ -f "$results_dir/failed" ]; then
-		exit 1
-	fi
-
-	exit 0
-}
-
-run_tests() {
-	local failed test_results_base
-	local test name total passedn failedn t_passed t_failed
-
-	test_results_base="$(mktemp -d)"
-	test_log "Running tests for $2"
-
-	# FIXME: yeah this isn't quite the best way to iterate the files
-	# shellcheck disable=SC2010
-	for name in $(ls "$1" | grep "\.sh$"); do
-		test="$1/$name"
-		mkdir "$test_results_base/$name"
-		echo 0 > "$test_results_base/$name/passedn"
-		echo 0 > "$test_results_base/$name/failedn"
-		test_log
-		test_log "${BOLDBLUE}# Test suite ${name}${RESET}"
-		$test "$testlib_path" "$test_results_base/$name" || failed="$failed $name"
-		t_passed=$(cat "$test_results_base/$name/passedn")
-		t_failed=$(cat "$test_results_base/$name/failedn")
-		passedn=$((passedn+t_passed))
-		failedn=$((failedn+t_failed))
-		total=$((total+t_passed+t_failed))
-	done
-	if [ -n "$failed" ]; then
-		test_log
-		test_log "Some tests failed:"
-		for test in $failed; do
-			test_log "❌ $test"
-			test_log "    ${RED}$(cat "$test_results_base/$test/failed")${RESET}"
-		done
-	fi
-
-	if [ $passedn -lt $total ]; then
-		test_log "[${RED}$passedn/$total tests passed${RESET}]"
-	else
-		test_log "[${GREEN}$passedn/$total tests passed!${RESET}]"
-	fi
-	test_log
-
-	if [ -n "$failed" ]; then exit 1; else exit 0; fi
-}
-
-# FIXME: probably not the best way to determine if this was sourced
-if [ $# -gt 0 ]; then
-	run_tests "$1" "$2"
-fi

.ci/lib/verify_checksums.py

@@ -1,82 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2025 Pablo Correa Gomez
-# SPDX-License-Identifier: GPL-3.0-or-later
-import os
-import sys
-
-# Same dir
-import common
-
-# pmbootstrap
-import add_pmbootstrap_to_import_path
-import pmb.core
-from pmb.core.context import get_context
-
-
-def verify_checksums(packages):
-    if len(packages) == 0:
-        print("no packages changed, not doing any checksums verification")
-        return
-
-    print("verifying checksums: " + ", ".join(packages))
-    common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["--details-to-stdout", "checksum", "--verify"] +
-                           list(packages))
-
-
-if __name__ == "__main__":
-    # Get and print modified packages
-    common.add_upstream_git_remote()
-    packages = common.get_changed_packages()
-
-    # Load context
-    sys.argv = ["pmbootstrap.py", "chroot"]
-    args = pmb.parse.arguments()
-    context = get_context()
-
-    # Get set of all buildable packages for the enabled repos, for skipping unbuildable
-    # aports later. We might be given a changed aport from e.g. extra-repos/systemd when
-    # that repo is not enabled
-    buildable_pkgs = set()
-    for path in pmb.core.pkgrepo.pkgrepo_iter_package_dirs():
-        buildable_pkgs.add(os.path.basename(path))
-
-    # To store a list of packages from extra-repos/systemd for special handling
-    #  later:
-    systemd_pkgs = list()
-
-    # Filter out packages are not found in enabled repos
-    # (Iterate over copy of packages, because we modify it in this loop)
-    for package in packages.copy():
-        if package not in buildable_pkgs:
-            print(f"{package}: not in current repo, skipping")
-            packages.remove(package)
-            # FIXME: this should probably be more generic, if other repos are added
-            #  later?
-            # This just tosses the package into the list of packages to try
-            # building later w/ systemd enabled, and assumes it'll be found
-            # there.
-            print(f"{package}: adding to list of packages to check in systemd repo")
-            systemd_pkgs.append(package)
-            continue
-
-    # No packages: skip build
-    if len(packages) == 0:
-        print("no packages to check for the current repo")
-    else:
-       verify_checksums(packages)
-
-    # FIXME: this should probably be more generic, if other repos are added later?
-    if systemd_pkgs:
-        common.run_pmbootstrap(["config", "systemd", "always"])
-        # To fix the ERROR: Chroot 'native' is for the 'edge' channel, but you are on the
-        # 'systemd-edge' channel. Run 'pmbootstrap zap' to delete your chroots and try again.
-        # To do this automatically, run 'pmbootstrap config auto_zap_misconfigured_chroots yes'.
-        common.run_pmbootstrap(["config", "auto_zap_misconfigured_chroots", "yes"])
-
-        # No packages: skip build
-        if len(systemd_pkgs) == 0:
-            print("no packages to check for the systemd repo")
-
-        else:
-            verify_checksums(systemd_pkgs)

.ci/shellcheck.sh

@@ -15,6 +15,7 @@ fi
 # Shell: shellcheck
 sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
+	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
 	./main/postmarketos-installkernel/installkernel-pmos
@@ -38,11 +39,10 @@ sh_files="
 	$(find . -path './main/postmarketos-mvcfg/*.sh')
 
 	$(find . -path './.ci/**.sh')
-	$(find . -path '**/tests/*.sh')
 "
 
 for file in $sh_files; do
 	echo "Test with shellcheck: $file"
 	cd "$DIR/$(dirname "$file")"
-	shellcheck -S warning -e SC1008 -e SC3043 -x "$(basename "$file")"
+	shellcheck -e SC1008 -e SC3043 -x "$(basename "$file")"
 done

.ci/testcases/test_device.py

@@ -120,13 +120,13 @@ def test_aports_maintained():
         assert maintainers, f"{path} in community needs at least 1 Maintainer"
 
 
-def test_aports_archived():
+def test_aports_unmaintained():
     """
-    Ensure that aports in /device/archived have an "Archived:" comment
-    that describes why the aport is archived.
+    Ensure that aports in /device/unmaintained have an "Unmaintained:" comment
+    that describes why the aport is unmaintained.
     """
 
-    for path in pkgrepo_iglob("device/archived/*/APKBUILD"):
-        archived = pmb.parse._apkbuild.archived(path)
-        assert archived, f"{path} should have an Archived: " +\
-            "comment that describes why the package is archived"
+    for path in pkgrepo_iglob("device/unmaintained/*/APKBUILD"):
+        unmaintained = pmb.parse._apkbuild.unmaintained(path)
+        assert unmaintained, f"{path} should have an Unmaintained: " +\
+            "comment that describes why the package is unmaintained"

.ci/testcases/test_deviceinfo.py

@@ -74,8 +74,7 @@ def test_deviceinfo():
             name = info.name
             manufacturer = info.manufacturer
             if not name.startswith(manufacturer) and \
-                    not name.startswith("Google") and \
-                    not name.startswith("Jolla"):
+                    not name.startswith("Google"):
                 raise RuntimeError("Please add the manufacturer in front of"
                                    " the deviceinfo_name, e.g.: '" +
                                    manufacturer + " " + name + "'")

.ci/testcases/test_kernel.py

@@ -23,7 +23,7 @@ def test_aports_kernel():
         apkbuild = pmb.parse.apkbuild(path)
         aport_name = os.path.basename(os.path.dirname(path))
 
-        if aport_name == "linux-pam-pmos":
+        if aport_name == "linux-pam":
             continue  # This package isn't a linux kernel!
 
         if "pmb:cross-native" not in apkbuild["options"]:

.ci/testcases/test_source.py

@@ -105,8 +105,7 @@ def test_aports_unreferenced_files():
             if os.path.basename(rel_file_path) not in sources_chk \
                     and rel_file_path not in apkbuild["install"] \
                     and rel_file_path not in subpackage_installs \
-                    and rel_file_path not in trigger_sources \
-                    and not rel_file_path.startswith("tests/"):
+                    and rel_file_path not in trigger_sources:
                 raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")
 
 

.ci/unit-tests.sh

@@ -1,19 +0,0 @@
-#!/bin/sh -e
-# Description: run unit-tests for packages
-# https://postmarketos.org/pmb-ci
-#
-# This script only exists to allow running unit-tests locally.
-# In actual CI the package tests/ subdir has it's own YAML
-# fine defining a job which calls testlib for that package.
-# This way we can run all the package unit-tests locally but
-# have them be individual jobs in GitLab.
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-find . -type d -name "tests" | while read -r testdir; do
-	pkg="$(basename "$(dirname "$testdir")")"
-	.ci/lib/testlib.sh "$testdir" "$pkg"
-done

.ci/verify-checksums.sh

@@ -1,16 +0,0 @@
-#!/bin/sh -e
-# Description: verify checksums of modified packages
-# Options: native
-# Use 'native' because it requires running pmbootstrap.
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-	sh ./install_pmbootstrap.sh
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
-fi
-
-export PYTHONUNBUFFERED=1
-
-.ci/lib/verify_checksums.py

.githooks/prepare-commit-msg

@@ -37,30 +37,13 @@ prepend_msg() {
 [ -z "$SOURCE" ] || exit 0
 
 lcp=$(git diff-index --name-only --cached HEAD | longest_common_prefix)
-prefix=""
 
 case "$lcp" in
-	extra-repos/systemd/systemd/*)
-		prefix="systemd"
-		;;
-	extra-repos/systemd/*)
-		prefix="systemd/$(echo "$lcp" | cut -d/ -f3)"
-		;;
-	device/*/*)
-		prefix="$(echo "$lcp" | cut -d/ -f3)"
-		;;
-	device/*)
-		# Multiple packages touched for same device category. More
-		# logic could be added to detect if they all belong to same
-		# device.
-		;;
-	[^.]*/*)
-		prefix="$(echo "$lcp" | cut -d/ -f1-2)"
-		;;
+	device/*/*) prepend_msg "$(echo "$lcp" | cut -d/ -f3): ";;
+	# Multiple packages touched for same device category
+	# More logic could be added to detect if they all belong to same device
+	device/*)  ;;
+	[^.]*/*) prepend_msg "$(echo "$lcp" | cut -d/ -f1-2): ";;
 esac
 
-if [ -n "$prefix" ]; then
-	prepend_msg "$prefix: "
-fi
-
 exit 0

.gitignore

@@ -118,6 +118,3 @@ ENV/
 
 # Allow having untracked packages in aports using a custom-something directory
 /custom-*/
-
-# child pipeline
-.ci/build-jobs.yaml

.gitlab-ci.yml

@@ -8,16 +8,14 @@ after_script:
   - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
-  - prepare
   - build
   - autoupdate
-  - test
 variables:
   # Default of 20 is pretty small, sometimes MRs have >20 commits in them. 100
   # seems like a reasonable balance. If this is too low, git merge-base (from ci/
   # common.py) can fail
   GIT_DEPTH: 100
-
+  
 # This defines the rules for when a pipeline should run.
 workflow:
   rules:
@@ -29,10 +27,6 @@ workflow:
     # Run scheduled pipeline for autoupdate or manually triggered pipeline
     - if: $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
 
-# Some packages have their own yaml files defining tests. All of these should contain
-# only jobs which extend the .package-test job!
-include: "**/.gitlab-ci.yml"
-
 # device documentation
 wiki:
   stage: lint
@@ -69,6 +63,7 @@ shellcheck-grep:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/shellcheck.sh
     - .ci/grep.sh
+    - .ci/codeowners.sh
 
 editor-config:
   stage: lint
@@ -121,15 +116,6 @@ kernel-kconfig:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/kconfig.sh
 
-# Verify checksums
-verify-checksums:
-  stage: lint
-  rules:
-    - if: *mr_rule
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/verify-checksums.sh
-
 # MR settings
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
@@ -143,44 +129,55 @@ mr-settings:
     - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
     - python3 ./check_mr_settings.py
 
-# Calculate build of changed aports using a dynamic downstream pipelines:
-# https://docs.gitlab.com/ci/pipelines/downstream_pipelines/#dynamic-child-pipelines
-# For those to work, we need two jobs:
-# * First one (this one) that generates a valid yaml file with the job yaml as
-#   an artifact
-# * Second one (build-jobs) that has a "trigger" key with the yaml file from
-#   which to trigger pipelines
-# To avoid reworking the whole CI file, for now we are re-using this same file
-# to trigger the downstream pipeline. In that case, $CI_PIPELINE_SOURCE will
-# be set to "parent_pipeline", and only the jobs that extend .build will run
-generate-build-jobs:
-  stage: prepare
-  before_script:
-    - .ci/lib/gitlab_prepare_ci.sh
-  needs: []
-  script:
-    - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh py3-jinja2
-    - .ci/lib/generate_build_jobs.py .ci/build-jobs.yaml.j2 .ci/build-jobs.yaml
-
-  artifacts:
-    paths:
-      - .ci/build-jobs.yaml
-  rules:
-    - if: *mr_rule
-
-build-jobs:
+# build changed aports
+.build:
   stage: build
-  trigger:
-    include:
-      - artifact: .ci/build-jobs.yaml
-        job: generate-build-jobs
-    strategy: depend
-    forward:
-      # So that we don't have to duplicate GIT_DEPTH
-      pipeline_variables: true
   rules:
     - if: *mr_rule
+  before_script:
+    - *global_before_scripts
+    - .ci/lib/gitlab_prepare_ci.sh
+  after_script:
+    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - packages/
+  timeout: 10 h
+
+build-x86_64:
+  extends: .build
+  script:
+    - .ci/build-x86_64.sh
+
+build-x86:
+  extends: .build
+  script:
+    - .ci/build-x86.sh
+
+build-aarch64:
+  extends: .build
+  tags: [arm64]
+  script:
+    - .ci/build-aarch64.sh
+
+build-armv7:
+  extends: .build
+  tags: [qemu]
+  script:
+    - .ci/build-armv7.sh
+
+build-armhf:
+  extends: .build
+  tags: [qemu]
+  script:
+    - .ci/build-armhf.sh
+
+build-riscv64:
+  extends: .build
+  tags: [qemu]
+  script:
+    - .ci/build-riscv64.sh
 
 auto-update:
   stage: autoupdate
@@ -200,11 +197,3 @@ auto-update:
       - log.txt
       - log_testsuite_pmaports.txt
       - pmbootstrap.cfg
-
-# Template for package test jobs defined per-package
-.package-test:
-  stage: test
-  rules:
-    - if: *mr_rule
-  before_script:
-    - .ci/lib/gitlab_prepare_ci.sh

.gitlab/issue_templates/Default.md

@@ -34,7 +34,6 @@
 
 ### On what environment did you encounter the issue?
 #### Environments
-* [ ] COSMIC
 * [ ] GNOME Shell on Mobile
 * [ ] Phosh
 * [ ] Plasma Mobile

.mrhlpr.json

@@ -0,0 +1,10 @@
+{
+    "subject_format": {
+        "pass": [
+            "^(([a-z]+\\/\\)?\\([a-z\\-0-9*{}]+),?)+: [a-z][A-Za-z\\/\\-0-9*{}\\.,_&:=' ]+( \\(MR \\d+\\)|)$",
+            "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$",
+            "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$",
+            "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$"
+        ]
+    }
+}

CODEOWNERS

@@ -0,0 +1,160 @@
+# https://docs.gitlab.com/ee/user/project/code_owners.html
+# Put groups like @sdm845-mainline into test_device.py:gitlab_groups.
+# Order lines alphabetically!
+
+device/*/*-amlogic-s905*/			@funderscore
+device/*/*-arrow-db410c/			@Minecrell
+device/*/*-asus-me176c/				@Minecrell
+device/*/*-ayn-odin/				@jenneron
+device/*/*-bq-paella/				@Minecrell
+device/*/*-bq-tenshi/				@fossdd
+device/*/*-google-gru/				@jenneron
+device/*/*-google-kukui/			@jenneron @binarycraft
+device/*/*-google-oak/				@jenneron @adamthiede
+device/*/*-google-trogdor/			@jenneron
+device/*/*-google-veyron/			@jenneron
+device/*/*-google-x64cros/			@jenneron @JustSoup321 @alpernebbi
+device/*/*-htc-golfu/				@Newbyte
+device/*/*-htc-m8qlul/				@Newbyte
+device/*/*-kobo-clara/				@akemnade
+device/*/*-lenovo-21bx/				@craftyguy @jane400
+device/*/*-lenovo-a6000/			@jenneron @Minecrell
+device/*/*-lenovo-a6010/			@jenneron @Minecrell
+device/*/*-librecomputer-lafrite/		@funderscore
+device/*/*-librecomputer-lepotato/		@funderscore
+device/*/*-librecomputer-solitude/		@Newbyte @funderscore
+device/*/*-motorola-harpia/			@Minecrell
+device/*/*-nokia-n900/				@sicelo @Danct12
+device/*/*-pine64-pinebookpro/			@QC8086
+device/*/*-pine64-pinephone/			@craftyguy @milesalan @proycon @anjandev @StacyHarper @Arnavion @PsychoGame
+device/*/*-pine64-pinephonepro/			@PsychoGame
+device/*/*-pine64-rockpro64/			@PureTryOut
+device/*/*-purism-librem5/			@craftyguy @alistair23 @Newbyte
+device/*/*-qcom-msm8916/			@Minecrell @TravMurav
+device/*/*-qcom-msm8953/			@barni2000 @alikates @vipaoL @jiaxyga
+device/*/*-qcom-sdm670/				@flamingradian
+device/*/*-qcom-sdm845/				@sdm845-mainline
+device/*/*-qcom-sm7150/				@Adrian @jiaxyga @ungeskriptet
+device/*/*-qcom-sm8250/				@jianhua
+device/*/*-qcom/					@calebccff
+device/*/*-samsung-a3/				@Mis012 @TravMurav @Minecrell
+device/*/*-samsung-a5/				@Minecrell @minlexx
+device/*/*-samsung-a51/				@manoedinata
+device/*/*-samsung-e7/				@wonderfulShrineMaidenOfParadise
+device/*/*-samsung-espresso10/			@MightyM17
+device/*/*-samsung-espresso7/			@MightyM17 @antoni.aloytorrens
+device/*/*-samsung-fortuna/			@wonderfulShrineMaidenOfParadise
+device/*/*-samsung-fortunaltezt/		@bolilingmeng89006
+device/*/*-samsung-grandmax/			@wonderfulShrineMaidenOfParadise
+device/*/*-samsung-gt510/			@TravMurav
+device/*/*-samsung-gt58/			@TravMurav
+device/*/*-samsung-j3ltetw/		@bolilingmeng89006
+device/*/*-samsung-j4lte/			@manoedinata
+device/*/*-samsung-j5/				@wonderfulShrineMaidenOfParadise
+device/*/*-samsung-j5x/				@wonderfulShrineMaidenOfParadise
+device/*/*-samsung-rossa/			@wonderfulShrineMaidenOfParadise
+device/*/*-samsung-serranove/			@Minecrell
+device/*/*-tolino-shine2hd/			@akemnade
+device/*/*-videostrong-kii-pro/			@funderscore
+device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
+device/*/*-xiaomi-beryllium/			@joelselvaraj
+device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
+device/*/*-xiaomi-davinci/			@Adrian @ArianK16a
+device/*/*-xiaomi-elish/			@jianhua
+device/*/*-xiaomi-markw/			@vipaoL
+device/*/*-xiaomi-mido/				@barni2000
+device/*/*-xiaomi-scorpio/			@Tooniis
+device/*/*-xiaomi-surya/			@jiaxyga @ungeskriptet
+device/*/*-xiaomi-tissot/			@jiaxyga @barni2000
+device/*/*-xiaomi-vince/			@M0Rf30
+device/*/*-xiaomi-wt88047/			@Minecrell
+device/*/*-xiaomi-ysl/				@barni2000
+device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
+device/*/alsa-ucm-conf-qcom-sdm670/		@flamingradian
+device/*/device-apple-n61/			@JustSoup321
+device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
+device/*/device-google-nyan-big/		@jenneron
+device/*/device-google-nyan-blaze/		@jenneron
+device/*/device-google-peach-pi/		@jenneron
+device/*/device-google-peach-pit/		@jenneron
+device/*/device-google-sargo/			@flamingradian
+device/*/device-google-snow/			@jenneron
+device/*/device-huawei-plank/			@gtrxAC
+device/*/device-lg-judyln/			@Newbyte
+device/*/device-lg-judyp/			@jenneron
+device/*/device-microsoft-surface-rt/		@jenneron @jethrob
+device/*/device-nvidia-tegra-armv7/		@clamor-s @okias @mschwalm @nokun
+device/*/device-odroid-xu4/			@Grimler
+device/*/device-oneplus-enchilada/		@calebccff
+device/*/device-oneplus-fajita/			@calebccff
+device/*/device-postmarketos-trailblazer/	@calebccff
+device/*/device-qcom-msm8909/			@wonderfulShrineMaidenOfParadise
+device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
+device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
+device/*/device-qemu-riscv64/			@Minecrell
+device/*/device-qualcomm-sdm845/		@calebccff
+device/*/device-raspberry-pi3/			@fossdd
+device/*/device-samsung-chagallwifi/		@Grimler
+device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
+device/*/device-samsung-j5y17lte/		@andrisas
+device/*/device-samsung-klimtlte/		@Grimler
+device/*/device-samsung-lt01/			@knuxify
+device/*/device-samsung-m0/			@Newbyte
+device/*/device-samsung-manta/			@jenneron @alexmrqt
+device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
+device/*/device-solidrun-cubox/			@longnoserob
+device/*/firmware-google-sargo/			@flamingradian
+device/*/firmware-google-veyron-brcm/		@jenneron
+device/*/firmware-motorola-osprey/		@Minecrell
+device/*/firmware-odroid-xu4/			@Grimler
+device/*/firmware-oneplus-sdm845/		@calebccff
+device/*/firmware-powervr-gx6250/		@jenneron
+device/*/kobo-epdc-extractor/			@akemnade
+device/*/linux-google-nyan/			@jenneron
+device/*/linux-google-veyron/			@jenneron
+device/*/linux-huawei-plank/			@gtrxAC
+device/*/linux-next/				@calebccff
+device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
+device/*/linux-postmarketos-amlogic/		@funderscore @exkc
+device/*/linux-postmarketos-apple/		@JustSoup321
+device/*/linux-postmarketos-exynos4/		@Newbyte @Grimler @knuxify
+device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
+device/*/linux-postmarketos-grate/		@clamor-s @jenneron @jethrob
+device/*/linux-postmarketos-imx-ereader/	@akemnade
+device/*/linux-postmarketos-marvell/		@longnoserob @exkc
+device/*/linux-postmarketos-mediatek-mt8173/	@jenneron @adamthiede
+device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
+device/*/linux-postmarketos-omap/		@MightyM17 @Sicelo
+device/*/linux-postmarketos-qcom-laptop/	@craftyguy @calebccff
+device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
+device/*/linux-postmarketos-qcom-msm8953/	@M0Rf30 @Ultra-azu @barni2000
+device/*/linux-postmarketos-qcom-msm8996/	@Tooniis
+device/*/linux-postmarketos-qcom-sc7180/	@jenneron
+device/*/linux-postmarketos-rockchip/		@QC8086
+device/*/linux-postmarketos-stericsson/		@Newbyte
+device/*/linux-samsung-chagallwifi/		@Grimler
+device/*/linux-samsung-coreprimevelte/		@legolivesmatter @balejk
+device/*/linux-samsung-j5y17lte/		@andrisas
+device/*/linux-samsung-klimtlte/		@Grimler
+device/*/oem-amd/				@craftyguy
+device/*/oem-intel/				@craftyguy
+device/*/oem-nvidia/				@craftyguy
+device/*/soc-mediatek-mt8183/			@jenneron
+device/*/soc-qcom-msm8953/			@barni2000
+device/*/soc-qcom-msm8996/			@Tooniis
+device/*/soc-qcom-sc7180/			@jenneron
+device/*/soc-rockchip-rk3399/			@jenneron
+device/*/soc-samsung-exynos4412/		@Newbyte
+device/*/u-boot-librem5/			@craftyguy @alistair23 @Newbyte
+device/*/u-boot-pinebookpro/			@QC8086
+device/*/u-boot-pinephone/			@Arnavion @PsychoGame
+device/*/wl1251-cal/				@Danct12
+main/postmarketos*gnome*/			@pabloyoyoista @Newbyte @fossdd
+main/postmarketos-initramfs/			@calebccff @craftyguy
+main/postmarketos-ui-i3wm/			@fossdd
+main/postmarketos-ui-phosh/			@pabloyoyoista @Newbyte @fossdd
+main/postmarketos-ui-plasma-bigscreen/		@PureTryOut
+main/postmarketos-ui-plasma-desktop/		@PureTryOut
+main/postmarketos-ui-plasma-mobile/		@PureTryOut
+main/shutdown-clear-rtc-wakealarm/		@Arnavion
+main/ttyescape/					@calebccff

COMMITSTYLE.md

@@ -42,19 +42,6 @@ commit title can opt to use the following format:
 
 	manufacturer-codename: description of change
 
-### Changes to packages inside of the systemd directory
-
-We also shorten the prefixes for packages in `extra-repos/systemd`.
-When the `systemd` package itself gets changed, use `systemd: ` as
-prefix. For example:
-
-	systemd: add triggers for reloading/restarting services
-
-When another package inside the systemd directory gets changed, use
-`systemd/$pkgname: ` as prefix. For example:
-
-	systemd/cups: restart on upgrade
-
 ### Moving devices between categories
 
 As we do not include directory prefixes in device-related commits,

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.37.0
-pkgrel=16
+pkgrel=14
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-6ff297733e1c89429cb0b667a5cda1cad1e2085b4ea071d6247034313c2e0a0963d44158ef5b651f212ea3fa99e16fdc7901152317cd5a07b1e76c2ed5aa47b2  busybox-static-1.37.0-r16-aarch64-edge.apk
+8f1f521eceb24a5f66e18e022b1151e96b40378051aaed911dc22e68dbffc5998c8f2bac3935423371c7e707f8931e97873c91c39d56dc2e34292567b3caceaf  busybox-static-1.37.0-r14-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.37.0
-pkgrel=16
+pkgrel=14
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-ea3b5afb3b1d73835fec42960fca06c144e84d926beec7774fcd873a701fca22f31fc03417ac0cdef0533f8948cbf971484bbd9a5d00f4dae0ade386a7027739  busybox-static-1.37.0-r16-armhf-edge.apk
+ce7dfd41a149faed98ae5ae08695223b57e8104a47c9c4c0e956a8c7cbd7fbc6b53b247f2c0f0633d72aa0aba8688f6ecfdd9784722b655f3c29dc1a2557f3e1  busybox-static-1.37.0-r14-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.37.0
-pkgrel=16
+pkgrel=14
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-f3c12760357b4a702a97393ba54a22b34eeb874d7442c6ef1f45eeb954786daefcfc8565992f30f4d417203e2aa9a4df6d7862ccccef1101064ce23e6fef7366  busybox-static-1.37.0-r16-armv7-edge.apk
+2f7003d0de894299a0260efd97bddfabd8d14d0e4b624445a77367036ad33c7ad65a85ee758969e671599ded5ee5674bda755c570ca4d9e95bba9c02b5788b8f  busybox-static-1.37.0-r14-armv7-edge.apk
 "

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

@@ -1,26 +0,0 @@
-# Archived: Downstream port, only for testing. Use mainline port (asus-x00td)!
-# This kernel is mostly used for bringing up new features on mainline, thus unmaintained
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-asus-x00td-downstream
-pkgdesc="Asus Zenfone Max Pro M1 downstream"
-pkgver=0.1
-pkgrel=0
-url="postmarketos.org"
-arch="aarch64"
-license="MIT"
-options="!check !archcheck"
-depends="linux-asus-x00td-downstream mkbootimg msm-fb-refresher postmarketos-base"
-makedepends="devicepkg-dev"
-source="deviceinfo"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-sha512sums="
-dee8129a078693d5c5b13da6247615f1b9720d7268e16280ef5d5111b07cd96f534eee91893a20935d182cf6205598d283308f91bc1d7cc7b701907b33090ae8  deviceinfo
-"

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

@@ -1,32 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell scripts.
-
-deviceinfo_format_version="0"
-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
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="1080"
-deviceinfo_screen_height="2160"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_flash_fastboot_partition_vbmeta="vbmeta"
-deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 buildvariant=userdebug"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_flash_offset_base="0x00000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_pagesize="4096"
-deviceinfo_flash_sparse="true"
-deviceinfo_usb_network_function="rndis_bam.rndis"

device/archived/device-samsung-j6lte-downstream/APKBUILD

@@ -1,5 +1,4 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Archived: Downstream port, only for testing. Use mainline port (samsung-j6lte)!
 pkgname=device-samsung-j6lte-downstream
 pkgdesc="Samsung Galaxy J6 (2018)"
 pkgver=1

device/archived/firmware-samsung-j6lte-downstream/APKBUILD

@@ -1,4 +1,3 @@
-# Archived: Downstream port, only for testing. Use mainline port (samsung-j6lte)!
 pkgname=firmware-samsung-j6lte-downstream
 pkgver=1
 pkgrel=0

device/archived/linux-samsung-j5y17lte/APKBUILD

@@ -1,5 +1,4 @@
 # Reference: <https://postmarketos.org/vendorkernel>
-# Archived: Downstream port, only for testing. Use mainline port (linux-postmarketos-exynos7870)!
 # Kernel config based on: arch/arm64/configs/j5y17lte_defconfig
 # Maintainer: andrisas <sebokandris2009@gmail.com>
 

device/archived/linux-samsung-j6lte-downstream/APKBUILD

@@ -1,5 +1,4 @@
 # Reference: <https://postmarketos.org/vendorkernel>
-# Archived: Downstream port, only for testing. Use mainline port (linux-postmarketos-exynos7870)!
 
 pkgname=linux-samsung-j6lte-downstream
 pkgver=3.18.14

device/community/alsa-ucm-conf-qcom-sm7150/APKBUILD

@@ -1,16 +1,16 @@
 # Maintainer: Danila Tikhonov <danila@jiaxyga.com>
 # Co-Maintainer: Jens Reidel <adrian@travitia.xyz>
-# Co-Maintainer: David Wronek <david@mainlining.org>
+
 pkgname=alsa-ucm-conf-qcom-sm7150
 pkgver=1.2.11_git20240810
-pkgrel=1
+pkgrel=0
 pkgdesc="ALSA UCM configuration for SM7150 devices"
 url="https://github.com/sm7150-mainline/alsa-ucm-conf"
 arch="aarch64"
 license="BSD-3-Clause"
 provides="alsa-ucm-conf"
 provider_priority=1
-_commit="30ff4bed580e0c24f235409069c5f798866897e0"
+_commit="dedbb209ed983a869b7aaceb883f8896c82d2296"
 source="$pkgname-$_commit.tar.gz::https://github.com/sm7150-mainline/alsa-ucm-conf/archive/$_commit.tar.gz"
 options="!check"
 builddir="$srcdir/alsa-ucm-conf-$_commit"
@@ -22,5 +22,5 @@ package() {
 }
 
 sha512sums="
-9a722c6c8090242ac3914e270931a27f241bb616d25b0964e9402805577362939c4dfd973da20df8d9fab75ae9e77656987c6c9b3cd9e59a74d5cb10b1eae052  alsa-ucm-conf-qcom-sm7150-30ff4bed580e0c24f235409069c5f798866897e0.tar.gz
+4c873c3e5b372f7075a38b8fd33723b47cf0ed2013b5ddccec64a4edc587d2f121eb80b930fa6d1ce98dd9ad55043eb1e3e152f1451f4491bc667353548acee7  alsa-ucm-conf-qcom-sm7150-dedbb209ed983a869b7aaceb883f8896c82d2296.tar.gz
 "

device/community/device-generic-x86_64/APKBUILD

@@ -2,8 +2,8 @@
 # Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=18
-pkgrel=0
+pkgver=17
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -70,7 +70,7 @@ kernel_lts() {
 }
 
 sha512sums="
-c8a4b2dc32aa43e574e9fdb2d95ac50ee00e26703ae00f6f57cd8ab43cc16999d0da064d2af4c07f5f37a9d01691835a79a12a70cb4c09455ba276ffbbd14310  deviceinfo
+e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb  deviceinfo
 7f0e1dab2eaf0616220a06a658245a297f2627f1b6a492ccf3bb9922c5b40aa6fd320c4ec5f909557bfc9b38985ef6bc58a67dd87fc46e0d9d35addbcfb2683d  modules-initfs
 9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881  30-gpu-i915-firmware.files
 "

device/community/device-generic-x86_64/deviceinfo

@@ -18,7 +18,7 @@ deviceinfo_gpu_accelerated="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="PMOS_FORCE_PARTITION_RESIZE psi=1 quiet"
+deviceinfo_kernel_cmdline="PMOS_FORCE_PARTITION_RESIZE quiet"
 deviceinfo_partition_type="gpt"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_generate_systemd_boot="true"

device/community/device-google-gru/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=8
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,7 +51,7 @@ nonfree_firmware() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install_if="$pkgname=$pkgvar-r$pkgrel openrc"
 	depends="eudev-hwids>=3.2.12-r0"
 	mkdir "$subpkgdir"
 }

device/community/device-google-sargo/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
-pkgver=10
-pkgrel=0
+pkgver=9
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -74,7 +74,7 @@ sha512sums="
 016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
 ad032b1a35cfcd4fc0c8df988430ee97b711e785b86cca68b7552b23a9a2e2b6b97c327e3415a575db47ad6c1f86ded18df5553acaae63010057d89b8c16135e  deviceinfo
 b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd.confd
-925d8b176a8f1b47a86a1026cc920ffae99ceb35c3e52c222654c15078907579d23c4d68ed65a98ab937f59aaba2bbdd74da8d273e8b9c1ac87a52f718d383d6  modules-initfs
+3213a3586c25cef843a47e2446179ff73acad6421826a64bedb6b9800d30673503d0ea6b3fcc8cfbdcdcaf0926755a489323fce9d14d4411799e6988144b3518  modules-initfs
 2972005a9cf6ca57061965075593dddfa8ee479bc6c21cd41851b1a14768cb1cddbd31a17975ae17adc36d40d294ccbc6bf83defbd69fc7b363f638d8564fbbc  no-hexagonrpcd-on-suspend.sh
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 "

device/community/device-google-sargo/modules-initfs

@@ -1,4 +1,10 @@
+dispcc_sdm845
+drm_exec
+gpu_sched
 i2c_qcom_geni
+mdt_loader
+msm
+panel_samsung_s6e3fa7
 rmi_core
 rmi_i2c
 gpi

device/community/device-google-x64cros/APKBUILD

@@ -4,7 +4,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
-pkgver=13
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -80,6 +80,6 @@ firmware_intel() {
 sha512sums="
 38c53d91a60d0402d4cc5428d65e1e8c26360c481c70b34593b1812c87241c32e91904a3bd31fbfe507f7fdb8b50c909eaad8c4c3a37ca962760567329f7f6ee  00-amdgpu-firmware.files
 c17f5c505e0e280a9e51ac1b4264e7703b744fd3831d75ce95f41be4755ae4ccd24b7ca09ba1e236df499a5e748c64a0d2054c9d55d8c8c713fa8c5646ed9a3c  00-i915-firmware.files
-d14992ad384d762452b28a8c5b93be67fb6bc03d0dd3e68d24c3373d466260a5e1a07338eb8fc5090edc735fd70b43017128c27962ebf4b7a5e3fa2fba66c18f  deviceinfo
+514ff5c946633dccaa569fed51743c669ea9942af4dd891ad001ba08bba07fca92503e29304f3eb71c16bc2f2436e1879ff0bf56d99666e4dcf9635c8605da2e  deviceinfo
 a6e5a9de9fe010966523606f2fcab1c44004228b4e050f777dcb1160fb3e32cda8096925543522216c2eb354f8ce2f8d4e206d98b077fbd6fb840de94e84c706  modules-initfs
 "

device/community/device-google-x64cros/deviceinfo

@@ -18,7 +18,6 @@ deviceinfo_create_initfs_extra="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="psi=1"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"

device/community/device-lenovo-21bx/APKBUILD

@@ -4,8 +4,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=13
-pkgrel=0
+pkgver=12
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -63,7 +63,7 @@ usbguard() {
 }
 
 sha512sums="
-d2c2266c7db3b018cb1324ad4259fec664fa9d500f701795c6198b2318cec6466a9ad908c7217bb43c03d236dfdf3fb84280faf0cfa484bbdf90bda680822309  deviceinfo
+9cb08de5748b0339005a910cc0475ad344dc6e912e477c5bd6b370784af6309719524f8fa7a39e7565586e47968a35c344ea853cddd716cc3e1e483efaae7ff0  deviceinfo
 5f4e6a80455c8a2ed879bfd457a89f81790824657ed4101e03b7ec288a274e63340f48e2ad5028cf83744263a4529584b1e94c36d10b98912e5b31804fa98ff0  firmware.files
 27705e998db262602b50004083fe160dbcde88e9fdcaeb43e3d1d79be0b7af371f84855bb93ba16ada3cf5fa8ff8da6ca159cda4b1de08fb54ac451c57169c57  modules-initfs
 52bbb9564ec713db5d46937701b121afe0c6c644fffe189a05766f491b4997b1bbc4c1f90229efb5764d795df8d40a57d4c840ee4b32d426e7a84520364b8bf5  pipewire.conf

device/community/device-lenovo-21bx/deviceinfo

@@ -15,7 +15,7 @@ deviceinfo_gpu_accelerated="true"
 deviceinfo_chassis="laptop"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
-deviceinfo_kernel_cmdline="quiet loglevel=2 quiet clk_ignore_unused pd_ignore_unused arm64.nopauth pmos.force-partition-resize"
+deviceinfo_kernel_cmdline="quiet loglevel=2 quiet clk_ignore_unused pd_ignore_unused arm64.nopauth"
 
 # Bootloader related
 deviceinfo_flash_method="none"

device/community/device-nokia-n900/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=42
-pkgrel=1
+pkgver=41
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -20,14 +20,9 @@ depends="
 	postmarketos-mvcfg
 	u-boot-tools
 	wl1251-cal
+	wl1251-cal-openrc
 "
-makedepends="
-	devicepkg-dev
-	u-boot-tools
-	kbd
-	kbd-bkeymaps
-	postmarketos-mvcfg
-"
+makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
 install="$pkgname.post-install $pkgname.pre-upgrade"
 subpackages="
 	$pkgname-x11
@@ -52,7 +47,6 @@ source="
 	i3wm/config-checker
 	i3wm/i3blocks.conf
 	i3wm/i3wm.conf
-	i3wm/pwr-key-handler.sh
 	i3wm/scripts/battery-bq27200
 	i3wm/scripts/calendar
 	i3wm/scripts/ofono
@@ -68,6 +62,7 @@ source="
 	modem-opts.conf
 	modules.blocklist
 	pointercal
+	proxishot.sh
 	uboot-script.cmd
 	udev/10-nokia-modem.rules
 	udev/15-bq27k.rules
@@ -154,7 +149,7 @@ package() {
 
 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
-	depends="unclutter-xfixes scrot xdotool xinput xrdb xset"
+	depends="xset xinput scrot xrdb"
 	mkdir "$pkgdir"/etc/acpi
 	install -D -m755 "$srcdir"/acpi_handler.sh \
 		"$pkgdir"/etc/acpi/handler.sh
@@ -166,6 +161,8 @@ x11() {
 		"$subpkgdir"/etc/X11/xorg.conf.d/11-n900.conf
 	install -Dm755 "$srcdir"/lock.sh \
 		"$subpkgdir"/usr/bin/lock.sh
+	install -Dm755 "$srcdir"/proxishot.sh \
+		"$subpkgdir"/usr/bin/proxishot.sh
 	install -Dm644 "$srcdir"/xresources \
 		"$subpkgdir"/usr/share/X11/Xresources-mobile
 }
@@ -179,7 +176,7 @@ xkeyboard_config() {
 
 i3wm() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
-	depends="brightnessctl i3blocks rxvt-unicode sxmo-dmenu upower"
+	depends="unclutter-xfixes i3blocks rxvt-unicode upower brightnessctl"
 	install -D -m644 "$srcdir"/i3wm.conf \
 		"$subpkgdir"/etc/xdg/i3/config
 	install -D -m644 "$srcdir"/i3blocks.conf \
@@ -194,8 +191,6 @@ i3wm() {
 		"$subpkgdir"/usr/share/i3blocks/wifi
 	install -D -m755 "$srcdir"/config-checker \
 		"$subpkgdir"/usr/bin/i3-config-checker
-	install -D -m755 "$srcdir"/pwr-key-handler.sh \
-		"$subpkgdir"/usr/bin/pwr-key-handler
 }
 
 upower() {
@@ -208,7 +203,6 @@ upower() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install"
-	depends="wl1251-cal-openrc"
 
 	mkdir -p "$subpkgdir"
 }
@@ -217,7 +211,7 @@ sha512sums="
 6b475c12eca8563be48c562a1cb4ad8ca6a05d70fc54b21288b2dd7435a80a6f53351aa870db96d5bbecf1b1c5cb00dfe35f5066e6d3fd0ad0369e66aeef5a21  10-initfs-keymap.files
 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh
 2e6c324c2a0627fb37ee2feff249d6c828116a9c1a32d572481dddc12648c98b726eb3a475838398742f76a60e3f2249d7707502360473b8bf2e794bf22f57ce  acpi.map
-b2c2033f8a77a18dc0c5192e0304f60e3c2a2a7d132c2072ab0dd6ee1a5b2a8c7e6396165411534468311a254663ae887cbaf23816f8b17893dd28e99e549790  acpi_handler.sh
+ff51909873160c2d4c6f0c0119b6d4a02751df29f571b8596b4bc8b04ce2541913c11a583b0e5dabd43f240752a8131da45db0ddff194860f4c11198599686a1  acpi_handler.sh
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
@@ -228,8 +222,7 @@ e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b11
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
 d7d1599a9952fd02d3cfbeaa6b3307251e765f98a9eb723237c94f585831cc8f11d9d30dbc0352e3b008224dec12b820cf86fa28a5e5ac303cfd03d80b8872f5  config-checker
 a8152e94262629e11abdd8809d187c3b7ed1866a6128fb1f435e17e72120536ac8114262e66df6decb2627743027f2b923ddbe8a94e3e844099b6fad02ec252b  i3blocks.conf
-c95afd02124e53f0de1ef33e7bbee12a15ae2d4d629a201157ed9d428288365241dfc3358fc7055154845f9df986fd975a2ebd4de384b8e175cb45f26b2fa38d  i3wm.conf
-63ec5a88f4385fd944477d0b7ca7061745b061337cba8d3c779826aa96a94dda79bfca4fb3456234f6adbdb483e660d3cf6ccefd8576d23a70f52e3f44f0edb4  pwr-key-handler.sh
+26261d6291c4cc476a36a11291a3676413ecc4fc6ee76394fead14e0c8955d28e782d4a26180034637fcf176c41f8a345886daf242eebf7e91dfd6a4bd29edbe  i3wm.conf
 6c6a70667f37807089adbb343c09d1f62d47b8e6c9c0a54f44790b822f8bff3dccae73341ef736b799fd6740bbd6e1f48e6e122c2e08520f71f6ad7434a47d2c  battery-bq27200
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar
 82038d38f94cb975a8d38914afca49b64957446bef7490ab684efa1df47ede2ea1c769045789bb9fded673345eea01911fbbf85fdb54c28685cad8022bfaafac  ofono
@@ -245,6 +238,7 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
 695feac7f69a0ec8c5e007cdb651adcc3492f1c6236e7fd183edec2a5e25cb957d3ace630ea5fdb87fd703e35ac368f1d097c2f881ecb52c9cfd433564db2a6c  modem-opts.conf
 862ebc7cd2d7a1b3d41b10701b8418308c89eb0732eb99c42ec1091d48e08db9421727f67a3272b7309549798d59afb1b8d7d2fa48d1447b208fcb2329472d4d  modules.blocklist
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
+134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
 42f916d87dd305111028992a1107bf6fe108bebbd782ae8edd065e76505db2b3a75e57515970c3e40cb0d1b7e83097a1bba92785be13df7c3fd80959a8d9c5c1  uboot-script.cmd
 465b9a0d2b46d0981c64b47cb1f656c2456a90b91b1751a2efad10af38a96030dd99108b1fd76ce31bf1ea0f236d55bed38b114d6bd712f09f8968de034c946c  10-nokia-modem.rules
 1acc441b9f83dc91fd65fa3f89b8205bfd72a465286bc181b4e7e92dd4b8c0bc5c20a18dab46ff3ee8ae70940efd7d767b3dfb920edb4c74377bd418b838693d  15-bq27k.rules

device/community/device-nokia-n900/acpi_handler.sh

@@ -19,7 +19,7 @@ case $cmd in
 		adjust_keypad_bl 0
 		;;
 	CAM_BTN_DWN)
-		echo "Not implemented yet"
+		USER_USER="$user" /usr/bin/proxishot.sh
 		;;
 	CAM_BTN_UP)
 		echo "Not implemented yet"
@@ -37,7 +37,7 @@ case $cmd in
 		echo "Not implemented yet"
 		;;
 	SCRNLCK_DWN)
-		echo "Not implemented yet"
+		su $user -c "DISPLAY=:0 /usr/bin/lock.sh"
 		;;
 	SCRNLCK_UP)
 		echo "Not implemented yet"

device/community/device-nokia-n900/i3wm/i3wm.conf

@@ -60,17 +60,12 @@ mode "command" {
 # Enter command mode
 bindsym Shift+space mode "command"
 
-# Mouse actions
-bindsym --release Shift+Left exec --no-startup-id xdotool click 2
-bindsym --release Shift+Right exec --no-startup-id xdotool click 3
-bindsym --release Shift+Up exec --no-startup-id xdotool click 4
-bindsym --release Shift+Down exec --no-startup-id xdotool click 5
-
-# Handle screenlock key
-bindsym --release XF86ScreenSaver exec --no-startup-id lock.sh
-
 # Pressing the power button offers reboot, shutdown, or suspend choice
-bindsym XF86PowerOff exec --no-startup-id pwr-key-handler
+bindsym XF86PowerOff exec --no-startup-id i3-nagbar \
+        -m 'Choose Power Button Action:' \
+        -B 'Reboot' 'loginctl reboot' \
+        -B 'Suspend' 'loginctl suspend' \
+        -B 'Shutdown' 'loginctl poweroff'
 
 bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set PCM 5%+
 bindsym XF86AudioLowerVolume exec --no-startup-id amixer set PCM 5%-
@@ -100,5 +95,7 @@ exec --no-startup-id i3-config-checker
 exec --no-startup-id xrdb -merge /usr/share/X11/Xresources-mobile
 # Hide mouse cursor
 exec --no-startup-id unclutter-xfixes --fork
+# Do not handle gpio_key events as they are handled by acpid
+exec --no-startup-id xinput disable gpio_keys
 # Turn display off after 2 minutes of idle
 exec --no-startup-id xset dpms 0 0 120

device/community/device-nokia-n900/i3wm/pwr-key-handler.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-confirm(){
-	printf "Yes\nNo" | dmenu -l 2 -p "Are you sure?" -H 60
-}
-
-CHOICE=$(printf "Close this menu\nTake screenshot\nReboot\nPower Off" | dmenu -l 5 -p "Choose an action" -H 50)
-
-case "$CHOICE" in
-	*screenshot)
-		mkdir -p "$HOME"/Screenshots
-		# shellcheck disable=SC2016
-		# the variable $f is internal to scrot, see `man 1 scrot`
-		scrot '%Y-%m-%d_%H-%M-%S.png' -e 'mv $f ~/Screenshots/'
-		;;
-	Reboot)
-		CONFIRM=$(confirm)
-		case "$CONFIRM" in
-			Yes)
-				loginctl reboot
-				;;
-		esac
-		;;
-	Power*)
-		CONFIRM=$(confirm)
-		case "$CONFIRM" in
-			 Yes)
-				loginctl poweroff
-				;;
-		esac
-	;;
-esac

device/community/device-nokia-n900/proxishot.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+# Take a screenshot if the proximity sensor is covered.
+# NB: pass the user's username in USER_USER environment variable when calling
+# this script.
+/usr/bin/evtest --query /dev/input/by-path/platform-gpio_keys-event \
+	EV_SW SW_FRONT_PROXIMITY
+# return value of `10` means the sensor is in the set state, i.e.
+# proximity = near. see `man 1 evtest`
+if [ "$?" = "10" ]; then
+	su "$USER_USER" -c "/bin/mkdir -p ~/Screenshots"
+	su "$USER_USER" -c 'cd ~/Screenshots && DISPLAY=:0 /usr/bin/scrot "%Y-%m-%d_%H-%M-%S.png"'
+fi

device/community/device-odroid-xu4/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=device-odroid-xu4
 pkgdesc="ODROID XU4"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -32,6 +32,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-4d39e938092318cfc6a6b102e15bfabfec215669c73a6334019e158062760e50ce5957297cdbe309d78b770c26128385bec779d92606b4204e39f305dea70183  deviceinfo
+bf14f975ee01f8dbc9109444ab408ac0948ae67af267d8f4101f2ca688750761277e793b2800985277d0e91205c13e89bd66e37bfebe3608ea7d29ecdb20c907  deviceinfo
 9f6c3cc0079e718ef0dfc221fadaf9bc092a8601b62794c2298eab893924af457612bd8a6e852fb2b181bee637e774dd2abea681eb72b1aa9c6672e686454795  modules-initfs
 "

device/community/device-odroid-xu4/deviceinfo

@@ -27,7 +27,3 @@ deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_boot_part_start="3072"
 deviceinfo_kernel_cmdline="init=/init.sh rw console=tty0 console=ttySAC2,115200 panic=10 consoleblank=0 loglevel=9 cma=256M PMOS_FORCE_PARTITION_RESIZE"
 deviceinfo_generate_extlinux_config="true"
-
-# The bl1 embed location in sdcard conflicts with GPT header, so need
-# to use msdos.
-deviceinfo_partition_type="msdos"

device/community/device-pine64-pinephone/APKBUILD

@@ -3,14 +3,13 @@
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
 pkgver=8
-pkgrel=3
+pkgrel=1
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 subpackages="
-	$pkgname-audio
 	$pkgname-gnome
 	$pkgname-kirigami:kirigami
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -24,23 +23,24 @@ subpackages="
 	$pkgname-x11
 	"
 depends="
+	alsa-ucm-conf>=1.2.6.2
 	atinout
 	eg25-manager
 	iw
 	linux-postmarketos-allwinner>=5.14
 	megapixels
 	mesa-egl
+	pinephone-callaudiod
 	postmarketos-base
+	postmarketos-base-ui-audio-pipewire
 	postprocessd
 	u-boot-pinephone>=2021.01_git20201228-r2
 	u-boot-tools
 	fwupd>=1.8.6
 	"
-makedepends="
-	devicepkg-dev
-	dtc
-	u-boot-tools
-"
+# FIXME: use upstream alsa-ucm-conf instead, once it works the same (pma#2115)
+replaces="alsa-ucm-conf"
+makedepends="devicepkg-dev dtc"
 install="$pkgname.pre-upgrade"
 source="
 	00_alsa_pinephone_dshare.conf
@@ -135,6 +135,16 @@ package() {
 		"$pkgdir"/usr/lib/udev/rules.d/10-pinephone-proximity.rules
 	install -Dm644 "$srcdir"/60-flashlight.rules -t "$pkgdir"/usr/lib/udev/rules.d/
 
+	# Alsa usecase manager config
+	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/Allwinner/A64/PinePhone \
+		"$srcdir"/HiFi.conf \
+		"$srcdir"/PinePhone.conf \
+		"$srcdir"/VoiceCall.conf
+
+	# Pulseaudio config
+	install -Dm644 "$srcdir"/pulse-pinephone.conf \
+		"$pkgdir"/etc/pulse/daemon.conf.d/89-pinephone.conf
+
 	# Modem
 	install -Dm755 "$srcdir"/setup-modem.sh \
 		"$pkgdir"/usr/bin/pinephone_setup-modem
@@ -229,28 +239,6 @@ x11() {
 	install -Dm644 "$srcdir"/x11-pinephone-keyboard.conf \
 		"$subpkgdir"/etc/X11/xorg.conf.d/pinephone-keyboard.conf
 }
-
-audio() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-base-ui-audio"
-	# FIXME: use upstream alsa-ucm-conf instead, once it works the same (pma#2115)
-	replaces="alsa-ucm-conf"
-	depends="
-		alsa-ucm-conf>=1.2.6.2
-		pinephone-callaudiod
-		postmarketos-base-ui-audio-pipewire
-	"
-
-	# Alsa usecase manager config
-	install -Dm644 -t "$subpkgdir"/usr/share/alsa/ucm2/Allwinner/A64/PinePhone \
-		"$srcdir"/HiFi.conf \
-		"$srcdir"/PinePhone.conf \
-		"$srcdir"/VoiceCall.conf
-
-	# Pulseaudio config
-	install -Dm644 "$srcdir"/pulse-pinephone.conf \
-		"$subpkgdir"/etc/pulse/daemon.conf.d/89-pinephone.conf
-}
-
 sha512sums="
 5736444fd38ab4351d148ae96c479085f469bd1e51a692fb1827f8ac921a584389f7696985e1fba21c2deac88709910531f4ece282f45ff54e590c2b54b84ba3  00_alsa_pinephone_dshare.conf
 b53cc6f2531854cc9c1e4c334185a20551d64c8675ee8a8eaa03b99d80808fad421a0f6e99e5be212a974d88c85f461a71ba59ac59c29f298c82f211e3be1ef4  10-pinephone-proximity.rules

device/community/device-pine64-pinephonepro/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
 pkgver=4
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -123,7 +123,6 @@ gnome() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="eg25-manager-openrc"
 
 	mkdir -p "$subpkgdir"
 }

device/community/device-purism-librem5/APKBUILD

@@ -3,9 +3,9 @@
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
-pkgver=6
-pkgrel=0
-_confver=68
+pkgver=5
+pkgrel=1
+_confver=65
 _purismrel=1
 # <librem5-base ver>.<purism release>
 _purismver=${_confver}pureos$_purismrel
@@ -30,7 +30,7 @@ depends="
 	u-boot-librem5
 	u-boot-tools
 "
-makedepends="devicepkg-dev u-boot-tools"
+makedepends="devicepkg-dev"
 builddir=$srcdir/librem5-base-pureos-$_confver
 source="
 	https://source.puri.sm/Librem5/librem5-base/-/archive/pureos/$_purismver/librem5-base-pureos-$_purismver.tar.gz
@@ -166,9 +166,9 @@ package() {
 		"$pkgdir"/etc/init.d/l5-brcm-bt-enable
 
 	# install audio config files from Purism
-	install -Dm644 "$builddir"/default/audio/ucm2/conf.d/simple-card/Librem\ 5.conf \
+	install -Dm644 "$builddir"/default/audio/ucm2/simple-card/Librem\ 5.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/NXP/iMX8/Librem_5/Librem\ 5.conf
-	install -Dm644 "$builddir"/default/audio/ucm2/conf.d/simple-card/HiFi.conf \
+	install -Dm644 "$builddir"/default/audio/ucm2/simple-card/HiFi.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/NXP/iMX8/Librem_5/HiFi.conf
 	mkdir -p "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card
 	# relative path seems to be required or else alsa-lib can't figure it out
@@ -204,7 +204,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-e02c1a39626311ae553f83c75cb6ef44647a40b4419eefec9e5df4f24aaa91b65b3029b919a5ad8cf5b12bf77414eb7b524e470b90220ff97c8730ea37ad7f86  librem5-base-pureos-68pureos1.tar.gz
+4ce01a78016475873535927330a26143170153968cb22214ca606929ffc73ff2df2fcdd044c44d1cd9c514e989c267b5267402f0c047a240d01192d9b29ed57b  librem5-base-pureos-65pureos1.tar.gz
 2e72d9a084ecd6c96cafbbd8fda461ae8b2ebd14ffda601d9f36d73f08f04088213de17da078293ddd958d4c76d33148c7af6e252eb0709f6934855a55578509  00-mesa.sh
 703d12826464eb2bdb6bf4a7d10adb73b37564d3792794523b252f0f7cb66184add150a6938580cc33615281d1c0abd7ff158ae2143b89fa28c0cd3dc367e5ff  deviceinfo
 138ed85e6509e4611bf21a0061c312e6c2ce60f722ee9e4565d19c5f025301d4df3fa321343524219a54b20c5288dc6ed1b058ac66f4d608af22eb5bc83e84c6  modules-initfs

device/community/device-qcom-msm8953/APKBUILD

@@ -1,5 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Barnabas Czeman <barnabas.czeman@postmarketos.org>
+# Maintainer: Barnabas Czeman <trabarni@gmail.com>
 # Co-Maintainer: Alejandro Tafalla <alikates@dnyon.com>
 # Co-Maintainer: Victor Pavlov (vipaoL) <vipaolmail@gmail.com>
 # Co-Maintainer: Danila Tikhonov (JIaxyga) <danila@mainlining.org>
@@ -7,7 +7,7 @@
 pkgname=device-qcom-msm8953
 pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
 pkgver=5
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"

device/community/device-qcom-sm7150/90-feedbackd-drv260x.rules

@@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="drv260x:haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"

device/community/device-qcom-sm7150/deviceinfo

@@ -1,29 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Qualcomm SM7150 Device"
-deviceinfo_manufacturer="Qualcomm"
-deviceinfo_codename="qcom-sm7150"
-deviceinfo_year="2019"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot-bootpart"
-# Where to flash boot.img, or in our case where to flash the pmOS boot partition.
-# This is a bit confusing.
-deviceinfo_flash_fastboot_partition_kernel="cache"
-deviceinfo_flash_fastboot_partition_system="userdata"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
-deviceinfo_getty="ttyMSM0;115200"
-deviceinfo_generate_systemd_boot="true"
-deviceinfo_boot_filesystem="fat32"
-# Required for devices using UFS as storage (instead of e.g. eMMC)
-deviceinfo_rootfs_image_sector_size="4096"

device/community/device-qcom-sm7150/initfs-hook.sh

@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# Some devices (xiaomi-surya) ship with a touchscreen that has no persistent
-# firmware storage. That is unfortunate and means we need to provide firmware
-# from the initramfs for FDE to work.
-# This is only the case for the novatek touchscreens. Their firmware resides
-# in /vendor/firmware. Let's copy it over.
-# The file names are novatek_ts_huaxing_fw.bin and novatek_ts_tianma_fw.bin,
-# for both panels respectively.
-
-for input in /sys/class/input/input*/uevent
-do
-	if grep -q "NT36XXX" "$input"
-	then
-		echo "nt36xxx is loaded, mounting firmware for it!"
-
-		mkdir /firmware-mnt
-
-		for part in /sys/block/sd*/sd*
-		do
-			DEVNAME="$(grep DEVNAME "$part"/uevent | sed 's/DEVNAME=//g')"
-			PARTNAME="$(grep PARTNAME "$part"/uevent | sed 's/PARTNAME=//g')"
-
-			# Could be vendor_a or vendor_b
-			if [[ "$PARTNAME" == "vendor"* ]]
-			then
-				mount -o ro,nodev,noexec,nosuid \
-					"/dev/$DEVNAME" /firmware-mnt
-				break
-			# Super partition with vendor on a subpartition, system if retrofit
-			elif [[ "$PARTNAME" == "super" ]] || [[ "$PARTNAME" == "system" ]]
-			then
-				if ! make-dynpart-mappings "/dev/$DEVNAME"; then continue; fi;
-
-				for dynpart in /dev/mapper/*
-				do
-					if [[ "$dynpart" == *"vendor"* ]]
-					then
-						mount -o ro,nodev,noexec,nosuid \
-							"$dynpart" /firmware-mnt
-						break 2
-					fi
-				done
-			fi
-		done
-
-		if [ -d /firmware-mnt/firmware ]
-		then
-			for firmware_file in /firmware-mnt/firmware/novatek_ts_*_fw.bin
-			do
-				echo "Found novatek firmware file at $firmware_file"
-
-				cp $firmware_file /lib/firmware/
-			done
-
-			umount /firmware-mnt
-		fi
-
-		break
-	fi
-done

device/community/device-samsung-a5/APKBUILD

@@ -1,6 +1,6 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Minecrell <minecrell@minecrell.net>
-# Co-Maintainer: Alexey Minnekhanov <alexeymin@postmarketos.org>
+# Co-Maintainer: Alexey Min <alexey.min@gmail.com>
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
 pkgver=12

device/community/device-shift-axolotl/APKBUILD

@@ -1,7 +1,7 @@
+
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Alexander Martinz <amartinz@shiftphones.com>
-# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
-# Co-Maintainer: Dylan Van Assche <me@dylanvanassche.be>
+
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
 pkgver=15

device/community/device-wileyfox-crackling/APKBUILD

@@ -1,10 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Nikita Travkin <nikita@trvn.ru>
+# Maintainer: Nikita Travkin <nikitos.tr@gmail.com>
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-wileyfox-crackling
 pkgdesc="Wileyfox Swift"
 pkgver=9
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"

device/community/device-xiaomi-davinci/APKBUILD

@@ -0,0 +1,44 @@
+# Maintainer: Jens Reidel <adrian@travitia.xyz>
+# Co-Maintainer: Arian Kulmer <arian.kulmer@web.de>
+# Reference: <https://postmarketos.org/devicepkg>
+
+pkgname=device-xiaomi-davinci
+pkgdesc="Xiaomi Mi 9T / Redmi K20"
+pkgver=4
+pkgrel=2
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	firmware-xiaomi-davinci
+	linux-postmarketos-qcom-sm7150
+	make-dynpart-mappings
+	mkbootimg
+	postmarketos-base
+	soc-qcom-sm7150>=2-r1
+	soc-qcom-sm7150-libssc-180-degrees
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	hexagonrpcd.confd
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
+}
+
+sha512sums="
+2350ec38791799ab0cd0ec12256669e421ad716870956c08885b14dac5bfd05b170314175671cb35bdb9f58a5737e35824be0007ccf0a1f7f671d033d1c948ee  deviceinfo
+4c76b02069f12b4bca5ed76174bcb9d32055df6a458a4c7f6147ebaac70acd9cbe33a0741d3cb631168c3e24ba9b8c81f1a810ca0aae40528ffa622a3e1c6ea2  hexagonrpcd.confd
+2acf9e2a4a38c36866c8f31adfe83517f0773e35936920127e2cf49d43b24af67701deef81ffa610605caccbd560574f531e155f20da7126a27529ad8f70fd37  modules-initfs
+"

device/community/device-xiaomi-davinci/deviceinfo

@@ -0,0 +1,38 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Xiaomi Mi 9T / Redmi K20"
+deviceinfo_manufacturer="Xiaomi"
+deviceinfo_codename="xiaomi-davinci"
+deviceinfo_year="2019"
+deviceinfo_dtb="qcom/sm7150-xiaomi-davinci"
+deviceinfo_append_dtb="true"
+deviceinfo_arch="aarch64"
+deviceinfo_flash_kernel_on_update="true"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2340"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="quiet loglevel=2"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_pagesize="4096"
+deviceinfo_flash_sparse="true"
+deviceinfo_header_version="1"
+deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_rootfs_image_sector_size="4096"
+deviceinfo_super_partitions="/dev/sda24"

device/community/device-xiaomi-davinci/hexagonrpcd.confd

@@ -0,0 +1,2 @@
+# Xiaomi Mi 9T / Redmi K20 specific hexagonrpcd firmware directory
+hexagonrpcd_fw_dir="/usr/share/qcom/sm7150/Xiaomi/davinci"

device/community/device-xiaomi-davinci/modules-initfs

@@ -0,0 +1,2 @@
+gtx8
+panel_samsung_ams639rq08

device/community/device-xiaomi-surya/APKBUILD

@@ -0,0 +1,59 @@
+# Maintainer: Danila Tikhonov <danila@jiaxyga.com>
+# Co-Maintainer: David Wronek <david@mainlining.org>
+# Reference: <https://postmarketos.org/devicepkg>
+
+pkgname=device-xiaomi-surya
+pkgdesc="Xiaomi POCO X3 NFC"
+pkgver=8
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	firmware-xiaomi-surya
+	make-dynpart-mappings
+	mkbootimg
+	postmarketos-base
+	soc-qcom-sm7150>=2-r1
+	soc-qcom-sm7150-libssc-180-degrees
+"
+makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-kernel-huaxing:kernel_huaxing
+	$pkgname-kernel-tianma:kernel_tianma
+"
+source="
+	deviceinfo
+	hexagonrpcd.confd
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
+}
+
+kernel_huaxing() {
+	pkgdesc="Huaxing Panel. To know which panel your device use and the status of the port, Visit the Xiaomi POCO X3 NFC wiki page: https://wiki.postmarketos.org/wiki/Xiaomi_POCO_X3_NFC_(xiaomi-surya)"
+	depends="linux-postmarketos-qcom-sm7150"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_tianma() {
+	pkgdesc="Tianma Panel. To know which panel your device use and the status of the port, Visit the Xiaomi POCO X3 NFC wiki page: https://wiki.postmarketos.org/wiki/Xiaomi_POCO_X3_NFC_(xiaomi-surya)"
+	depends="linux-postmarketos-qcom-sm7150"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+sha512sums="
+09cca64d70ab5b9350d4ca645d8f868906b5a9e90d7fd75bf7b9769b7b9ba18f98526675af2cf01b6369c1f36abf8ce47aea9fde6195927bb7735b151cf51bba  deviceinfo
+09fa0696c5d6bba9640fb74d2e5bf1200aab54a7282f3957c02a1c38a7e9d6d3d9d2d278c48d24678c7573382e1a3df6470fd6d1ca4b153dc8d4033eb5a4ea4a  hexagonrpcd.confd
+c280be70a5cd2a58d9129531987841f3915de741289deec5d3d81417848cc6fcd93bee13f7e14abc2abf6269280ff07a43fb60d06c3b639f160363caccc8a437  modules-initfs
+"

device/community/device-xiaomi-surya/deviceinfo

@@ -3,30 +3,35 @@
 # scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="Xiaomi Redmi Note 11"
+deviceinfo_name="Xiaomi POCO X3 NFC"
 deviceinfo_manufacturer="Xiaomi"
-deviceinfo_codename="xiaomi-spes"
-deviceinfo_year="2021"
+deviceinfo_codename="xiaomi-surya"
+deviceinfo_year="2020"
+deviceinfo_dtb_huaxing="qcom/sm7150-xiaomi-surya-huaxing"
+deviceinfo_dtb_tianma="qcom/sm7150-xiaomi-surya-tianma"
+deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
+deviceinfo_flash_kernel_on_update="true"
 
 # Device related
+deviceinfo_gpu_accelerated="true"
 deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2400"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="console=tty0"
+deviceinfo_kernel_cmdline="quiet loglevel=2"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="4096"
-deviceinfo_header_version="3"
-deviceinfo_rootfs_image_sector_size="4096"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00008000"
+deviceinfo_flash_offset_second="0x00000000"
 deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_fastboot_partition_dtbo="dtbo"
-deviceinfo_usb_idVendor="0x05с6"
-deviceinfo_usb_idProduct="0x9039"
+deviceinfo_rootfs_image_sector_size="4096"
+deviceinfo_super_partitions="/dev/sda15"

device/community/device-xiaomi-surya/hexagonrpcd.confd

@@ -0,0 +1,2 @@
+# Xiaomi POCO X3 (NFC) specific hexagonrpcd firmware directory
+hexagonrpcd_fw_dir="/usr/share/qcom/sm7150/Xiaomi/surya"

device/community/device-xiaomi-surya/modules-initfs

@@ -0,0 +1,4 @@
+nt36xxx_spi_ts
+panel_huaxing_nt36672c
+panel_tianma_nt36672c
+qcom_wled

device/community/firmware-lenovo-a6000/APKBUILD

@@ -1,5 +1,4 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
-# Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=firmware-lenovo-a6000
 pkgver=1
 pkgrel=2

device/community/firmware-lenovo-a6010/APKBUILD

@@ -1,5 +1,4 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
-# Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=firmware-lenovo-a6010
 pkgver=1
 pkgrel=2

device/community/firmware-motorola-harpia/APKBUILD

@@ -1,7 +1,6 @@
-# Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=firmware-motorola-harpia
 pkgver=4
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware for Motorola Moto G4 Play"
 url="https://github.com/Sorixelle/vendor_motorola_harpia"
 subpackages="$pkgname-wcnss-nv:wcnss_nv $pkgname-venus"

device/community/firmware-pine64-rockpro64/APKBUILD

@@ -1,5 +1,4 @@
 # Maintainer: @exkc <exkc@exkc.moe>
-# Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=firmware-pine64-rockpro64
 pkgver=1
 pkgrel=1
@@ -25,3 +24,4 @@ package() {
 }
 
 sha512sums="6bd2551370bdf2b4e0b8d8f5016a1b937ba497a4fe2058fde3ac96f1fe4a8a95b638c82f2b0411d6fe1e46877ad5c475e4037ed02521f08e2483ccc4c03430c8  brcmfmac_sdio-firmware-4b370cd415a2dd7b0ecdbe8bbf1d86fb35ce6985.tar.gz"
+

device/community/firmware-qcom-msm8953/APKBUILD

@@ -1,7 +1,4 @@
 # Maintainer: Barnabas Czeman <barnabas.czeman@postmarketos.org>
-# Co-Maintainer: Alejandro Tafalla <alikates@dnyon.com>
-# Co-Maintainer: Victor Pavlov (vipaoL) <vipaolmail@gmail.com>
-# Co-Maintainer: Danila Tikhonov (JIaxyga) <danila@mainlining.org>
 pkgname=firmware-qcom-msm8953
 pkgver=2
 pkgrel=0

device/community/firmware-samsung-a3/APKBUILD

@@ -1,9 +1,6 @@
-# Maintainer: Mis012 <Michael.Srba@seznam.cz>
-# Co-Maintainer: Nikita Travkin <nikita@trvn.ru>
-# Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=firmware-samsung-a3
 pkgver=1
-pkgrel=2
+pkgrel=1
 _name="Samsung Galaxy A3 (2015)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"

device/community/firmware-samsung-a5/APKBUILD

@@ -1,8 +1,6 @@
-# Maintainer: Minecrell <minecrell@minecrell.net>
-# Co-Maintainer: Alexey Minnekhanov <alexeymin@postmarketos.org>
 pkgname=firmware-samsung-a5
 pkgver=1
-pkgrel=2
+pkgrel=1
 _name="Samsung Galaxy A5 (2015)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"

device/community/firmware-samsung-e7/APKBUILD

@@ -1,7 +1,6 @@
-# Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
 pkgname=firmware-samsung-e7
 pkgver=1
-pkgrel=3
+pkgrel=2
 _name="Samsung Galaxy E7"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"

device/community/firmware-samsung-grandmax/APKBUILD

@@ -1,7 +1,6 @@
-# Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
 pkgname=firmware-samsung-grandmax
 pkgver=1
-pkgrel=2
+pkgrel=1
 _name="Samsung Galaxy Grand Max"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"

device/community/firmware-samsung-gt510/APKBUILD

@@ -1,7 +1,6 @@
-# Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=firmware-samsung-gt510
 pkgver=1
-pkgrel=2
+pkgrel=1
 _name="Samsung Galaxy Tab A 9.7 (2015)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"

device/community/firmware-samsung-gt58/APKBUILD

@@ -1,7 +1,6 @@
-# Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=firmware-samsung-gt58
 pkgver=1
-pkgrel=2
+pkgrel=1
 _name="Samsung Galaxy Tab A 8.0 (2015)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"

device/community/firmware-samsung-serranove/APKBUILD

@@ -1,7 +1,6 @@
-# Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=firmware-samsung-serranove
 pkgver=1
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware for Samsung Galaxy S4 Mini Value Edition"
 url="https://pepethekingprawn.gitlab.io/firmware/"
 subpackages="$pkgname-wcnss-nv:wcnss_nv"

device/community/firmware-wileyfox-crackling/APKBUILD

@@ -1,8 +1,6 @@
-# Maintainer: Nikita Travkin <nikita@trvn.ru>
-# Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=firmware-wileyfox-crackling
 pkgver=5
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware for Wileyfox Swift"
 url="https://rizzotherat.gitlab.io/firmware/"
 subpackages="$pkgname-venus $pkgname-wcnss-nv:wcnss_nv"

device/community/firmware-xiaomi-davinci/APKBUILD

@@ -0,0 +1,24 @@
+# Maintainer: Jens Reidel <adrian@travitia.xyz>
+# Co-Maintainer: Arian Kulmer <arian.kulmer@web.de>
+
+pkgname=firmware-xiaomi-davinci
+pkgver=2
+pkgrel=0
+pkgdesc="Firmware for Xiaomi Mi 9T / Redmi K20"
+url="https://github.com/sm7150-mainline/firmware-xiaomi-davinci"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+_commit="d2db810c4a040cc71a6c67d0500158ed29fee678"
+source="$pkgname-$_commit.tar.gz::$url/archive/$_commit/$pkgname-$_commit.tar.gz"
+builddir="$srcdir/$pkgname-$_commit"
+
+package() {
+	mkdir -p "$pkgdir"
+
+	find . -type f -exec install -Dm644 {} "$pkgdir"/{} \;
+}
+
+sha512sums="
+bdd2227424e7e9b1c33e7b07d71c0271b0a5f67fc4faf5114279e6c8203ee39cbba9253702bd2dbebd8d20ed159aa4ce26c01603d790441a91761061c6bd7ae8  firmware-xiaomi-davinci-d2db810c4a040cc71a6c67d0500158ed29fee678.tar.gz
+"

device/community/firmware-xiaomi-surya/30-touchscreen-firmware.files

@@ -0,0 +1,2 @@
+/lib/firmware/novatek_ts_huaxing_fw.bin
+/lib/firmware/novatek_ts_tianma_fw.bin

device/community/firmware-xiaomi-surya/APKBUILD

@@ -0,0 +1,31 @@
+# Maintainer: Danila Tikhonov <danila@jiaxyga.com>
+# Co-Maintainer: David Wronek <davidwronek@gmail.com>
+
+pkgname=firmware-xiaomi-surya
+pkgver=2
+pkgrel=0
+pkgdesc="Firmware for Xiaomi POCO X3 NFC"
+url="https://github.com/sm7150-mainline/firmware-xiaomi-surya"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+_commit="d480e0cf4136c5c763bdc90d15ac94a1600d5aae"
+source="
+	$pkgname-$_commit.tar.gz::$url/archive/$_commit/$pkgname-$_commit.tar.gz
+	30-touchscreen-firmware.files
+"
+builddir="$srcdir/$pkgname-$_commit"
+
+package() {
+	mkdir -p "$pkgdir"
+
+	find . -type f -exec install -Dm644 {} "$pkgdir"/{} \;
+
+	install -Dm644 "$srcdir/30-touchscreen-firmware.files" \
+		"$pkgdir/usr/share/mkinitfs/files/30-touchscreen-firmware.files"
+}
+
+sha512sums="
+592dd5084465da1a9527dd0e3372f65c057454bbe03344607d123c1b62c882b335c2408e0b376f9a7d7e1948420176279215d202522503ee34aebf85342271b0  firmware-xiaomi-surya-d480e0cf4136c5c763bdc90d15ac94a1600d5aae.tar.gz
+da17c49b62a6320a868e34c5ebbbfdecbf80eed714e8a87daacfc5eb8a1d3dd171e13af0d1f7a8ccb6ebf0a6d859a1c3b8173bbe791ce78fadd7b6d1579ec472  30-touchscreen-firmware.files
+"

device/community/firmware-xiaomi-wt88047/APKBUILD

@@ -1,7 +1,6 @@
-# Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=firmware-xiaomi-wt88047
 pkgver=9.2.5.0
-pkgrel=3
+pkgrel=2
 pkgdesc="Firmware for Xiaomi Redmi 2"
 url="https://androidfilehost.com/?w=files&flid=303434"
 subpackages="$pkgname-wcnss-nv:wcnss_nv"

device/community/linux-google-veyron/APKBUILD

@@ -1,8 +1,7 @@
-# Maintainer: Daniel Fancsali <fancsali@gmail.com>
-# Contributor: Jenneron <jenneron@protonmail.com>
+# Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-google-veyron
-pkgver=6.6.74
-pkgrel=0
+pkgver=6.1.39
+pkgrel=7
 pkgdesc="Mainline kernel for Google Veyron devices"
 arch="armv7"
 _carch="arm"
@@ -68,11 +67,11 @@ package() {
 }
 
 sha512sums="
-2a278f4b3d04ec922c4647e3e772dba98d5d615c74f93fea5414784db638212767861c0b8094d2efef79a2da208e2a54d5686b0252f82771e0b6e130a94e167a  linux-6.6.74.tar.xz
-aefe482c64b21bd7c83900cf5f685411966b7e7d9558826616081d305dcb2207adcad70646ce6e8063e24e5dabfdff0eef06a5d81754164e8f88c23ad19d25fd  config-google-veyron.armv7
-48debab56aa7e655ea7d8af6da5fa83065939f23471d3366958c924bd54f0cb8aa20f104b6d14e6b531b67e8c9320342aaf211a19c6e890105fe0302f6cd4c8a  veyron.better_clock_selection_logic_and_dts_rate_list.patch
-cec81f88da19dc928c54780bf1d39efdf23dee481bc1a3a81cb17f506328103221ef47ee020f5e5b393f20fc20242937698cb733aa376e5d79a75b98c486e513  veyron.dts_allow_dedicating_npll_to_vop.patch
-f4336cc18991a01a7d532610758c640d633d1f7ac05e42c229da418eeed109c67c721d6ed5eea593d36178fb8b420dcbd2c0759876358081c669919192330cec  veyron.dts_do_dedicate_npll_to_vop.patch
+20d468ae89b57dda82d7c7b814c3d8b1b510e1623775b09a8a0b0a8a0431461e0a1d2df2bfa01f3102932c8eef91405546898b50ec3e6f30015098bb39722b41  linux-6.1.39.tar.xz
+8bc68908003e06c082f8ae3668bec3cfae9993186a0319d6b30d0c04575ee21478d9dc978eecb45d644e673e9eda3a1fe95fd35e98c0fb53e035e50f6057e9f0  config-google-veyron.armv7
+2912c675c1e07f7e91e2edcaa82738643907ed46614e4b871565930ff4ffece468d47db7905c2c081f936c020ea78db4a9d9f33b76c110125a0e68a1bd57f9fd  veyron.better_clock_selection_logic_and_dts_rate_list.patch
+b16da0e0b1da9f074a773300e954aa5e0da6c2113e20c0b594a7a4875e9addb10efcf5be694467fb00cd8d7c2e3cc83e6d7aac618047775dc0bb354245cf7c35  veyron.dts_allow_dedicating_npll_to_vop.patch
+b7bda162526abdb61c0223f1aac31893526d3d1d21d79ebd3e707be8d9b5dc464f6b4fa20b74444c44fda987352728433913f6f50b9b860c2621d11ae2306e1b  veyron.dts_do_dedicate_npll_to_vop.patch
 67f49d49457eed7ae2de4582d53602743dc9c785720527d713e9b14a027a4716c755cf56e5188641cb69b35c5a561f298fa4cf2b37751696768e76e534139f40  veyron.ignore-gpt-ignoreme.patch
 30e78435b3ef7a1e2ca304297f3bb446e12acd416158707b98b4e38aa31871acac24a6671317bae752a25732534e3f273cd9ab5bf909d920b4b277a69aa11da2  veyron.support_dedicating_npll_to_vop.patch
 "

device/community/linux-google-veyron/veyron.better_clock_selection_logic_and_dts_rate_list.patch

@@ -49,7 +49,7 @@ index c14f88893868..cb7a302497a5 100644
  static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder)
  {
  	struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder);
-@@ -89,126 +94,132 @@ static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder)
+@@ -89,118 +94,132 @@ static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder)
  	return container_of(rkencoder, struct rockchip_hdmi, encoder);
  }
  
@@ -194,13 +194,11 @@ index c14f88893868..cb7a302497a5 100644
 -			{ 0x0051, 0x0003},
 -			{ 0x214c, 0x0003},
 -			{ 0x4064, 0x0003}
--		},
--	}, {
 +	},  {
- 		340000000, {
- 			{ 0x0040, 0x0003 },
- 			{ 0x3b4c, 0x0003 },
- 			{ 0x5a64, 0x0003 },
++		340000000, {
++			{ 0x0040, 0x0003 },
++			{ 0x3b4c, 0x0003 },
++			{ 0x5a64, 0x0003 },
  		},
 -	}, {
 +	},  {
@@ -236,11 +234,10 @@ index c14f88893868..cb7a302497a5 100644
 -		83500000,  { 0x0028, 0x0038, 0x0038 },
 -	}, {
 -		146250000, { 0x0038, 0x0038, 0x0038 },
--	}, {
++		600000000,  { 0x0000, 0x0000, 0x0000 },
+ 	}, {
 -		148500000, { 0x0000, 0x0038, 0x0038 },
 -	}, {
- 		600000000, { 0x0000, 0x0000, 0x0000 },
- 	}, {
 -		~0UL,      { 0x0000, 0x0000, 0x0000},
 +		~0UL,       { 0x0000, 0x0000, 0x0000},
  	}
@@ -266,7 +263,7 @@ index c14f88893868..cb7a302497a5 100644
  
  	hdmi->regmap = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
  	if (IS_ERR(hdmi->regmap)) {
-@@ -237,39 +256,51 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
+@@ -237,27 +256,55 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
  	if (IS_ERR(hdmi->avdd_1v8))
  		return PTR_ERR(hdmi->avdd_1v8);
  
@@ -294,25 +291,23 @@ index c14f88893868..cb7a302497a5 100644
  }
  
  static enum drm_mode_status
--dw_hdmi_rockchip_mode_valid(struct dw_hdmi *dw_hdmi, void *data,
+-dw_hdmi_rockchip_mode_valid(struct dw_hdmi *hdmi, void *data,
 -			    const struct drm_display_info *info,
 +dw_hdmi_rockchip_encoder_mode_valid(struct drm_encoder *encoder,
  			    const struct drm_display_mode *mode)
  {
--	struct rockchip_hdmi *hdmi = data;
-+	struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder);
 -	const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg;
++	struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder);
  	int pclk = mode->clock * 1000;
--	bool exact_match = hdmi->plat_data->phy_force_vendor;
+-	bool valid = false;
 +	int num_rates = hdmi->rates_cnt;
  	int i;
  
--	if (hdmi->ref_clk) {
--		int rpclk = clk_round_rate(hdmi->ref_clk, pclk);
--
--		if (abs(rpclk - pclk) > pclk / 1000)
--			return MODE_NOCLOCK;
--	}
+-	for (i = 0; mpll_cfg[i].mpixelclock != (~0UL); i++) {
+-		if (pclk == mpll_cfg[i].mpixelclock) {
+-			valid = true;
+-			break;
+-		}
 +	/*
 +	 * Pixel clocks we support are always < 2GHz and so fit in an
 +	 * int.  We should make sure source rate does too so we don't get
@@ -320,27 +315,20 @@ index c14f88893868..cb7a302497a5 100644
 +	 */
 +	if (mode->clock > INT_MAX / 1000)
 +		return MODE_BAD;
- 
--	for (i = 0; mpll_cfg[i].mpixelclock != (~0UL); i++) {
--		/*
--		 * For vendor specific phys force an exact match of the pixelclock
--		 * to preserve the original behaviour of the driver.
--		 */
--		if (exact_match && pclk == mpll_cfg[i].mpixelclock)
--			return MODE_OK;
--		/*
--		 * The Synopsys phy can work with pixelclocks up to the value given
--		 * in the corresponding mpll_cfg entry.
--		 */
--		if (!exact_match && pclk <= mpll_cfg[i].mpixelclock)
++
 +	for (i = 0; i < num_rates; i++) {
 +		int slop = CLK_SLOP(pclk);
 +
 +		if ((pclk >= hdmi->rates[i] - slop) &&
 +		    (pclk <= hdmi->rates[i] + slop))
- 			return MODE_OK;
++			return MODE_OK;
  	}
  
+-	return (valid) ? MODE_OK : MODE_BAD;
++	return MODE_BAD;
+ }
+ 
+ static void dw_hdmi_rockchip_encoder_disable(struct drm_encoder *encoder)
 @@ -269,7 +316,39 @@ dw_hdmi_rockchip_encoder_mode_fixup(struct drm_encoder *encoder,
  				    const struct drm_display_mode *mode,
  				    struct drm_display_mode *adj_mode)

device/community/linux-google-veyron/veyron.dts_allow_dedicating_npll_to_vop.patch

@@ -14,8 +14,8 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com>
 
 diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
 index aaaa61875701d..e8cb4dc8c27da 100644
---- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
+--- a/arch/arm/boot/dts/rk3288.dtsi
++++ b/arch/arm/boot/dts/rk3288.dtsi
 @@ -865,12 +865,14 @@
  		rockchip,grf = <&grf>;
  		#clock-cells = <1>;

device/community/linux-google-veyron/veyron.dts_do_dedicate_npll_to_vop.patch

@@ -16,8 +16,8 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com>
 
 diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
 index 05112c25176d3..4d972bd6741c1 100644
---- a/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi
-+++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi
+--- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
++++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
 @@ -83,6 +83,68 @@
  	};
  };

device/community/linux-postmarketos-allwinner/APKBUILD

@@ -3,9 +3,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=6.13.8_git20250323
+pkgver=6.13.2_git20250209
 pkgrel=0
-_tag="orange-pi-6.13-20250323-0155"
+_tag="orange-pi-6.13-20250209-2341"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -79,9 +79,9 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
 }
 sha512sums="
-ad18f1d869539bfa58b88598ed042c4db27e2c88de0a8006e9bb314ba056b40ba547d58e5f817b013f0738cf0e2d1d3da0c818126ca47268dad34ec48e20c35c  linux-postmarketos-allwinner-orange-pi-6.13-20250323-0155.tar.gz
-67d5b5c655718cf31a872c121e4c339004e23da9d11f02b83349b1b8b2a00e667b71ffc4a06c4d9db74963d2af33c5f203de80bca1c1052ba4f9a880e6df4726  config-postmarketos-allwinner.aarch64
-4272b8b2d81f877437a0b9ec8ba4308275b8e9d8678189116892454aa8a07034cc536f11e790ee61e8053717f6d18d6347a01206c7811ad947a843b3eca6d450  config-postmarketos-allwinner.armv7
+e9d6476a087b0174bc424051d5094801221ad69892adb3b37eeef084b39023781efaf26aa1e7d2bc477fb3422efd392a4f59371b8d08bf21c177aadc9c2bd7a3  linux-postmarketos-allwinner-orange-pi-6.13-20250209-2341.tar.gz
+b8d7eaf20a24d96bebe47f69f2a2013e0ad1bf4557e500b674c3adcb36b417ffbbe6988cfe1d4a660713cd26fa2e4fad1a44ceb695c7f62eb85d5e419c55ef2a  config-postmarketos-allwinner.aarch64
+f812930d20065b1b6e7b067d894f42afecc350420f94e5eb63fbef6e533e2e5ded99bd6e393119930a5c6ab0e933b925748bea6587666c0f6c4d328701a5db05  config-postmarketos-allwinner.armv7
 8e798cfeea93853454076469bf837f6045ee37fcce06fc97633acc2e7a6e50d0b2a28ea7e93029f1d7dc4fb1af735a78742519369501f914515c13dfd4abdff1  0001-dts-add-dontbeevil-pinephone-devkit.patch
 ecb29bd3d1c496a5885a5474329a721e01c0782890d6a36cc79594a8e4337e170bbfddee464f909449ff483ab81bdf1a22e660218ec8776aff174666bec86ed2  0002-dts-add-pinetab-dev-old-display-panel.patch
 869a00cdbec6fb7e6881f52f9db1334deb843644c0bd5689278a84d93296f6dfd2cfab2a404471cfd4e475d0351b61752a2d07c430a3611271562e3f69a659da  0003-dts-pinetab-add-missing-ohci1.patch

device/community/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.13.8 Kernel Configuration
+# Linux/arm64 6.13.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1687,6 +1687,7 @@ CONFIG_SUNXI_RSB=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 # CONFIG_ARM_FFA_TRANSPORT is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
+# CONFIG_IMX_SCMI_MISC_DRV is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 
@@ -5426,6 +5427,7 @@ CONFIG_VIDEO_SUNXI_CEDRUS=y
 CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
+# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_ARM64_PLATFORM_DEVICES=y
@@ -6291,6 +6293,7 @@ CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
+# CONFIG_LAN966X_OIC is not set
 CONFIG_SUN6I_R_INTC=y
 CONFIG_SUNXI_NMI_INTC=y
 # CONFIG_XILINX_INTC is not set

device/community/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.13.8 Kernel Configuration
+# Linux/arm 6.13.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1497,6 +1497,7 @@ CONFIG_SUNXI_RSB=y
 # CONFIG_FW_CFG_SYSFS is not set
 # CONFIG_TRUSTED_FOUNDATIONS is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
+# CONFIG_IMX_SCMI_MISC_DRV is not set
 CONFIG_ARM_PSCI_FW=y
 
 #
@@ -5030,6 +5031,7 @@ CONFIG_VIDEO_SUNXI_CEDRUS=y
 CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
+# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
@@ -5842,6 +5844,7 @@ CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_AL_FIC is not set
+# CONFIG_LAN966X_OIC is not set
 CONFIG_SUN4I_INTC=y
 CONFIG_SUN6I_R_INTC=y
 CONFIG_SUNXI_NMI_INTC=y

device/community/linux-postmarketos-exynos5/APKBUILD

@@ -4,8 +4,8 @@
 # and Hardkernel's odroidxu4_defconfig
 
 pkgname=linux-postmarketos-exynos5
-pkgver=6.6.87
-pkgrel=0
+pkgver=6.6.59
+pkgrel=1
 pkgdesc="Mainline kernel fork for Samsung Exynos5 devices"
 arch="armv7"
 _carch="arm"
@@ -69,6 +69,6 @@ package() {
 }
 
 sha512sums="
-21d1a8c4686474f5c4e93406e886339916e4812b72374306b53bad811c2626104085ae614d5892cb1b5273a204509e849e8bf7c7e27e07be0156dbdfd5a1b0bd  linux-postmarketos-exynos5-v6.6.87-exynos5-lts.tar.bz2
-8e7febd087423e84d9e6596584836dfaa4c9f0c794fcc04131af28db0c414351429c50bd9796f6809b7049c859d3b4287b291f0b83abcbd1126b587a103c26a5  config-postmarketos-exynos5.armv7
+db6976d67236b2612c7dcbb201c1f0cad403358418cf359ec9a5e02eeeaa01aebb812eaa575ff7f986e3123e9a971bfe8587dc4ce1be750a88490644dcfe9545  linux-postmarketos-exynos5-v6.6.59-exynos5-lts.tar.bz2
+a3ec96f5ad406e2d7104255038d96eb2dc842629ba78ae45623a8d8e913710b9a0b4eee663b96f9cc3b662139b73223f937aec3da01c31a919e61aa27d48c8c7  config-postmarketos-exynos5.armv7
 "

device/community/linux-postmarketos-exynos5/config-postmarketos-exynos5.armv7

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.6.87 Kernel Configuration
+# Linux/arm 6.6.59 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -97,7 +97,8 @@ CONFIG_HAVE_EBPF_JIT=y
 # BPF subsystem
 #
 CONFIG_BPF_SYSCALL=y
-# CONFIG_BPF_JIT is not set
+CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
 # end of BPF subsystem
@@ -537,8 +538,8 @@ CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
 # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
@@ -546,25 +547,23 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 #
 # CPU frequency scaling drivers
 #
-CONFIG_CPUFREQ_DT=m
-CONFIG_CPUFREQ_DT_PLATDEV=y
+# CONFIG_CPUFREQ_DT is not set
+# CONFIG_CPUFREQ_DT_PLATDEV is not set
 # end of CPU Frequency scaling
 
 #
 # CPU Idle
 #
 CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_CPU_IDLE_GOV_TEO is not set
-CONFIG_DT_IDLE_STATES=y
 
 #
 # ARM CPU Idle Drivers
 #
 # CONFIG_ARM_CPUIDLE is not set
-CONFIG_ARM_BIG_LITTLE_CPUIDLE=y
+# CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set
 CONFIG_ARM_EXYNOS_CPUIDLE=y
 # end of ARM CPU Idle Drivers
 
@@ -1796,7 +1795,6 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
 # CONFIG_ZRAM_DEF_COMP_842 is not set
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 CONFIG_ZRAM_WRITEBACK=y
-# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_MULTI_COMP is not set
 CONFIG_BLK_DEV_LOOP=m
@@ -2667,19 +2665,19 @@ CONFIG_INPUT_DRV260X_HAPTICS=m
 CONFIG_INPUT_DRV2665_HAPTICS=m
 CONFIG_INPUT_DRV2667_HAPTICS=m
 CONFIG_RMI4_CORE=m
-# CONFIG_RMI4_I2C is not set
-# CONFIG_RMI4_SPI is not set
-# CONFIG_RMI4_SMB is not set
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
 CONFIG_RMI4_F03=y
 CONFIG_RMI4_F03_SERIO=m
 CONFIG_RMI4_2D_SENSOR=y
 CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
-# CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F3A is not set
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F3A=y
 # CONFIG_RMI4_F54 is not set
-# CONFIG_RMI4_F55 is not set
+CONFIG_RMI4_F55=y
 
 #
 # Hardware I/O ports
@@ -2765,7 +2763,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=m
+CONFIG_NULL_TTY=y
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
@@ -4020,7 +4018,7 @@ CONFIG_DRM_EXYNOS_HDMI=y
 CONFIG_DRM_EXYNOS_IPP=y
 CONFIG_DRM_EXYNOS_FIMC=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
-CONFIG_DRM_EXYNOS_SCALER=y
+# CONFIG_DRM_EXYNOS_SCALER is not set
 # CONFIG_DRM_UDL is not set
 # CONFIG_DRM_ARMADA is not set
 # CONFIG_DRM_TILCDC is not set
@@ -4175,6 +4173,7 @@ CONFIG_DRM_ANALOGIX_DP=y
 # CONFIG_TINYDRM_ILI9225 is not set
 # CONFIG_TINYDRM_ILI9341 is not set
 # CONFIG_TINYDRM_ILI9486 is not set
+# CONFIG_TINYDRM_ILI9488_PIO is not set
 # CONFIG_TINYDRM_MI0283QT is not set
 # CONFIG_TINYDRM_REPAPER is not set
 # CONFIG_TINYDRM_ST7586 is not set
@@ -4649,7 +4648,7 @@ CONFIG_HID_GLORIOUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
 CONFIG_HID_VIVALDI_COMMON=m
-CONFIG_HID_GOOGLE_HAMMER=m
+# CONFIG_HID_GOOGLE_HAMMER is not set
 CONFIG_HID_GOOGLE_STADIA_FF=m
 CONFIG_HID_VIVALDI=m
 CONFIG_HID_GT683R=m
@@ -4658,7 +4657,7 @@ CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_VIEWSONIC=m
-CONFIG_HID_VRC2=m
+# CONFIG_HID_VRC2 is not set
 CONFIG_HID_XIAOMI=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_ICADE=m
@@ -4686,11 +4685,11 @@ CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NINTENDO=m
-# CONFIG_NINTENDO_FF is not set
+CONFIG_NINTENDO_FF=y
 CONFIG_HID_NTI=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_NVIDIA_SHIELD=m
-# CONFIG_NVIDIA_SHIELD_FF is not set
+CONFIG_NVIDIA_SHIELD_FF=y
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
 CONFIG_PANTHERLORD_FF=y
@@ -4718,7 +4717,7 @@ CONFIG_HID_SONY=m
 CONFIG_SONY_FF=y
 CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_STEAM=m
-# CONFIG_STEAM_FF is not set
+CONFIG_STEAM_FF=y
 CONFIG_HID_STEELSERIES=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_RMI=m
@@ -4743,7 +4742,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
 CONFIG_HID_ALPS=m
-CONFIG_HID_MCP2200=m
+# CONFIG_HID_MCP2200 is not set
 CONFIG_HID_MCP2221=m
 # end of Special HID drivers
 
@@ -5310,7 +5309,7 @@ CONFIG_RTC_DRV_S3C=m
 #
 # HID Sensor RTC drivers
 #
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
 # CONFIG_RTC_DRV_GOLDFISH is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
@@ -5531,7 +5530,6 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-# CONFIG_ARM_TIMER_SP804 is not set
 CONFIG_CLKSRC_EXYNOS_MCT=y
 # CONFIG_MICROCHIP_PIT64B is not set
 # end of Clock Source drivers
@@ -5674,10 +5672,10 @@ CONFIG_SAMSUNG_MC=y
 CONFIG_EXYNOS_SROM=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
-# CONFIG_IIO_BUFFER_CB is not set
-# CONFIG_IIO_BUFFER_DMA is not set
-# CONFIG_IIO_BUFFER_DMAENGINE is not set
-# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
 CONFIG_IIO_KFIFO_BUF=y
 CONFIG_IIO_TRIGGERED_BUFFER=y
 # CONFIG_IIO_CONFIGFS is not set
@@ -5702,9 +5700,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_ADXL372_I2C is not set
 # CONFIG_BMA220 is not set
 # CONFIG_BMA400 is not set
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_BMC150_ACCEL_SPI=m
+# CONFIG_BMC150_ACCEL is not set
 # CONFIG_BMI088_ACCEL is not set
 # CONFIG_DA280 is not set
 # CONFIG_DA311 is not set
@@ -5962,9 +5958,7 @@ CONFIG_IIO_INV_SENSORS_TIMESTAMP=m
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS290 is not set
 # CONFIG_ADXRS450 is not set
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_BMG160_SPI=m
+# CONFIG_BMG160 is not set
 # CONFIG_FXAS21002C is not set
 CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
@@ -6037,7 +6031,7 @@ CONFIG_BH1750=m
 # CONFIG_BH1780 is not set
 # CONFIG_CM32181 is not set
 # CONFIG_CM3232 is not set
-CONFIG_CM3323=m
+# CONFIG_CM3323 is not set
 # CONFIG_CM3605 is not set
 CONFIG_CM36651=y
 # CONFIG_GP2AP002 is not set
@@ -6046,7 +6040,7 @@ CONFIG_SENSORS_ISL29018=m
 # CONFIG_SENSORS_ISL29028 is not set
 # CONFIG_ISL29125 is not set
 CONFIG_HID_SENSOR_ALS=m
-# CONFIG_HID_SENSOR_PROX is not set
+CONFIG_HID_SENSOR_PROX=m
 # CONFIG_JSA1212 is not set
 # CONFIG_ROHM_BU27008 is not set
 # CONFIG_ROHM_BU27034 is not set
@@ -6116,8 +6110,8 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 #
 # Triggers - standalone
 #
-# CONFIG_IIO_INTERRUPT_TRIGGER is not set
-# CONFIG_IIO_SYSFS_TRIGGER is not set
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
 # end of Triggers - standalone
 
 #
@@ -6158,7 +6152,7 @@ CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
-# CONFIG_HID_SENSOR_PRESS is not set
+CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_HP03 is not set
 # CONFIG_ICP10100 is not set
 # CONFIG_MPL115_I2C is not set

device/community/linux-postmarketos-grate/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Jethrob <jeybee@hotmail.com>
 
 pkgname=linux-postmarketos-grate
-pkgver=6.12.5
-pkgrel=0
+pkgver=6.6.22
+pkgrel=7
 pkgdesc="Linux kernel with experimental patches for Tegra"
 arch="armv7"
 url="https://gitlab.com/grate-driver/linux"
@@ -48,6 +48,6 @@ package() {
 }
 
 sha512sums="
-21a1ccd77d3745c70361ed15828616308f43b2f4630b9e17c8191de78fef979e866e8cb12e9f5eaf3c91ad034b89a1796e850c69a56a2d6a967ae5df43a34255  linux-postmarketos-grate-v6.12.5-lts.tar.bz2
-6545b7c9fde2050e6437adad3f80f3ec920903a7cda904f15629562611d2202d2ed2152685828331f34282c898d31ca2818fd6427e5ccca1bf9431c033ac6ec2  config-postmarketos-grate.armv7
+db25898c5c4103e12ace113de7f7eba91b41f94a4dae270c9424341e8f796a98dee8676d1d02b229b0c4b11cc79b31454a13f9f2b7b1277b5ca9bb7328d54a39  linux-postmarketos-grate-v6.6.22-lts.tar.bz2
+7355f5323655fec8da961252a42541e329c3c152937bee04e3a96b7b3a80713c58bccdcdcd044b6b8d45ad7105e9d6b9188f47e043fd9429621bb77b6964ccde  config-postmarketos-grate.armv7
 "

device/community/linux-postmarketos-mediatek-mt8173/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.14.3
+pkgver=6.13.5
 pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
@@ -66,7 +66,7 @@ package() {
 }
 
 sha512sums="
-2b3125a157892676f2cc0a403cbb74d87cb7285d3baccd15460056a0e25b306eec7384a28a5831f6c2729baef08792aa7f83e60eb8bedddcdf6c17b5431b9d50  linux-6.14.3.tar.xz
-686fc86307e5aa9113b7eeb4f94b92e8acb4a786804c8603a17a34aad309b2ede83ef64480ea61baa0f7c2a5b3b9dfca88b9219f270d2e860b53ac451f978b2b  config-postmarketos-mediatek-mt8173.aarch64
+654c03973dc57c6e4fd66e2b5639ebeaaab2737a1702b7235572b4b88bebd67b80e7e3c364e76f1b29c66e046c3109e8052bff1ec6f79f4afcad387624680d00  linux-6.13.5.tar.xz
+acd8d6baf266ea6c622adbcbaf19341a8b4067260752a5025284d3facddc6181bc79b0c5aa8923489fddf7d54b7c27851426257a3e68bb81f74dff320655d8f5  config-postmarketos-mediatek-mt8173.aarch64
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 "

device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.14.3 Kernel Configuration
+# Linux/arm64 6.13.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -17,7 +17,6 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
 CONFIG_PAHOLE_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
@@ -63,7 +62,6 @@ CONFIG_IRQ_MSI_IOMMU=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
-CONFIG_GENERIC_IRQ_KEXEC_CLEAR_VM_FORWARD=y
 # end of IRQ subsystem
 
 CONFIG_GENERIC_TIME_VSYSCALL=y
@@ -191,7 +189,6 @@ CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 # CONFIG_CGROUP_RDMA is not set
-# CONFIG_CGROUP_DMEM is not set
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
@@ -324,7 +321,6 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
 # CONFIG_ARCH_BCM is not set
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BLAIZE is not set
 # CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_SPARX5 is not set
 # CONFIG_ARCH_K3 is not set
@@ -415,7 +411,6 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
-CONFIG_ROCKCHIP_ERRATUM_3568002=y
 CONFIG_ROCKCHIP_ERRATUM_3588001=y
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 # end of ARM errata workarounds via the alternatives framework
@@ -1058,7 +1053,6 @@ CONFIG_XFRM_USER=m
 # CONFIG_XFRM_STATISTICS is not set
 CONFIG_XFRM_ESP=m
 # CONFIG_NET_KEY is not set
-# CONFIG_XFRM_IPTFS is not set
 # CONFIG_XDP_SOCKETS is not set
 CONFIG_NET_HANDSHAKE=y
 CONFIG_INET=y
@@ -1598,7 +1592,6 @@ CONFIG_BT_MTK=m
 CONFIG_BT_HCIBTUSB=m
 # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
 CONFIG_BT_HCIBTUSB_POLL_SYNC=y
-CONFIG_BT_HCIBTUSB_AUTO_ISOC_ALT=y
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
@@ -2219,9 +2212,9 @@ CONFIG_PCI_ENDPOINT_TEST=m
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_HISI_HIKEY_USB is not set
 # CONFIG_OPEN_DICE is not set
-# CONFIG_NTSYNC is not set
 # CONFIG_VCPU_STALL_DETECTOR is not set
 # CONFIG_NSM is not set
+# CONFIG_MCHP_LAN966X_PCI is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -2654,6 +2647,7 @@ CONFIG_NET_VENDOR_MICROSOFT=y
 # CONFIG_NET_VENDOR_NVIDIA is not set
 # CONFIG_NET_VENDOR_OKI is not set
 # CONFIG_ETHOC is not set
+# CONFIG_OA_TC6 is not set
 # CONFIG_NET_VENDOR_PACKET_ENGINES is not set
 # CONFIG_NET_VENDOR_PENSANDO is not set
 # CONFIG_NET_VENDOR_QLOGIC is not set
@@ -2748,7 +2742,6 @@ CONFIG_AT803X_PHY=m
 # CONFIG_QCA807X_PHY is not set
 # CONFIG_QSEMI_PHY is not set
 CONFIG_REALTEK_PHY=m
-CONFIG_REALTEK_PHY_HWMON=y
 # CONFIG_RENESAS_PHY is not set
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_SMSC_PHY=m
@@ -3055,6 +3048,7 @@ CONFIG_INPUT_VIVALDIFMAP=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers
@@ -3587,7 +3581,10 @@ CONFIG_PPS=y
 # CONFIG_PPS_CLIENT_KTIMER is not set
 # CONFIG_PPS_CLIENT_LDISC is not set
 # CONFIG_PPS_CLIENT_GPIO is not set
-# CONFIG_PPS_GENERATOR is not set
+
+#
+# PPS generators support
+#
 
 #
 # PTP clock support
@@ -3643,7 +3640,6 @@ CONFIG_PINCTRL_MT6797=y
 CONFIG_PINCTRL_MT7622=y
 CONFIG_PINCTRL_MT7981=y
 CONFIG_PINCTRL_MT7986=y
-CONFIG_PINCTRL_MT7988=y
 CONFIG_PINCTRL_MT8167=y
 CONFIG_PINCTRL_MT8173=y
 CONFIG_PINCTRL_MT8183=y
@@ -3826,7 +3822,6 @@ CONFIG_CHARGER_BQ25980=m
 # CONFIG_CHARGER_RT9471 is not set
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_CROS_PCHG=y
-# CONFIG_FUEL_GAUGE_STC3117 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set
@@ -4225,7 +4220,6 @@ CONFIG_MFD_WCD934X=m
 # CONFIG_MFD_CS40L50_SPI is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
-# CONFIG_MFD_QNAP_MCU is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # CONFIG_MFD_RSMU_SPI is not set
 # end of Multifunction device drivers
@@ -4844,9 +4838,6 @@ CONFIG_DRM_CLIENT_SETUP=y
 #
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_CLIENT_LOG is not set
-CONFIG_DRM_CLIENT_DEFAULT_FBDEV=y
-CONFIG_DRM_CLIENT_DEFAULT="fbdev"
 # end of Supported DRM clients
 
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
@@ -4857,7 +4848,6 @@ CONFIG_DRM_BRIDGE_CONNECTOR=y
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 CONFIG_DRM_DISPLAY_HDCP_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_AUDIO_HELPER=y
 CONFIG_DRM_DISPLAY_HDMI_HELPER=y
 CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_TTM=m
@@ -5227,8 +5217,6 @@ CONFIG_SND_DMAENGINE_PCM=y
 CONFIG_SND_HWDEP=m
 CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_RAWMIDI=m
-CONFIG_SND_COMPRESS_OFFLOAD=m
-CONFIG_SND_COMPRESS_ACCEL=y
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
 # CONFIG_SND_OSSEMUL is not set
@@ -5806,7 +5794,6 @@ CONFIG_HID_THRUSTMASTER=m
 # CONFIG_THRUSTMASTER_FF is not set
 CONFIG_HID_UDRAW_PS3=m
 CONFIG_HID_U2FZERO=m
-# CONFIG_HID_UNIVERSAL_PIDFF is not set
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_WINWING=m
@@ -5827,12 +5814,6 @@ CONFIG_HID_MCP2221=m
 CONFIG_HID_BPF=y
 # end of HID-BPF support
 
-CONFIG_I2C_HID=y
-CONFIG_I2C_HID_OF=m
-# CONFIG_I2C_HID_OF_ELAN is not set
-# CONFIG_I2C_HID_OF_GOODIX is not set
-CONFIG_I2C_HID_CORE=m
-
 #
 # USB HID support
 #
@@ -5841,6 +5822,11 @@ CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
 # end of USB HID support
 
+CONFIG_I2C_HID=y
+CONFIG_I2C_HID_OF=m
+# CONFIG_I2C_HID_OF_ELAN is not set
+# CONFIG_I2C_HID_OF_GOODIX is not set
+CONFIG_I2C_HID_CORE=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -5905,7 +5891,11 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_TMC is not set
 
 #
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; see USB_STORAGE Help for more info
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
 #
 CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_DEBUG is not set
@@ -6211,7 +6201,6 @@ CONFIG_TYPEC_HD3SS3220=m
 # USB Type-C Alternate Mode drivers
 #
 # CONFIG_TYPEC_DP_ALTMODE is not set
-# CONFIG_TYPEC_TBT_ALTMODE is not set
 # end of USB Type-C Alternate Mode drivers
 
 CONFIG_USB_ROLE_SWITCH=y
@@ -6299,7 +6288,6 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_LP50XX is not set
 # CONFIG_LEDS_LP55XX_COMMON is not set
 # CONFIG_LEDS_LP8860 is not set
-# CONFIG_LEDS_LP8864 is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_PCA995X is not set
@@ -6324,7 +6312,6 @@ CONFIG_LEDS_SYSCON=y
 # CONFIG_LEDS_USER is not set
 # CONFIG_LEDS_SPI_BYTE is not set
 # CONFIG_LEDS_LM3697 is not set
-# CONFIG_LEDS_ST1202 is not set
 
 #
 # Flash and Torch LED drivers
@@ -6937,7 +6924,6 @@ CONFIG_IOMMU_DMA=y
 CONFIG_ARM_SMMU=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
-CONFIG_ARM_SMMU_MMU_500_CPRE_ERRATA=y
 CONFIG_ARM_SMMU_V3=y
 # CONFIG_ARM_SMMU_V3_SVA is not set
 CONFIG_MTK_IOMMU=y
@@ -7069,7 +7055,6 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=y
 #
 CONFIG_MTK_SCPSYS=y
 CONFIG_MTK_SCPSYS_PM_DOMAINS=y
-# CONFIG_AIROHA_CPU_PM_DOMAIN is not set
 # end of MediaTek PM Domains
 
 #
@@ -7381,7 +7366,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD7303 is not set
 # CONFIG_AD8460 is not set
 # CONFIG_AD8801 is not set
-# CONFIG_BD79703 is not set
 # CONFIG_DPOT_DAC is not set
 # CONFIG_DS4424 is not set
 # CONFIG_LTC1660 is not set
@@ -7542,6 +7526,7 @@ CONFIG_SENSORS_ISL29018=m
 CONFIG_HID_SENSOR_ALS=m
 # CONFIG_HID_SENSOR_PROX is not set
 # CONFIG_JSA1212 is not set
+# CONFIG_ROHM_BU27008 is not set
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_RPR0521 is not set
 # CONFIG_LTR390 is not set
@@ -7553,7 +7538,6 @@ CONFIG_HID_SENSOR_ALS=m
 # CONFIG_NOA1305 is not set
 # CONFIG_OPT3001 is not set
 # CONFIG_OPT4001 is not set
-# CONFIG_OPT4060 is not set
 # CONFIG_PA12203001 is not set
 # CONFIG_SI1133 is not set
 # CONFIG_SI1145 is not set
@@ -7989,7 +7973,6 @@ CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_VIRTIO_FS=m
 CONFIG_FUSE_PASSTHROUGH=y
-CONFIG_FUSE_IO_URING=y
 CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
@@ -8220,7 +8203,6 @@ CONFIG_PROC_MEM_ALWAYS_FORCE=y
 # CONFIG_PROC_MEM_FORCE_PTRACE is not set
 # CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
-CONFIG_HAS_SECURITY_AUDIT=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
@@ -8371,6 +8353,7 @@ CONFIG_CRYPTO_CTR=m
 # CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_HCTR2 is not set
+# CONFIG_CRYPTO_KEYWRAP is not set
 # CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=y
@@ -8409,6 +8392,7 @@ CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM3_GENERIC=m
 # CONFIG_CRYPTO_STREEBOG is not set
+# CONFIG_CRYPTO_VMAC is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 CONFIG_CRYPTO_XXHASH=y
@@ -8491,6 +8475,7 @@ CONFIG_CRYPTO_AES_ARM64_BS=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
 # end of Accelerated Cryptographic Algorithms for CPU (arm64)
 
 CONFIG_CRYPTO_HW=y
@@ -8580,19 +8565,19 @@ CONFIG_CRYPTO_LIB_SHA256=y
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
-CONFIG_ARCH_HAS_CRC_T10DIF=y
-CONFIG_CRC_T10DIF_ARCH=y
 CONFIG_CRC64_ROCKSOFT=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
-CONFIG_ARCH_HAS_CRC32=y
-CONFIG_CRC32_ARCH=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
 CONFIG_CRC64=y
 # CONFIG_CRC4 is not set
 CONFIG_CRC7=y
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=m
-CONFIG_CRC_OPTIMIZATIONS=y
 CONFIG_XXHASH=y
 CONFIG_AUDIT_GENERIC=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
@@ -8903,8 +8888,7 @@ CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FREGS=y
-CONFIG_HAVE_FTRACE_GRAPH_FUNC=y
+CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
@@ -8929,7 +8913,6 @@ CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
-# CONFIG_FPROBE is not set
 # CONFIG_FUNCTION_PROFILER is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set

device/community/linux-postmarketos-mediatek-mt8183/APKBUILD

@@ -1,8 +1,8 @@
 # Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8183
-pkgver=6.12.21
-pkgrel=0
+pkgver=6.6.61
+pkgrel=2
 pkgdesc="Mainline kernel for mediatek mt8183"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -42,11 +42,17 @@ esac
 
 source="
 	https://cdn.kernel.org/pub/linux/kernel/v${_kernver%%.*}.x/linux-$_kernver.tar.xz
+	arm64-dts-mediatek-mt8183-Add-missing-GPU-clocks.patch
+	arm64-dts-mediatek-mt8183-Add-video-encoder-decoder.patch
+	arm64-dts-mediatek-mt8183-Drop-VDEC_SYS-register.patch
+	arm64-dts-mediatek-mt8183-Add-register-names-and-sys.patch
+	arm64-dts-mt8183-Add-jacuzzi-makomo-board.patch
+	arm64-dts-mt8183-Add-jacuzzi-pico-pico6-board.patch
+	arm64-dts-mt8183-Add-kukui-katsu-board.patch
 	arm64-dts-mt8183-Add-kukui-jacuzzi-cerise-board.patch
-	mt8183-fix-bluetooth.patch
-	mt8183-kukui-add-it6505-and-enable-dpi.patch
 	mt8183-kukui-jacuzzi-fix-display-resume.patch
 	mt8183-kukui-jacuzzi-hack-dpms-resume.patch
+	mt8183-fix-bluetooth.patch
 	mt8183-kukui-jacuzzi-fennel14-rt1015p-sound.patch
 	config-$_flavor.aarch64
 "
@@ -80,12 +86,18 @@ package() {
 
 
 sha512sums="
-14436c71264c8679a1a9aada6b64d916a6ac5ff5f2128b344e844bea41780832b9bb5c74ee7d0970ee84b02feff433b1003303e129ff26deaba705aff3608b6f  linux-6.12.21.tar.xz
+df3635ffdf68a2547eb3e992f4510bb5080bbeaea98731225f4d5e3c9afb532bc1f35f38321db49fb70ea0baec55b14f48b2251480c10432e8c428b2cc0a2028  linux-6.6.61.tar.xz
+669a1bbf8707ec9294da83336673fbb55061a2eed0c6ddb2613da3ae4fa9b0e2bdbdd91ad166694173e3540ea934b2f3bf27d5f9659a6952de806765eed9b824  arm64-dts-mediatek-mt8183-Add-missing-GPU-clocks.patch
+40246a8da036dc6c21592efd6625a4be22d6f524b067854f17f5671f5f3b134ed1c63a8c03a15a55e9b45b7d8d1a9b63833b86f38a6f5863e02cc8ddbf70fa57  arm64-dts-mediatek-mt8183-Add-video-encoder-decoder.patch
+aee85972804ab4a254f007805e25d30a82bb87e48144a05805ccefd49f8530f588e2c50b6550f302895a675003ffbe8e7986c2214d76763474b88804fe7f1519  arm64-dts-mediatek-mt8183-Drop-VDEC_SYS-register.patch
+567b13d7508fdf584a64bf3f9d71ba34c045c6e4610ef7f7024ed98f4e7ebbd78c0ee2d5dccc7a50e651e4a088c0621f5150d477520069965466d5db265160ab  arm64-dts-mediatek-mt8183-Add-register-names-and-sys.patch
+c0ac0f26bb515a68b89515a19113a14e2cd11c940f01649a2e4e9261f852be66af6a53683fc3d4f2ae7b1289fa9247111772f458ff96e51742b2b1efc7a73a11  arm64-dts-mt8183-Add-jacuzzi-makomo-board.patch
+5a1bdadc6cb12c1fb52c1ed8710e0d0c05e91b4559725fe7b26c41bc6fa375800cbb51e554401cdf419fbfdf6ab7f91f1efb5ad333db2e0e0466036f41eff519  arm64-dts-mt8183-Add-jacuzzi-pico-pico6-board.patch
+69f26a25a9a35eaf8f0c655e3f50a5ab19a5f727b1cdf49ad0c9cb89c69cd9517bd381a62e5197c1f00a7c2f03cd2411415f455e9fb5a2c8c1afa777e754398e  arm64-dts-mt8183-Add-kukui-katsu-board.patch
 a95ce4a71d249ef401ca04cf8faf85b9022114d35fef5a0ce18929f734a0ac80ed0332648cc9768625f3c26b3720679e1a20bf8ac564087bd4c64f49cd96cc45  arm64-dts-mt8183-Add-kukui-jacuzzi-cerise-board.patch
-d74da1231181835bec82015da1b3f5b08a1fe9c3c35dd712e285891094d94d9427ceac75d32f74be3a635e17d93ad82b37adf97db8176efc91aed17535023fc2  mt8183-fix-bluetooth.patch
-19fdf640c34a0c04ba6aca85e93650f8696fe16d2fd2dba2a79ed504c5e2813868f5dfd91f9b3ee6951eede2b2b1e295c7a0c0f5b462996316b4576973c82ddd  mt8183-kukui-add-it6505-and-enable-dpi.patch
 519b6468bca78d0e315c826592ae40dddca9daeba7c2b451a20ca996494cca45721833b9138fefbb543f53e0b9257c78ec4fec54de2a160aa8df730daf3ac996  mt8183-kukui-jacuzzi-fix-display-resume.patch
 e9a128a8ddd98c6c8957ba45186afa2ea8ebeac83d4f2db3ff9ee8a5dd8027af90868c334a7b456bfe7dce793517f27ad63efa220bc933e3407f6362da6d7b2a  mt8183-kukui-jacuzzi-hack-dpms-resume.patch
+d74da1231181835bec82015da1b3f5b08a1fe9c3c35dd712e285891094d94d9427ceac75d32f74be3a635e17d93ad82b37adf97db8176efc91aed17535023fc2  mt8183-fix-bluetooth.patch
 9b8707de42635734031495da055c5860addeb656051540f1a14404b10aa8b501168d8b0e274b37bce989db3bc050e9beef722189556f6d782b92cc907731488d  mt8183-kukui-jacuzzi-fennel14-rt1015p-sound.patch
-ce12fb0bf44817398d19d937776f4484fa3e17952852f242273fb125c2af2a1a3bddcec27bf66cb965806c92aafed660b979920ab027f0e3a635f682b594d277  config-postmarketos-mediatek-mt8183.aarch64
+1662fc03d269a39a5db206a827988cc136be33826f6f5b6a4db4e37ff178c6e0365f7774634c00bf50bfdf5305b33bc798ed52d4450c41b9fc31a1b4c45d9918  config-postmarketos-mediatek-mt8183.aarch64
 "

device/community/linux-postmarketos-mediatek-mt8183/arm64-dts-mediatek-mt8183-Add-missing-GPU-clocks.patch

@@ -0,0 +1,39 @@
+From d5327028da2f2c7ff90133b57fa2fbb3bb23a760 Mon Sep 17 00:00:00 2001
+From: Alicja Michalska <ahplka19@gmail.com>
+Date: Sun, 26 Nov 2023 14:44:30 +0100
+Subject: [PATCH] arm64: dts: mediatek: mt8183: Add missing GPU clocks
+
+Signed-off-by: Alicja Michalska <ahplka19@gmail.com>
+---
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+index 2c5665e695d2..352363db7481 100644
+--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+@@ -1761,7 +1761,20 @@ gpu: gpu@13040000 {
+ 				<GIC_SPI 278 IRQ_TYPE_LEVEL_LOW>;
+ 			interrupt-names = "job", "mmu", "gpu";
+ 
+-			clocks = <&mfgcfg CLK_MFG_BG3D>;
++			clocks =
++				<&topckgen CLK_TOP_MFGPLL_CK>,
++				<&topckgen CLK_TOP_MUX_MFG>,
++				<&clk26m>,
++				<&mfgcfg CLK_MFG_BG3D>;
++			clock-names =
++				"clk_main_parent",
++				"clk_mux",
++				"clk_sub_parent",
++				"subsys_mfg_cg";
++
++			#cooling-cells = <2>;
++			cooling-min-level = <0>;
++			cooling-max-level = <15>;
+ 
+ 			power-domains =
+ 				<&spm MT8183_POWER_DOMAIN_MFG_CORE0>,
+-- 
+2.43.0
+

device/community/linux-postmarketos-mediatek-mt8183/arm64-dts-mediatek-mt8183-Add-register-names-and-sys.patch

@@ -0,0 +1,46 @@
+From 7ce7e9354cd7509fd1264d4a7ad6762023ff352e Mon Sep 17 00:00:00 2001
+From: Alicja Michalska <ahplka19@gmail.com>
+Date: Sun, 26 Nov 2023 23:32:20 +0100
+Subject: [PATCH] arm64: dts: mediatek: mt8183: Add register names and syscon
+ pointer
+
+Based on patch from Collabora, it seems like we missed it.
+Another node exists for vencsys, so adding that as well.
+
+Signed-off-by: Alicja Michalska <ahplka19@gmail.com>
+---
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+index d4506fe54a8b..07ca7448adfd 100644
+--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
++++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+@@ -2162,6 +2162,8 @@ vcodec_dec: vcodec@16000000 {
+ 				 <0 0x16027000 0 0x800>,		/* VP6_VD */
+ 				 <0 0x16027800 0 0x800>,		/* VP8_VL */
+ 				 <0 0x16028400 0 0x400>;		/* VP9_VD */
++			reg-names = "misc", "ld", "top", "cm", "ad", "av", "pp",
++				"hwd", "hwq", "hwb", "hwg";
+ 			interrupts = <GIC_SPI 250 IRQ_TYPE_LEVEL_LOW>;
+ 			mediatek,larb = <&larb1>;
+ 			iommus = <&iommu M4U_PORT_HW_VDEC_MC_EXT>,
+@@ -2172,6 +2174,7 @@ vcodec_dec: vcodec@16000000 {
+ 				 <&iommu M4U_PORT_HW_VDEC_PRED_WR_EXT>,
+ 				 <&iommu M4U_PORT_HW_VDEC_PPWRAP_EXT>;
+ 			mediatek,scp = <&scp>;
++			mediatek,vdecsys = <&vdecsys>;
+ 			power-domains = <&spm MT8183_POWER_DOMAIN_VDEC>;
+ 			clocks = <&vdecsys CLK_VDEC_VDEC>;
+ 			clock-names = "vdec";
+@@ -2227,6 +2230,7 @@ vcodec_enc: vcodec@17020000 {
+ 				 <&iommu M4U_PORT_VENC_REF_LUMA>,
+ 				 <&iommu M4U_PORT_VENC_REF_CHROMA>;
+ 			mediatek,scp = <&scp>;
++			mediatek,vencsys = <&vencsys>;
+ 			power-domains = <&spm MT8183_POWER_DOMAIN_VENC>;
+ 			clocks = <&vencsys CLK_VENC_VENC>;
+ 			clock-names = "venc";
+-- 
+2.43.0
+