optee-test: fix build

properly build all TAs and pull them in, yeah we have to build
optee-client too urgh

Signed-off-by: Casey Connolly <kcxt@postmarketos.org>

.ci/apkbuild-lint.sh

@@ -11,12 +11,4 @@ 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

@@ -0,0 +1,80 @@
+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

@@ -1,43 +0,0 @@
-#!/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,23 +24,6 @@ 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:
@@ -93,18 +76,9 @@ 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)
 
-    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_strict(packages, arch)
 
     # Build packages in extra-repos/systemd
     # FIXME: this should probably be more generic, if other repos are added later?
@@ -127,15 +101,6 @@ 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)
 
-        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)
+        build_strict(systemd_pkgs, arch)

.ci/lib/common.py

@@ -41,7 +41,9 @@ def add_upstream_git_remote():
 
 
 def commit_message_has_string(needle):
-    return needle in run_git(["show", "-s", "--format=full", "HEAD"])
+    base_commit = get_base_commit()
+
+    return needle in run_git(["log", "--pretty=format:%B", f"{base_commit}..HEAD"])
 
 
 def run_pmbootstrap(parameters):
@@ -86,12 +88,10 @@ def get_upstream_branch():
     return ret
 
 
-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
-    """
+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."""
+
     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,6 +107,17 @@ def get_changed_files(removed=True):
         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

@@ -0,0 +1,56 @@
+#!/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

@@ -0,0 +1,199 @@
+#!/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

