.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/autoupdate.sh

@@ -10,8 +10,9 @@ fi
 
 git config --global --add safe.directory "$CI_PROJECT_DIR"
 git config --global user.name "postmarketOS CI"
-# pmaports
-git config --global user.email "project_226_bot_a365eaa0c380d1bee0af03adf42ebea3@noreply.gitlab.postmarketos.org"
+# The username for the bot associated with the access token
+# e.g. project_226_bot_bfa19b84bf7f559c8ff7438a01fd29b9
+git config --global user.email "$PMAPORTS_TOKEN_BOT@noreply.gitlab.postmarketos.org"
 
 # Configure SSH key for signing
 mkdir -p ~/.ssh
@@ -42,7 +43,7 @@ update_linux_next() {
 	# shellcheck source=/dev/null
 	pkgver=$(. device/testing/linux-next/APKBUILD; echo "$pkgver")
 
-	curl -s "https://gitlab.com/linux-kernel/linux-next/-/tags?format=atom" | grep -oP "(?<=<title>)[^<]+" | tail -n +2 > /tmp/tags
+	curl -s https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/refs/tags/ | grep -oE "<a href='.*'>(.*)</a>.*\.tar\.gz</a>" | awk -F'[<>]' '{print $3}' > /tmp/tags
 
 	latest=$(grep -v "v" < /tmp/tags | head -n1)
 	if [ -z "$latest" ]; then
@@ -70,6 +71,7 @@ update_linux_next() {
 
 	echo "Updating linux-next from $pkgver to $new_pkgver..."
 	sed -i -e "s/pkgver=$pkgver/pkgver=$new_pkgver/" device/testing/linux-next/APKBUILD
+	sed -i -e "s/^pkgrel=.*/pkgrel=0/" device/testing/linux-next/APKBUILD
 
 	# Update the checksums
 	pmbootstrap checksum linux-next

.ci/codeowners.sh

-#!/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

@@ -110,14 +110,32 @@ if __name__ == "__main__":
     # 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"])
+
+        # filter out packages that can't be built for arch
+        # (Iterate over copy of `systemd_pkgs`, because we modify it in this loop)
+        for package in systemd_pkgs.copy():
+            apkbuild_path = pmb.helpers.pmaports.find(package, True, True, with_extra_repos="enabled")
+            apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
+            if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
+                print(f"(extra-repos/systemd) {package}: not enabled for {arch}, skipping")
+                systemd_pkgs.remove(package)
+
+        # No packages: skip build
+        if len(systemd_pkgs) == 0:
+            print(f"no packages changed, which can be built for {arch}")
 
-        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)
+            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,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/testlib.sh

+#!/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/shellcheck.sh

@@ -15,18 +15,15 @@ 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
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
-	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
-	./main/msm-firmware-loader/*.post-install
-	./device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.sh
+	./device/community/soc-qcom/call_audio_idle_suspend_workaround.sh
 
 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')
@@ -41,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

@@ -14,9 +14,6 @@ import pmb.parse._apkbuild
 from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob, pkgrepo_relative_path
 from pmb.core.arch import Arch
 
-# Cache for codeowners_parse
-codeowners_parsed = {}
-
 # Don't complain if these nicknames are the only maintainers of an APKBUILD,
 # because they are actually a group of people
 gitlab_groups = [
@@ -47,8 +44,7 @@ def test_aports_device():
             if "postmarketos-base" == dependency or "postmarketos-base>" in dependency:
                 depend_flag = True
         if not depend_flag:
-            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
-                               path)
+            raise RuntimeError(f"Missing 'postmarketos-base' in depends of {path}")
 
         # Depends: Must not have specific packages
         for depend in apkbuild["depends"]:
@@ -61,7 +57,7 @@ def test_aports_device():
             raise RuntimeError("wrong architecture, please change to arch=\""
                                f"{deviceinfo.arch}\": {path}")
         if "!archcheck" not in apkbuild["options"]:
-            raise RuntimeError("!archcheck missing in options= line: " + path)
+            raise RuntimeError(f"!archcheck missing in options= line: {path}")
 
 
 def test_aports_device_kernel():
@@ -103,72 +99,12 @@ def test_aports_device_kernel():
                                f" <https://postmarketos.org/devicepkg>): {path}")
 
 
-def codeowners_parse():
-    global codeowners_parsed
-
-    pattern_prev = None
-    aports = pkgrepo_default_path()
-
-    with open(aports / "CODEOWNERS") as h:
-        for line in h:
-            line = line.rstrip()
-            if not line or line.startswith("#"):
-                continue
-
-            pattern_nicks = line.split()
-            assert len(pattern_nicks) > 1, f"CODEOWNERS line without nicks: {line}"
-
-            pattern = pattern_nicks[0]
-            if pattern.endswith("/"):
-                pattern += "*"
-
-            nicks = []
-            for word in pattern_nicks[1:]:
-                if word.startswith("@"):
-                    nicks += [word]
-            codeowners_parsed[pattern] = nicks
-
-            if pattern_prev:
-                assert pattern_prev <= pattern, "CODEOWNERS: please order entries alphabetically"
-            pattern_prev = pattern
-
-
-def require_enough_codeowners_entries(path, maintainers):
-    """
-    :param path: full path to an APKBUILD (e.g. /home/user/…/APKBUILD)
-    :param maintainers: list of one or more maintainers
-    """
-
-    _, path = pkgrepo_relative_path(path)
-
-    nicks = set()
-    for pattern, pattern_nicks in codeowners_parsed.items():
-        if fnmatch.fnmatch(path, pattern):
-            for nick in pattern_nicks:
-                nicks.add(nick)
-
-    print(f"{path}:")
-    print(f"  APKBUILD: {maintainers}")
-    print(f"  CODEOWNERS: {nicks}")
-
-    if len(nicks) < len(maintainers):
-        for nick in nicks:
-            if nick in gitlab_groups:
-                print(f"  -> {nick} is a group")
-                return
-
-    assert len(nicks) >= len(maintainers), \
-        f"{path}: make sure that each maintainer is listed in CODEOWNERS!"
-
-
 # @pytest.mark.xfail # Not all aports have been updated yet
 def test_aports_maintained():
     """
     Ensure that aports in /device/{main,community} have "Maintainer:" and
-    "Co-Maintainer:" (only required for main) listed in their APKBUILDs. Also
-    check that at least as many are listed in CODEOWNERS.
+    "Co-Maintainer:" (only required for main) listed in their APKBUILDs.
     """
-    codeowners_parse()
 
     for path in pkgrepo_iglob("device/main/*/APKBUILD"):
         if 'firmware-' in path.parent.name:
@@ -176,14 +112,12 @@ def test_aports_maintained():
         maintainers = pmb.parse._apkbuild.maintainers(path)
         assert maintainers and len(maintainers) >= 2, \
             f"{path} in main needs at least 1 Maintainer and 1 Co-Maintainer"
-        require_enough_codeowners_entries(path, maintainers)
 
     for path in pkgrepo_iglob("device/community/*/APKBUILD"):
         if 'firmware-' in path.parent.name:
             continue
         maintainers = pmb.parse._apkbuild.maintainers(path)
         assert maintainers, f"{path} in community needs at least 1 Maintainer"
-        require_enough_codeowners_entries(path, maintainers)
 
 
 def test_aports_unmaintained():

.ci/testcases/test_deviceinfo.py

@@ -36,7 +36,7 @@ def test_deviceinfo():
     # Iterate over all devices
     last_exception = None
     count = 0
-    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"$")
+    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"(\\s*# .*)?$")
 
     for folder in pkgrepo_iglob("device/*/device-*"):
         device = folder.name.split("-", 1)[1]
@@ -63,8 +63,8 @@ def test_deviceinfo():
                 # Check line against regex (can't use multiple lines etc.)
                 if not pattern.match(line) or line.endswith("\\\""):
                     raise RuntimeError("Line looks invalid, maybe missing"
-                                       " quotes/multi-line string/comment next"
-                                       f" to line instead of above? {line}")
+                                       " quotes/multi-line string/malformed"
+                                       f" inline comment? {line}")
 
             # Successful deviceinfo parsing / obsolete options
             info = pmb.parse.deviceinfo(device)

.ci/testcases/test_directory_structure.py

@@ -10,6 +10,7 @@ expected_directories = [
     "device/community",
     "device/main",
     "device/testing",
+    "extra-repos/systemd",
     "main",
     "modem",
     "non-free",

.ci/testcases/test_firmware.py

@@ -25,6 +25,7 @@ def test_aports_firmware():
         "firmware-samsung-maguro",  # Depends on firmware-aosp-broadcom-wlan
         "firmware-xiaomi-ferrari",  # Depends on soc-qcom-msm8916
         "firmware-xiaomi-willow",  # Doesn't build, source link is dead (pma#1212)
+        "firmware-samsung-i9105p", # Depends on firmware-aosp-broadcom-wlan
     ]
 
     for path in pkgrepo_iglob("**/firmware-*/APKBUILD", recursive=True):