@@ -0,0 +1,82 @@
+#!/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,7 +15,6 @@ 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
@@ -39,10 +38,11 @@ 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 -e SC1008 -e SC3043 -x "$(basename "$file")"
+	shellcheck -S warning -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_unmaintained():
+def test_aports_archived():
     """
-    Ensure that aports in /device/unmaintained have an "Unmaintained:" comment
-    that describes why the aport is unmaintained.
+    Ensure that aports in /device/archived have an "Archived:" comment
+    that describes why the aport 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"
+    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"

.ci/testcases/test_deviceinfo.py

@@ -74,7 +74,8 @@ def test_deviceinfo():
             name = info.name
             manufacturer = info.manufacturer
             if not name.startswith(manufacturer) and \
-                    not name.startswith("Google"):
+                    not name.startswith("Google") and \
+                    not name.startswith("Jolla"):
                 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":
+        if aport_name == "linux-pam-pmos":
             continue  # This package isn't a linux kernel!
 
         if "pmb:cross-native" not in apkbuild["options"]:

.ci/testcases/test_source.py

@@ -105,7 +105,8 @@ 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 rel_file_path not in trigger_sources \
+                    and not rel_file_path.startswith("tests/"):
                 raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")
 
 

.ci/unit-tests.sh

@@ -0,0 +1,19 @@
+#!/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

@@ -0,0 +1,16 @@
+#!/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,13 +37,30 @@ prepend_msg() {
 [ -z "$SOURCE" ] || exit 0
 
 lcp=$(git diff-index --name-only --cached HEAD | longest_common_prefix)
+prefix=""
 
 case "$lcp" in
-	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): ";;
+	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)"
+		;;
 esac
 
+if [ -n "$prefix" ]; then
+	prepend_msg "$prefix: "
+fi
+
 exit 0

.gitignore

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

.gitlab-ci.yml

@@ -8,14 +8,16 @@ 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:
@@ -27,6 +29,10 @@ 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
@@ -63,7 +69,6 @@ shellcheck-grep:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/shellcheck.sh
     - .ci/grep.sh
-    - .ci/codeowners.sh
 
 editor-config:
   stage: lint
@@ -116,6 +121,15 @@ 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:
@@ -129,55 +143,44 @@ mr-settings:
     - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
     - python3 ./check_mr_settings.py
 
-# build changed aports
-.build:
-  stage: build
+# 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
-  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
+build-jobs:
+  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
 
 auto-update:
   stage: autoupdate
@@ -197,3 +200,11 @@ 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,6 +34,7 @@
 
 ### On what environment did you encounter the issue?
 #### Environments
+* [ ] COSMIC
 * [ ] GNOME Shell on Mobile
 * [ ] Phosh
 * [ ] Plasma Mobile

.mrhlpr.json

@@ -1,10 +0,0 @@
-{
-    "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

@@ -1,160 +0,0 @@
-# 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,6 +42,19 @@ 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=14
+pkgrel=16
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-8f1f521eceb24a5f66e18e022b1151e96b40378051aaed911dc22e68dbffc5998c8f2bac3935423371c7e707f8931e97873c91c39d56dc2e34292567b3caceaf  busybox-static-1.37.0-r14-aarch64-edge.apk
+6ff297733e1c89429cb0b667a5cda1cad1e2085b4ea071d6247034313c2e0a0963d44158ef5b651f212ea3fa99e16fdc7901152317cd5a07b1e76c2ed5aa47b2  busybox-static-1.37.0-r16-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

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

cross/busybox-static-armv7/APKBUILD

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

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

@@ -0,0 +1,26 @@
+# 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

@@ -0,0 +1,32 @@
+# 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,4 +1,5 @@
 # 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/device-xiaomi-kenzo/APKBUILD

@@ -1,3 +1,4 @@
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8956)
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-kenzo
 pkgdesc="Xiaomi Redmi Note 3"

device/archived/firmware-samsung-espresso10/APKBUILD

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

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

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

device/archived/firmware-xiaomi-kenzo/APKBUILD

@@ -1,3 +1,4 @@
+# Archived: unmaintained port, only for testing. Use generic/mainline port (qcom-msm8956)
 pkgname=firmware-xiaomi-kenzo
 pkgver=1
 pkgrel=3

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

@@ -1,7 +1,8 @@
+# Archived: Downstream port, only for testing. Use mainline port (asus-x00td)!
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/X00TD_defconfig
 
-pkgname=linux-asus-x00td
+pkgname=linux-asus-x00td-downstream
 pkgver=4.4.223
 pkgrel=0
 pkgdesc="Asus ZenFone Max Pro M1 kernel fork"
@@ -45,6 +46,8 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
 }
 
-sha512sums="84648d1f7e96bf8c14992ce315dc033a9d2f3e46d91ba12e5fdf621ba3fdc58048b9feda9197c2f8f9506a8600fa07484abd4ebcc73d1e98150b65981c4f54cf  linux-asus-x00td-ad8e4cb1207f5bb5abbdc0cd51830bd7912d7c2d.tar.gz
+sha512sums="
+84648d1f7e96bf8c14992ce315dc033a9d2f3e46d91ba12e5fdf621ba3fdc58048b9feda9197c2f8f9506a8600fa07484abd4ebcc73d1e98150b65981c4f54cf  linux-asus-x00td-downstream-ad8e4cb1207f5bb5abbdc0cd51830bd7912d7c2d.tar.gz
 67612dd3513592cc8b277476f0cf88af7cdd48cdeec24e9342bbb424bb5ea44bc9a53ea7f5b7d6e3e2f77018aa8b0514004ee28e2dfc1c5326e90ba29f6556e8  config-asus-x00td.aarch64
-8b3934e3c4115e81ac40a3c8022f3134cd89133f7569557ca857b4fd514078c4898b2ba3427986936d029874903711d04d7757d5a87bcb89137073128e51e8f5  fix-macro-declare_usb_function.patch"
+8b3934e3c4115e81ac40a3c8022f3134cd89133f7569557ca857b4fd514078c4898b2ba3427986936d029874903711d04d7757d5a87bcb89137073128e51e8f5  fix-macro-declare_usb_function.patch
+"

device/archived/linux-samsung-j5y17lte/APKBUILD

@@ -1,4 +1,5 @@
 # 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,4 +1,5 @@
 # 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/archived/linux-xiaomi-kenzo/APKBUILD

@@ -1,3 +1,4 @@
+# Archived: unmaintained kernel package, only for testing. Use mainline kernel (linux-postmarketos-qcom-msm8956)
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/lineageos_kenzo_defconfig
 

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=0
+pkgrel=1
 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="dedbb209ed983a869b7aaceb883f8896c82d2296"
+_commit="30ff4bed580e0c24f235409069c5f798866897e0"
 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="
-4c873c3e5b372f7075a38b8fd33723b47cf0ed2013b5ddccec64a4edc587d2f121eb80b930fa6d1ce98dd9ad55043eb1e3e152f1451f4491bc667353548acee7  alsa-ucm-conf-qcom-sm7150-dedbb209ed983a869b7aaceb883f8896c82d2296.tar.gz
+9a722c6c8090242ac3914e270931a27f241bb616d25b0964e9402805577362939c4dfd973da20df8d9fab75ae9e77656987c6c9b3cd9e59a74d5cb10b1eae052  alsa-ucm-conf-qcom-sm7150-30ff4bed580e0c24f235409069c5f798866897e0.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=17
-pkgrel=1
+pkgver=18
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -70,7 +70,7 @@ kernel_lts() {
 }
 
 sha512sums="
-e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb  deviceinfo
+c8a4b2dc32aa43e574e9fdb2d95ac50ee00e26703ae00f6f57cd8ab43cc16999d0da064d2af4c07f5f37a9d01691835a79a12a70cb4c09455ba276ffbbd14310  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 quiet"
+deviceinfo_kernel_cmdline="PMOS_FORCE_PARTITION_RESIZE psi=1 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=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,7 +51,7 @@ nonfree_firmware() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgvar-r$pkgrel openrc"
+	install_if="$pkgname=$pkgver-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=9
-pkgrel=1
+pkgver=10
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -74,7 +74,7 @@ sha512sums="
 016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
 ad032b1a35cfcd4fc0c8df988430ee97b711e785b86cca68b7552b23a9a2e2b6b97c327e3415a575db47ad6c1f86ded18df5553acaae63010057d89b8c16135e  deviceinfo
 b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd.confd
-3213a3586c25cef843a47e2446179ff73acad6421826a64bedb6b9800d30673503d0ea6b3fcc8cfbdcdcaf0926755a489323fce9d14d4411799e6988144b3518  modules-initfs
+925d8b176a8f1b47a86a1026cc920ffae99ceb35c3e52c222654c15078907579d23c4d68ed65a98ab937f59aaba2bbdd74da8d273e8b9c1ac87a52f718d383d6  modules-initfs
 2972005a9cf6ca57061965075593dddfa8ee479bc6c21cd41851b1a14768cb1cddbd31a17975ae17adc36d40d294ccbc6bf83defbd69fc7b363f638d8564fbbc  no-hexagonrpcd-on-suspend.sh
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 "

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

@@ -1,10 +1,4 @@
-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=12
+pkgver=13
 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
-514ff5c946633dccaa569fed51743c669ea9942af4dd891ad001ba08bba07fca92503e29304f3eb71c16bc2f2436e1879ff0bf56d99666e4dcf9635c8605da2e  deviceinfo
+d14992ad384d762452b28a8c5b93be67fb6bc03d0dd3e68d24c3373d466260a5e1a07338eb8fc5090edc735fd70b43017128c27962ebf4b7a5e3fa2fba66c18f  deviceinfo
 a6e5a9de9fe010966523606f2fcab1c44004228b4e050f777dcb1160fb3e32cda8096925543522216c2eb354f8ce2f8d4e206d98b077fbd6fb840de94e84c706  modules-initfs
 "

device/community/device-google-x64cros/deviceinfo

@@ -18,6 +18,7 @@ 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=12
-pkgrel=1
+pkgver=13
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -63,7 +63,7 @@ usbguard() {
 }
 
 sha512sums="
-9cb08de5748b0339005a910cc0475ad344dc6e912e477c5bd6b370784af6309719524f8fa7a39e7565586e47968a35c344ea853cddd716cc3e1e483efaae7ff0  deviceinfo
+d2c2266c7db3b018cb1324ad4259fec664fa9d500f701795c6198b2318cec6466a9ad908c7217bb43c03d236dfdf3fb84280faf0cfa484bbdf90bda680822309  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"
+deviceinfo_kernel_cmdline="quiet loglevel=2 quiet clk_ignore_unused pd_ignore_unused arm64.nopauth pmos.force-partition-resize"
 
 # 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=41
-pkgrel=0
+pkgver=42
+pkgrel=1
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -20,9 +20,14 @@ depends="
 	postmarketos-mvcfg
 	u-boot-tools
 	wl1251-cal
-	wl1251-cal-openrc
 "
-makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
+makedepends="
+	devicepkg-dev
+	u-boot-tools
+	kbd
+	kbd-bkeymaps
+	postmarketos-mvcfg
+"
 install="$pkgname.post-install $pkgname.pre-upgrade"
 subpackages="
 	$pkgname-x11
@@ -47,6 +52,7 @@ 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
@@ -62,7 +68,6 @@ source="
 	modem-opts.conf
 	modules.blocklist
 	pointercal
-	proxishot.sh
 	uboot-script.cmd
 	udev/10-nokia-modem.rules
 	udev/15-bq27k.rules
@@ -149,7 +154,7 @@ package() {
 
 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
-	depends="xset xinput scrot xrdb"
+	depends="unclutter-xfixes scrot xdotool xinput xrdb xset"
 	mkdir "$pkgdir"/etc/acpi
 	install -D -m755 "$srcdir"/acpi_handler.sh \
 		"$pkgdir"/etc/acpi/handler.sh
@@ -161,8 +166,6 @@ 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
 }
@@ -176,7 +179,7 @@ xkeyboard_config() {
 
 i3wm() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
-	depends="unclutter-xfixes i3blocks rxvt-unicode upower brightnessctl"
+	depends="brightnessctl i3blocks rxvt-unicode sxmo-dmenu upower"
 	install -D -m644 "$srcdir"/i3wm.conf \
 		"$subpkgdir"/etc/xdg/i3/config
 	install -D -m644 "$srcdir"/i3blocks.conf \
@@ -191,6 +194,8 @@ 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() {
@@ -203,6 +208,7 @@ upower() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install"
+	depends="wl1251-cal-openrc"
 
 	mkdir -p "$subpkgdir"
 }
@@ -211,7 +217,7 @@ sha512sums="
 6b475c12eca8563be48c562a1cb4ad8ca6a05d70fc54b21288b2dd7435a80a6f53351aa870db96d5bbecf1b1c5cb00dfe35f5066e6d3fd0ad0369e66aeef5a21  10-initfs-keymap.files
 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh
 2e6c324c2a0627fb37ee2feff249d6c828116a9c1a32d572481dddc12648c98b726eb3a475838398742f76a60e3f2249d7707502360473b8bf2e794bf22f57ce  acpi.map
-ff51909873160c2d4c6f0c0119b6d4a02751df29f571b8596b4bc8b04ce2541913c11a583b0e5dabd43f240752a8131da45db0ddff194860f4c11198599686a1  acpi_handler.sh
+b2c2033f8a77a18dc0c5192e0304f60e3c2a2a7d132c2072ab0dd6ee1a5b2a8c7e6396165411534468311a254663ae887cbaf23816f8b17893dd28e99e549790  acpi_handler.sh
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
@@ -222,7 +228,8 @@ e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b11
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
 d7d1599a9952fd02d3cfbeaa6b3307251e765f98a9eb723237c94f585831cc8f11d9d30dbc0352e3b008224dec12b820cf86fa28a5e5ac303cfd03d80b8872f5  config-checker
 a8152e94262629e11abdd8809d187c3b7ed1866a6128fb1f435e17e72120536ac8114262e66df6decb2627743027f2b923ddbe8a94e3e844099b6fad02ec252b  i3blocks.conf
-26261d6291c4cc476a36a11291a3676413ecc4fc6ee76394fead14e0c8955d28e782d4a26180034637fcf176c41f8a345886daf242eebf7e91dfd6a4bd29edbe  i3wm.conf
+c95afd02124e53f0de1ef33e7bbee12a15ae2d4d629a201157ed9d428288365241dfc3358fc7055154845f9df986fd975a2ebd4de384b8e175cb45f26b2fa38d  i3wm.conf
+63ec5a88f4385fd944477d0b7ca7061745b061337cba8d3c779826aa96a94dda79bfca4fb3456234f6adbdb483e660d3cf6ccefd8576d23a70f52e3f44f0edb4  pwr-key-handler.sh
 6c6a70667f37807089adbb343c09d1f62d47b8e6c9c0a54f44790b822f8bff3dccae73341ef736b799fd6740bbd6e1f48e6e122c2e08520f71f6ad7434a47d2c  battery-bq27200
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar
 82038d38f94cb975a8d38914afca49b64957446bef7490ab684efa1df47ede2ea1c769045789bb9fded673345eea01911fbbf85fdb54c28685cad8022bfaafac  ofono
@@ -238,7 +245,6 @@ 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)
-		USER_USER="$user" /usr/bin/proxishot.sh
+		echo "Not implemented yet"
 		;;
 	CAM_BTN_UP)
 		echo "Not implemented yet"
@@ -37,7 +37,7 @@ case $cmd in
 		echo "Not implemented yet"
 		;;
 	SCRNLCK_DWN)
-		su $user -c "DISPLAY=:0 /usr/bin/lock.sh"
+		echo "Not implemented yet"
 		;;
 	SCRNLCK_UP)
 		echo "Not implemented yet"

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

@@ -60,12 +60,17 @@ 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 i3-nagbar \
-        -m 'Choose Power Button Action:' \
-        -B 'Reboot' 'loginctl reboot' \
-        -B 'Suspend' 'loginctl suspend' \
-        -B 'Shutdown' 'loginctl poweroff'
+bindsym XF86PowerOff exec --no-startup-id pwr-key-handler
 
 bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set PCM 5%+
 bindsym XF86AudioLowerVolume exec --no-startup-id amixer set PCM 5%-
@@ -95,7 +100,5 @@ 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

@@ -0,0 +1,32 @@
+#!/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

@@ -1,12 +0,0 @@
-#!/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=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -32,6 +32,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-bf14f975ee01f8dbc9109444ab408ac0948ae67af267d8f4101f2ca688750761277e793b2800985277d0e91205c13e89bd66e37bfebe3608ea7d29ecdb20c907  deviceinfo
+4d39e938092318cfc6a6b102e15bfabfec215669c73a6334019e158062760e50ce5957297cdbe309d78b770c26128385bec779d92606b4204e39f305dea70183  deviceinfo
 9f6c3cc0079e718ef0dfc221fadaf9bc092a8601b62794c2298eab893924af457612bd8a6e852fb2b181bee637e774dd2abea681eb72b1aa9c6672e686454795  modules-initfs
 "

device/community/device-odroid-xu4/deviceinfo

@@ -27,3 +27,7 @@ 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,13 +3,14 @@
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
 pkgver=8
-pkgrel=1
+pkgrel=3
 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
@@ -23,24 +24,23 @@ 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
 	"
-# FIXME: use upstream alsa-ucm-conf instead, once it works the same (pma#2115)
-replaces="alsa-ucm-conf"
-makedepends="devicepkg-dev dtc"
+makedepends="
+	devicepkg-dev
+	dtc
+	u-boot-tools
+"
 install="$pkgname.pre-upgrade"
 source="
 	00_alsa_pinephone_dshare.conf
@@ -135,16 +135,6 @@ 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
@@ -239,6 +229,28 @@ 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=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -123,6 +123,7 @@ 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=5
-pkgrel=1
-_confver=65
+pkgver=6
+pkgrel=0
+_confver=68
 _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"
+makedepends="devicepkg-dev u-boot-tools"
 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/simple-card/Librem\ 5.conf \
+	install -Dm644 "$builddir"/default/audio/ucm2/conf.d/simple-card/Librem\ 5.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/NXP/iMX8/Librem_5/Librem\ 5.conf
-	install -Dm644 "$builddir"/default/audio/ucm2/simple-card/HiFi.conf \
+	install -Dm644 "$builddir"/default/audio/ucm2/conf.d/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="
-4ce01a78016475873535927330a26143170153968cb22214ca606929ffc73ff2df2fcdd044c44d1cd9c514e989c267b5267402f0c047a240d01192d9b29ed57b  librem5-base-pureos-65pureos1.tar.gz
+e02c1a39626311ae553f83c75cb6ef44647a40b4419eefec9e5df4f24aaa91b65b3029b919a5ad8cf5b12bf77414eb7b524e470b90220ff97c8730ea37ad7f86  librem5-base-pureos-68pureos1.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 <trabarni@gmail.com>
+# 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>
@@ -7,7 +7,7 @@
 pkgname=device-qcom-msm8953
 pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
 pkgver=5
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"

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

@@ -0,0 +1 @@
+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/APKBUILD

@@ -1,29 +1,39 @@
-# Maintainer: Danila Tikhonov <danila@jiaxyga.com>
-# Co-Maintainer: Jens Reidel <adrian@travitia.xyz>
+# Maintainer: Jens Reidel <adrian@travitia.xyz>
+# Co-Maintainer: Danila Tikhonov <danila@jiaxyga.com>
+# Co-Maintainer: David Wronek <david@mainlining.org>
+# Co-Maintainer: Arian Kulmer <arian.kulmer@web.de>
+# Reference: <https://postmarketos.org/devicepkg>
 
-pkgname=soc-qcom-sm7150
-pkgdesc="Common package for Qualcomm SM7150 devices"
-pkgver=3
+pkgname=device-qcom-sm7150
+pkgdesc="Generic device package for Qualcomm SM7150 devices"
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
-license="BSD-3-Clause"
+license="MIT"
 arch="aarch64"
-options="!check !strip !archcheck !tracedeps"
+options="!check !archcheck"
 depends="
 	alsa-ucm-conf-qcom-sm7150
 	bootmac
-	hexagonrpcd>=0.3.2-r3
+	hexagonfs-firmware-loader
+	hexagonrpcd
 	linux-firmware-ath10k
 	linux-firmware-qca
 	linux-firmware-qcom
+	linux-postmarketos-qcom-sm7150
+	make-dynpart-mappings
+	msm-firmware-loader
 	msm-modem
 	msm-modem-uim-selection
+	postmarketos-base
+	qbootctl
 	swclock-offset
+	systemd-boot
 	tqftpserv
 	unl0kr-fbforcerefresh
 "
+makedepends="devicepkg-dev"
 subpackages="
-	$pkgname-libssc-180-degrees:libssc_180_degrees
 	$pkgname-openrc
 "
 
@@ -31,23 +41,33 @@ source="
 	30-initramfs-firmware.files
 	81-libssc-180-degrees.rules
 	90-feedbackd-aw8695.rules
+	90-feedbackd-drv260x.rules
 	90-feedbackd-pm6150.rules
+	deviceinfo
+	initfs-hook.sh
 "
 
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
 package() {
+	devicepkg_package $startdir $pkgname
+
 	install -Dm644 "$srcdir"/30-initramfs-firmware.files -t \
 		"$pkgdir"/usr/share/mkinitfs/files
 
 	install -Dm644 "$srcdir"/90-feedbackd-aw8695.rules -t \
 		"$pkgdir"/usr/lib/udev/rules.d
 
+	install -Dm644 "$srcdir"/90-feedbackd-drv260x.rules -t \
+		"$pkgdir"/usr/lib/udev/rules.d
+
 	install -Dm644 "$srcdir"/90-feedbackd-pm6150.rules -t \
 		"$pkgdir"/usr/lib/udev/rules.d
-}
 
-libssc_180_degrees() {
 	install -Dm644 "$srcdir"/81-libssc-180-degrees.rules -t \
-		"$subpkgdir"/usr/lib/udev/rules.d
+		"$pkgdir"/usr/lib/udev/rules.d
 }
 
 openrc() {
@@ -55,6 +75,7 @@ openrc() {
 	install="$subpkgname.post-install"
 	depends="
 		hexagonrpcd-openrc
+		qbootctl-openrc
 		tqftpserv-openrc
 		"
 
@@ -65,5 +86,8 @@ sha512sums="
 73438ceec8ca76dec24a92718d456d17b01a23510ee0b0e6c1263e3f6c2ca82263a3e41298c0a8ebf3dd8439da354fc1c914fd475ad1cf5c669c200770df62fa  30-initramfs-firmware.files
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-180-degrees.rules
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
+66ce9f37c0f1c9fabadec4fd4fe4d03a5a54df183a430a1cdaff24d6b22ce29be444ae07cfd17432f81f566b320567732a4b38715226fc349b4df2ceb8bca629  90-feedbackd-drv260x.rules
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm6150.rules
+f38e438c79dadda0eef3abe5c55ad69f8947bf39e5c57e03b7cba7a60b09091e326c525e2451de446ab6de9e92a6d4e39da32ef854cc285bde2e7d56f7b7d10d  deviceinfo
+8cfd961424d97242f8be42750377315825039891362bf5fbead7de9cbaaf50be34fd35e9c3ac2f981c7c3138243544f162182020b8a5a56779474476d84a7775  initfs-hook.sh
 "

device/community/device-qcom-sm7150/device-qcom-sm7150-openrc.post-install

@@ -1,3 +1,4 @@
 #!/bin/sh
 rc-update add hexagonrpcd-adsp-sensorspd
+rc-update add qbootctl
 rc-update add tqftpserv boot

device/community/device-qcom-sm7150/deviceinfo

@@ -0,0 +1,29 @@
+# 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

@@ -0,0 +1,61 @@
+#!/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 Min <alexey.min@gmail.com>
+# Co-Maintainer: Alexey Minnekhanov <alexeymin@postmarketos.org>
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
 pkgver=12

device/community/device-samsung-coreprimevelte/APKBUILD

@@ -1,7 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Duje Mihanović <duje.mihanovic@skole.hr>
 pkgname=device-samsung-coreprimevelte
 pkgdesc="Samsung Galaxy Core Prime VE LTE"
-pkgver=4
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -39,8 +40,8 @@ package() {
 }
 
 sha512sums="
-2f19e7b805af1f58b7689f45990bf8cb97e902eec373e9420487ca9608cfd650eb37011d58597c8b8255bc6bc50b763711c57a5c711ead06b213c1df658d4b9a  boot-image.its
+0af03f675df700458aad25450f8994d1b28ffe02c49ccfac7ab6f05c4c58402a8e8e7b4173f625ebc5ca415d07ee8a85de36ff965c12979ce4591f3e2f95799a  boot-image.its
 82960dd68320abf6f24bd6e6a4629669617173be417d7ae1a1580f7c1239992a61829ed479e3e7cf2acc8e47cb3916afa2727694ac56f97cc82394b75bcc5713  deviceinfo
-25f0ce5118e51dc87c9a38f23eb25106619310ca4be969dca62992840fde5b1a7b65c2be617abe3821cc78c68eca9fbc39c2f580c0767aaa44bd7052f629ddbf  modules-initfs
+b1617e4b116d60abb15003c5bf7d4e8fa13e57a4a12feadd1e128946238b0922e98810289690f0466fec39f54adcc9ef08346acdef0f5a0fbb62c68438c3a063  modules-initfs
 d51facbaa99f69964786e770dc8ed500bfb2609353a25aa344701c851131cc421ef3a2663fe4422a21a5f38e01f0c34235fa4fad75739fb614109a2fb268db8a  90-mlan-to-wlan.rules
 "

device/community/device-samsung-coreprimevelte/boot-image.its

@@ -18,7 +18,7 @@
 
 		fdt {
 			description = "Device tree";
-			data = /incbin/("/usr/share/dtb/marvell/pxa1908-samsung-coreprimevelte.dtb");
+			data = /incbin/("/boot/dtbs/marvell/pxa1908-samsung-coreprimevelte.dtb");
 			type = "flat_dt";
 			compression = "none";
 		};

device/community/device-samsung-coreprimevelte/modules-initfs

@@ -1,2 +1,3 @@
 imagis
 88pm886_regulator
+ci_hdrc_usb2

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

device/community/device-xiaomi-davinci/APKBUILD

@@ -1,44 +0,0 @@
-# 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

@@ -1,38 +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="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

@@ -1,2 +0,0 @@
-# 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

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

device/community/device-xiaomi-surya/APKBUILD

@@ -1,59 +0,0 @@
-# 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/hexagonrpcd.confd

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

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

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

device/community/firmware-lenovo-a6000/APKBUILD

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

device/community/firmware-qcom-msm8953/APKBUILD

@@ -1,4 +1,7 @@
 # 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,6 +1,9 @@
+# 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=1
+pkgrel=2
 _name="Samsung Galaxy A3 (2015)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"

device/community/firmware-samsung-a5/APKBUILD

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

device/community/firmware-samsung-e7/APKBUILD

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

device/community/firmware-samsung-grandmax/APKBUILD

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