.ci/testcases/test_kernel.py

@@ -23,6 +23,9 @@ def test_aports_kernel():
         apkbuild = pmb.parse.apkbuild(path)
         aport_name = os.path.basename(os.path.dirname(path))
 
+        if aport_name == "linux-pam":
+            continue  # This package isn't a linux kernel!
+
         if "pmb:cross-native" not in apkbuild["options"]:
             raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
                                " options= line")

.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

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

.editorconfig

@@ -12,3 +12,8 @@ indent_style = tab
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+# Forked from Alpine
+[extra-repos/systemd/networkmanager/networkmanager.rules]
+indent_style = space
+indent_size = 4

.githooks/pre-commit

@@ -65,7 +65,7 @@ is_symlink() {
 # available in git tree and checksums are correct.
 check_local_sources() {
 	local apkbuild="$1"
-	local startdir="${apkbuild%/*}"
+	local startdir="$2"
 	local status=0
 	local checksum_act checksum_exp content filename line sources
 
@@ -109,11 +109,21 @@ check_file_size() {
 	fi
 }
 
+cleanup() {
+  [ -f "$_staged" ] && rm "$_staged"
+}
+
+trap cleanup EXIT
 
 for apkbuild in $(changed_files '**/APKBUILD'); do
-	check_local_sources "$apkbuild"
+	_staged="$(mktemp)"
+	git show ":$apkbuild" >"$_staged"
+	check_local_sources "$_staged" "${apkbuild%/*}"
+	cleanup
 done
 
 for path in $(changed_files); do
 	check_file_size "$path"
 done
+
+trap - EXIT

.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

.gitlab-ci.yml

@@ -10,12 +10,13 @@ stages:
   - lint
   - 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,11 +28,15 @@ 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
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: &mr_rule $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
       changes:
         - .ci/**/*
         - .gitlab-ci.yml
@@ -44,7 +49,7 @@ wiki:
 ruff:
   stage: lint
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
       changes:
         - .ci/*
         - .ci/*/*
@@ -58,18 +63,17 @@ shellcheck-grep:
   stage: lint
   image: alpine:edge
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/shellcheck.sh
     - .ci/grep.sh
-    - .ci/codeowners.sh
 
 editor-config:
   stage: lint
   image: alpine:edge
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/ec.sh
@@ -78,7 +82,7 @@ editor-config:
 pytest-commits:
   stage: lint
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/pytest.sh
@@ -95,7 +99,7 @@ pytest-commits:
 aport-lint:
   stage: lint
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/apkbuild-lint.sh
@@ -105,11 +109,13 @@ aport-lint:
 kernel-kconfig:
   stage: lint
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
       changes:
         - kconfigcheck.toml
+      allow_failure: true
+    - if: *mr_rule
+      changes:
         - device/*/linux-*/config-*
-        - main/linux-*/config-*
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/kconfig.sh
@@ -131,7 +137,7 @@ mr-settings:
 .build:
   stage: build
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: *mr_rule
   before_script:
     - *global_before_scripts
     - .ci/lib/gitlab_prepare_ci.sh
@@ -155,21 +161,25 @@ build-x86:
 
 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
 
@@ -191,3 +201,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

@@ -27,17 +27,22 @@
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
 * [ ] edge (`master` branch)
-* [ ] `v24.06`
+* [ ] `v24.12`
+* [ ] `v24.06` (supported until 2025-01-23)
 
 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
 
 ### On what environment did you encounter the issue?
 #### Environments
+* [ ] COSMIC
 * [ ] GNOME Shell on Mobile
 * [ ] Phosh
 * [ ] Plasma Mobile
 * [ ] Sxmo (Wayland/Sway) **Please post the output of `sxmo_version.sh`**
 * [ ] Other: **Please fill out**
+### Which init system are you using?
+* [ ] OpenRC
+* [ ] systemd
 ### How did you get postmarketOS image?
 * [ ] from https://images.postmarketos.org
 * [ ] I built it using pmbootstrap

.mrhlpr.json

-{
-    "subject_format": {
-        "pass": [
-            "^(([a-z]+\\/[a-z\\-0-9*{}]+),?)+: [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+\\)|)$"
-        ],
-        "unknown": [
-            "^[a-z-0-9_.*{}\\/]+: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
-        ]
-    }
-}
-