postmarketos-base-ui: enable NetworkManager USB tethering

Configure NetworkManager to manage our USB gadget as an Ethernet device
to allow USB tethering through NetworkManager. Only tested with
nmcli since UIs such as GNOME Control Center do not properly resize yet.

This commit adds the following:

1. Add a NetworkManager configuration to manage usb0 because
   NetworkManager marks USB gadgets by default unmanaged through one of
   its provided udev rules in /lib/udev/rules/85-nm-unmanaged.rules
2. Forbid NetworkManager to create connection profiles for usb0 on boot
   since we provide our own profile. If we do not set this option, we
   get 2 profiles on boot for the same usb0 interface with the same name
   but different UUID.
3. Enable dnsmasq as a service to provide DNS lookups to connected
   devices over USB tethering. Normally, NetworkManager does that
   automatically, but it cannot start dnsmasq as it enables DHCP in
   dnsmasq as well which conflicts with unudphcd. Therefore, add
   dnsmasq as a service in DNS-only mode (its default).

This only takes effect when the UI depends on NetworkManager.

.ci/apkbuild-lint.sh

@@ -1,22 +0,0 @@
-#!/bin/sh -e
-# Description: run apkbuild-lint on modified APKBUILDs
-# Options: native
-# Use 'native' because it requires git commit history.
-# 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
-
-# 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/apkbuild-linting.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import common
+import os.path
+import sys
+
+if __name__ == "__main__":
+    common.add_upstream_git_remote()
+    apkbuilds = {file for file in common.get_changed_files(removed=False)
+                 if os.path.basename(file) == "APKBUILD"}
+    if len(apkbuilds) < 1:
+        print("No APKBUILDs to lint")
+        sys.exit(0)
+
+    packages = []
+    for apkbuild in apkbuilds:
+        if apkbuild.startswith("temp/") or apkbuild.startswith("cross/"):
+            print(f"NOTE: Skipping linting of {apkbuild}")
+            continue
+        packages.append(os.path.basename(os.path.dirname(apkbuild)))
+    if len(packages) < 1:
+        print("No APKBUILDs to lint")
+        sys.exit(0)
+
+    result = common.run_pmbootstrap(["-q", "lint"] + packages, output_return=True)
+
+    if len(result) > 0:
+        print("Linting issues found:")
+        print(result)
+        sys.exit(1)

.ci/autoupdate.sh

@@ -1,106 +0,0 @@
-#!/bin/sh -e
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk add git openssh-keygen grep curl
-	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
-
-git config --global --add safe.directory "$CI_PROJECT_DIR"
-git config --global user.name "postmarketOS CI"
-# 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
-cp "$PMAPORTS_SSH_KEY" ~/.ssh/pmaports
-chmod 600 ~/.ssh/pmaports
-# Generate public key from private
-ssh-keygen -t ecdsa -f ~/.ssh/pmaports -y > ~/.ssh/pmaports.pub
-
-git config --global gpg.format ssh
-git config --global user.signingkey ~/.ssh/pmaports.pub
-
-export PYTHONUNBUFFERED=1
-
-PKGS="$1"
-if [ -z "$PKGS" ]; then
-	echo "Usage: $0 <packages>"
-	exit 1
-fi
-echo "Checking for new versions of packages: $PKGS"
-
-update_linux_next() {
-	# Check for the latest -next tag
-	local latest
-	local pkgver
-	local new_pkgver
-
-	# Get the current version
-	# shellcheck source=/dev/null
-	pkgver=$(. device/testing/linux-next/APKBUILD; echo "$pkgver")
-
-	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
-		echo "Failed to get the latest -next tag"
-		exit 1
-	fi
-	echo "Latest -next tag: $latest"
-
-	new_pkgver=$(grep "v" < /tmp/tags | head -n1)
-	if [ -z "$new_pkgver" ]; then
-		echo "Failed to get the latest mainline tag from atom feed, reusing current pkgver"
-		new_pkgver="${pkgver%_git*}"
-	else
-		echo "Latest mainline tag: $new_pkgver"
-		# new_pkgver is like 'v6.9-rc1' but we want '6.9'
-		new_pkgver=$(echo "$new_pkgver" | sed -e 's/^v//' -e 's/-.*//')
-	fi
-
-	new_pkgver="${new_pkgver}_git${latest#*-}"
-
-	if [ "$pkgver" = "$new_pkgver" ]; then
-		echo "No new version of linux-next"
-		exit 0
-	fi
-
-	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
-
-	# Ensure it builds
-	pmbootstrap --details-to-stdout build linux-next
-
-	# Commit
-	git add device/testing/linux-next/APKBUILD
-	git commit -S -m "linux-next: upgrade to $latest"
-}
-
-# For testing
-#git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports-autoupdate-test.git
-
-git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports.git
-git fetch gitlab
-git checkout --track gitlab/master
-
-for pkg in $PKGS; do
-	case "$pkg" in
-		linux-next)
-			update_linux_next
-			;;
-		*)
-			echo "Unknown package: $pkg"
-			exit 1
-			;;
-	esac
-done
-
-git push

.ci/build-aarch64.sh

@@ -1 +0,0 @@
-lib/build_changed_aports.sh

.ci/build-armhf.sh

@@ -1 +0,0 @@
-lib/build_changed_aports.sh

.ci/build-armv7.sh

@@ -1 +0,0 @@
-lib/build_changed_aports.sh

.ci/build-riscv64.sh

@@ -1 +0,0 @@
-lib/build_changed_aports.sh

.ci/build-x86.sh

@@ -1 +0,0 @@
-lib/build_changed_aports.sh

.ci/build-x86_64.sh

@@ -1 +0,0 @@
-lib/build_changed_aports.sh

.ci/build.sh

@@ -0,0 +1,8 @@
+#!/bin/sh -e
+# Convenience wrapper for short arch-specific build jobs in .gitlab-ci.yml
+
+export PYTHONUNBUFFERED=1
+JOB_ARCH="${CI_JOB_NAME#build-}"
+
+set -x
+su pmos -c ".ci/build_changed_aports.py $JOB_ARCH"

.ci/build_changed_aports.py

@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+# Copyright 2021 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+import sys
+
+# Same dir
+import common
+
+# pmbootstrap
+import testcases.add_pmbootstrap_to_import_path
+import pmb.parse
+import pmb.parse._apkbuild
+import pmb.helpers.pmaports
+
+
+def build_strict(packages, arch):
+    common.run_pmbootstrap(["build_init"])
+    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
+                            "--strict", "--force",
+                            "--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:
+        print("usage: build_changed_aports.py ARCH")
+        sys.exit(1)
+    arch = sys.argv[1]
+
+    # Get and print modified packages
+    common.add_upstream_git_remote()
+    packages = common.get_changed_packages()
+
+    # Package count sanity check
+    common.get_changed_packages_sanity_check(len(packages))
+
+    # [ci:skip-build]: verify checksums and stop
+    verify_only = common.commit_message_has_string("[ci:skip-build]")
+    if verify_only:
+        print("WARNING: not building changed packages ([ci:skip-build])!")
+        print("verifying checksums: " + ", ".join(packages))
+        verify_checksums(packages, arch)
+        sys.exit(0)
+
+    # Prepare "args" to use pmbootstrap code
+    sys.argv = ["pmbootstrap", "chroot"]
+    args = pmb.parse.arguments()
+
+    # Filter out packages that can't be built for given arch
+    # (Iterate over copy of packages, because we modify it in this loop)
+    for package in packages.copy():
+        apkbuild_path = pmb.helpers.pmaports.find(args, package)
+        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")
+
+        if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
+            print(f"{package}: not enabled for {arch}, skipping")
+            packages.remove(package)
+
+    # No packages: skip build
+    if len(packages) == 0:
+        print(f"no packages changed, which can be built for {arch}")
+        sys.exit(0)
+
+    # Build packages
+    print(f"building in strict mode for {arch}: {', '.join(packages)}")
+    build_strict(packages, arch)

.ci/check_changed_aports_versions.py

@@ -0,0 +1,156 @@
+#!/usr/bin/env python3
+# Copyright 2021 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import glob
+import tempfile
+import sys
+import subprocess
+
+# Same dir
+import common
+
+# pmbootstrap
+import testcases.add_pmbootstrap_to_import_path  # noqa
+import pmb.parse
+import pmb.parse.version
+import pmb.helpers.logging
+
+
+def get_package_version(args, package, revision, check=True):
+    # Redirect stderr to /dev/null, so git doesn't complain about files not
+    # existing in upstream branch for new packages
+    stderr = None
+    if not check:
+        stderr = subprocess.DEVNULL
+
+    # Run something like "git show upstream/master:main/hello-world/APKBUILD"
+    pmaports_dir = common.get_pmaports_dir()
+    pattern = pmaports_dir + "/**/" + package + "/APKBUILD"
+    path = glob.glob(pattern, recursive=True)[0][len(pmaports_dir + "/"):]
+    apkbuild_content = common.run_git(["show", revision + ":" + path], check,
+                                      stderr)
+    if not apkbuild_content:
+        return None
+
+    # Save APKBUILD to a temporary path and parse it from there. (Not the best
+    # way to do things, but good enough for this CI script.)
+    with tempfile.TemporaryDirectory() as tempdir:
+        with open(tempdir + "/APKBUILD", "w", encoding="utf-8") as handle:
+            handle.write(apkbuild_content)
+        parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)
+
+    return parsed["pkgver"] + "-r" + parsed["pkgrel"]
+
+
+def version_compare_operator(result):
+    """ :param result: return value from pmb.parse.version.compare() """
+    if result == -1:
+        return "<"
+    elif result == 0:
+        return "=="
+    elif result == 1:
+        return ">"
+
+    raise RuntimeError("Unexpected version_compare_operator input: " + result)
+
+
+def exit_with_error_message():
+    branch = common.get_upstream_branch()
+    print()
+    print("ERROR: Modified package(s) don't have an increased version or a")
+    print("new package has a nonzero pkgrel!")
+    print()
+    print("This can happen if you added a new package with a nonzero")
+    print("pkgrel, or if you did not change the pkgver/pkgrel")
+    print("variables in the APKBUILDs. Or you did change them, but the")
+    print(f"packages have been updated in the official '{branch}' branch, and")
+    print("now your versions are not higher anymore.")
+    print()
+    print("Your options:")
+    print("a) If you made changes to the packages, and did not increase the")
+    print("   pkgrel/pkgver: increase them now, and force push your branch.")
+    print("   => https://postmarketos.org/howto-bump-pkgrel-pkgver")
+    print("b) If you had already increased the package versions, rebase on")
+    print(f"   '{branch}', increase the versions again and then force push:")
+    print("   => https://postmarketos.org/rebase")
+    print("c) If you made a change, that does not require rebuilding the")
+    print("   packages, such as only changing the arch=... line: you can")
+    print("   disable this check by adding '[ci:skip-vercheck]' to the")
+    print("   latest commit message, then force push.")
+    print()
+    print("Thank you and sorry for the inconvenience.")
+    exit(1)
+
+
+def check_versions(args, packages):
+    error = False
+
+    # Get relevant commits: compare HEAD against upstream branch or HEAD~1
+    # (the latter if this CI check is running on upstream branch). Note that
+    # for the common.get_changed_files() code, we don't check against
+    # upstream branch HEAD, but against the latest common ancestor. This is not
+    # desired here, since we already know what packages changed, and really
+    # want to check if the version was increased towards *current* upstream
+    # branch HEAD.
+    commit = f"upstream/{common.get_upstream_branch()}"
+    if common.run_git(["rev-parse", "HEAD"]) == common.run_git(["rev-parse",
+                                                                commit]):
+        print(f"NOTE: {commit} is on same commit as HEAD, comparing"
+              " HEAD against HEAD~1.")
+        commit = "HEAD~1"
+
+    for package in packages:
+        # Get versions, skip new packages
+        head = get_package_version(args, package, "HEAD")
+        upstream = get_package_version(args, package, commit, False)
+        if not upstream:
+            if head.rpartition('r')[2] != "0":
+                print(f"- {package}: {head} (HEAD) (new package) [ERROR]")
+                error = True
+            else:
+                print(f"- {package}: {head} (HEAD) (new package)")
+            continue
+
+        # Compare head and upstream versions
+        result = pmb.parse.version.compare(head, upstream)
+        if result != 1:
+            error = True
+
+        # Print result line ("- hello-world: 1-r2 (HEAD) > 1-r1 (HEAD~1)")
+        formatstr = "- {}: {} (HEAD) {} {} ({})"
+        if result != 1:
+            formatstr += " [ERROR]"
+        operator = version_compare_operator(result)
+        print(formatstr.format(package, head, operator, upstream, commit))
+
+    if error:
+        exit_with_error_message()
+
+
+if __name__ == "__main__":
+    # Get and print modified packages
+    common.add_upstream_git_remote()
+    packages = common.get_changed_packages()
+    print(f"Changed packages: {packages}")
+
+    # Verify modified package count
+    common.get_changed_packages_sanity_check(len(packages))
+    if len(packages) == 0:
+        print("no aports changed in this branch")
+        exit(0)
+
+    # Potentially skip this check
+    if common.commit_message_has_string("[ci:skip-vercheck]"):
+        print("WARNING: not checking for changed package versions"
+              " ([ci:skip-vercheck])!")
+        exit(0)
+
+    # Initialize args (so we can use pmbootstrap's APKBUILD parsing)
+    sys.argv = ["pmbootstrap.py", "chroot"]
+    args = pmb.parse.arguments()
+    pmb.helpers.logging.init(args)
+
+    # Verify package versions
+    print("checking changed package versions...")
+    check_versions(args, packages)

.ci/check_devices_in_wiki.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2023 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import argparse
@@ -13,7 +13,7 @@ def get_devices():
     """:returns: list of all devices"""
     ret = []
     pmaports = (os.path.realpath(os.path.join(os.path.dirname(__file__) +
-                "/../..")))
+                "/..")))
     for path in glob.glob(pmaports + "/device/*/device-*/"):
         device = os.path.dirname(path).split("device-", 1)[1]
 
@@ -106,11 +106,11 @@ def main():
     # Ask to adjust the wiki
     if error:
         print("*** Wiki check failed!")
-        print("Thank you for porting postmarketOS to a new device! \\o/")
+        print("Thank you for porting postmarketOS to a new device! \o/")
         print("")
         print("Now it's time to add some documentation:")
         print("1) Create a device specific wiki page as described here:")
-        print("   https://wiki.postmarketos.org/wiki/Help:Device_Page")
+        print("   <https://wiki.postmarketos.org/wiki/Help:Device_Page>")
         print("2) Set 'booting = yes' in the infobox of your device page.")
         print("3) Run these tests again with an empty commit in your MR:")
         print("   $ git commit --allow-empty -m 'run tests again'")

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

@@ -1,20 +0,0 @@
-#!/bin/sh -e
-# Copyright 2023 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-# Description: check pkgver/pkgrel bumps, amount of changed pkgs etc
-# Options: native
-# Use 'native' because it requires git commit history.
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	# In .gitlab-ci.yml currently .ci/pytest.sh runs before this and
-	# already downloads and runs install_pmbootstrap.sh.
-	if ! [ -e install_pmbootstrap.sh ]; then
-		wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-		sh ./install_pmbootstrap.sh
-	fi
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
-fi
-
-.ci/lib/check_changed_aports_versions.py

.ci/common.py

@@ -17,7 +17,7 @@ def get_pmaports_dir():
     global cache
     if "pmaports_dir" in cache:
         return cache["pmaports_dir"]
-    ret = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/../.."))
+    ret = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
     cache["pmaports_dir"] = ret
     return ret
 
@@ -36,7 +36,7 @@ def run_git(parameters, check=True, stderr=None):
 def add_upstream_git_remote():
     """ Add a remote pointing to postmarketOS/pmaports. """
     run_git(["remote", "add", "upstream",
-             "https://gitlab.postmarketos.org/postmarketOS/pmaports.git"], False)
+             "https://gitlab.com/postmarketOS/pmaports.git"], False)
     run_git(["fetch", "-q", "upstream"])
 
 
@@ -44,10 +44,14 @@ def commit_message_has_string(needle):
     return needle in run_git(["show", "-s", "--format=full", "HEAD"])
 
 
-def run_pmbootstrap(parameters):
+def run_pmbootstrap(parameters, output_return=False):
     """ Run pmbootstrap with the pmaports dir as --aports """
     cmd = ["pmbootstrap", "--aports", get_pmaports_dir()] + parameters
-    subprocess.run(cmd, universal_newlines=True, check=True)
+    stdout = subprocess.PIPE if output_return else None
+    result = subprocess.run(cmd, stdout=stdout, universal_newlines=True)
+    result.check_returncode()
+    if output_return:
+        return result.stdout
 
 
 def get_upstream_branch():
@@ -55,11 +59,6 @@ def get_upstream_branch():
         channels.cfg from master to retrieve the upstream branch.
 
         :returns: branch name, e.g. "v20.05" """
-
-    # Prefer gitlab CI target branch name if it's set (i.e. running in gitlab CI)
-    if target_branch := os.environ.get("CI_MERGE_REQUEST_TARGET_BRANCH_NAME"):
-        return target_branch
-
     global cache
     if "upstream_branch" in cache:
         return cache["upstream_branch"]
@@ -96,7 +95,7 @@ def get_changed_files(removed=True):
     commit_head = run_git(["rev-parse", "HEAD"])[:-1]
     commit_upstream = run_git(["rev-parse", branch_upstream])[:-1]
     print("commit HEAD: " + commit_head)
-    print(f"commit {branch_upstream}: {commit_upstream}")
+    print(f"commit {branch_upstream}: f{commit_upstream}")
 
     # Check if we are HEAD on the upstream branch
     if commit_head == commit_upstream:
@@ -131,28 +130,27 @@ def get_changed_packages_sanity_check(count):
         return
 
     branch = get_upstream_branch()
-    print(f"""
-ERROR: Too many packages have changed!
-
-This is a sanity check, so we don't end up building packages that
-have not been modified. CI won't run for more than three hours
-anyway.
-
-Your options:
-a) If you *did not* modify everything listed above, then rebase
-   your branch on the official postmarketOS/pmaports.git {branch}
-   branch. Feel free to ask in the chat for help if you need any.
-b) If you *did* modify all these packages, and you assume that
-   they will build within one hour: skip this sanity check by
-   adding '[ci:ignore-count]' to the commit message of the last
-   commit in the merge request (then force push).
-c) If you *did* modify all these packages, and you are sure that
-   they won't build in time, please add '[ci:skip-build]' to the
-   commit message (then force push). Make sure that all packages
-   build with 'pmbootstrap build --strict'!
-
-Thank you and sorry for the inconvenience.
-    """)
+    print()
+    print("ERROR: Too many packages have changed!")
+    print()
+    print("This is a sanity check, so we don't end up building packages that")
+    print("have not been modified. CI won't run for more than one hour")
+    print("anyway.")
+    print()
+    print("Your options:")
+    print("a) If you *did not* modify everything listed above, then rebase")
+    print(f"   your branch on the official postmarketOS/pmaports.git {branch}")
+    print("   branch. Feel free to ask in the chat for help if you need any.")
+    print("b) If you *did* modify all these packages, and you assume that")
+    print("   they will build within one hour: skip this sanity check by")
+    print("   adding '[ci:ignore-count]' to the commit message (then force")
+    print("   push).")
+    print("c) If you *did* modify all these packages, and you are sure that")
+    print("   they won't build in time, please add '[ci:skip-build]' to the")
+    print("   commit message (then force push). Make sure that all packages")
+    print("   build with 'pmbootstrap build --strict'!")
+    print()
+    print("Thank you and sorry for the inconvenience.")
 
     sys.exit(1)
 
@@ -192,11 +190,3 @@ def get_changed_packages():
         ret.add(os.path.basename(dirname))
 
     return ret
-
-
-def get_changed_kernels():
-    ret = []
-    for pkgname in get_changed_packages():
-        if pkgname.startswith("linux-"):
-            ret += [pkgname]
-    return ret

.ci/ec.sh

@@ -1,13 +0,0 @@
-#!/bin/sh -e
-# Description: editorconfig-checker: lint for trailing whitespaces etc.
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add \
-		editorconfig-checker
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-set -x
-ec

.ci/grep.sh

@@ -1,97 +0,0 @@
-#!/bin/sh -e
-# Description: check various bad patterns with grep
-# https://postmarketos.org/pmb-ci
-
-exit_code=0
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add grep
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-# Find CHANGEMEs in APKBUILDs
-if grep -qr '(CHANGEME!)' -- *; then
-	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
-	grep --color=always -r '(CHANGEME!)' -- *
-	exit_code=1
-fi
-
-# DTBs installed to /usr/share/db
-# shellcheck disable=SC2016
-if grep -qr 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/; then
-	echo 'ERROR: Please do not install dtbs to /usr/share/dtb!'
-	echo 'ERROR: Unless you have a good reason not to, please put them in /boot/dtbs'
-	echo 'ERROR: Files that need fixing:'
-	# shellcheck disable=SC2016
-	grep --color=always -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/
-	exit_code=1
-fi
-
-
-# Find old mkinitfs paths (pre mkinitfs 2.0)
-if grep -qr '/etc/postmarketos-mkinitfs' -- *; then
-	echo "ERROR: Please replace '/etc/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
-	grep --color=always -r '/etc/postmarketos-mkinitfs' -- *
-	exit_code=1
-fi
-if grep -qr '/usr/share/postmarketos-mkinitfs' -- *; then
-	echo "ERROR: Please replace '/usr/share/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
-	grep --color=always -r '/usr/share/postmarketos-mkinitfs' -- *
-	exit_code=1
-fi
-
-# Direct sourcing of deviceinfo
-if grep --exclude='source_deviceinfo' -qEr 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *; then
-	echo 'ERROR: Please source the source_deviceinfo script instead of sourcing deviceinfo directly!'
-	grep --color=always --exclude='rootfs-usr-share-misc-source_deviceinfo' -Er 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *
-	exit_code=1
-fi
-
-# Removed deviceinfo variable
-if grep -qr 'deviceinfo_modules_initfs' -- *; then
-	echo 'ERROR: deviceinfo_modules_initfs variable has been removed. Use "modules-initfs" file instead.'
-	grep --color=always -r 'deviceinfo_modules_initfs' -- *
-	exit_code=1
-fi
-
-POSTMARKETOS_WALLPAPER_PATH='/usr/share/wallpapers/postmarketos.jpg'
-# The excluded devices are "grandfathered in". New devices should not be added here.
-# See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2529
-if grep -qr $POSTMARKETOS_WALLPAPER_PATH \
-	--exclude-dir='device-pine64-pinetab' \
-	--exclude-dir='device-oneplus-kebab' \
-	--exclude-dir='device-xiaomi-willow' \
-	-- device; then
-	echo "ERROR: Please don't include configuration files that set the default wallpaper in device-specific packages!"
-	grep --color=always -r $POSTMARKETOS_WALLPAPER_PATH \
-		--exclude-dir='device-pine64-pinetab' \
-		--exclude-dir='device-oneplus-kebab' \
-		--exclude-dir='device-xiaomi-willow' \
-		-- device
-	exit_code=1
-fi
-
-OPENRC_SERVICE_FILES=$(find . -name '*.initd')
-# shellcheck disable=SC2086
-if grep -q 'before wpa_supplicant' $OPENRC_SERVICE_FILES; then
-	echo "ERROR: Please use 'before wlan' in OpenRC service files! This ensures compatibility with both wpa_supplicant and iwd."
-	grep --color=always 'before wpa_supplicant' $OPENRC_SERVICE_FILES
-	exit_code=1
-fi
-
-if grep -qEr 'PMOS_NO_OUTPUT_REDIRECT' -- *; then
-	echo "ERROR: PMOS_NO_OUTPUT_REDIRECT is deprecated and doesn't do anything."
-	echo "Please remove it from the following files:"
-	grep --color=always -Er 'PMOS_NO_OUTPUT_REDIRECT' -- *
-	exit_code=1
-fi
-
-if grep -qEr '^deviceinfo_kernel_cmdline.*[\"\s]console=null' -- device/; then
-	echo "ERROR: Do not use console=null in the kernel command line."
-	echo "Use these params to quiet console on boot: quiet loglevel=2"
-	echo "For more information, see: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2989"
-	exit_code=1
-fi
-
-exit "$exit_code"

.ci/kconfig.sh

@@ -1,16 +0,0 @@
-#!/bin/sh -e
-# Description: check modified kernel configs
-# 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/check_changed_kernels.py

.ci/lib/add_pmbootstrap_to_import_path

@@ -1 +0,0 @@
-../testcases/add_pmbootstrap_to_import_path

.ci/lib/apkbuild_linting.py

@@ -1,26 +0,0 @@
-#!/usr/bin/env python3
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import common
-import os.path
-import sys
-
-if __name__ == "__main__":
-    common.add_upstream_git_remote()
-    apkbuilds = {file for file in common.get_changed_files(removed=False)
-                 if os.path.basename(file) == "APKBUILD"}
-    if len(apkbuilds) < 1:
-        print("No APKBUILDs to lint")
-        sys.exit(0)
-
-    packages = []
-    for apkbuild in apkbuilds:
-        if apkbuild.startswith("temp/") or apkbuild.startswith("cross/"):
-            print(f"NOTE: Skipping linting of {apkbuild}")
-            continue
-        packages.append(os.path.basename(os.path.dirname(apkbuild)))
-    if len(packages) < 1:
-        print("No APKBUILDs to lint")
-        sys.exit(0)
-
-    common.run_pmbootstrap(["-q", "lint"] + packages)

.ci/lib/build_changed_aports.py

@@ -1,141 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-import sys
-import os
-import pathlib
-
-# Same dir
-import common
-
-# pmbootstrap
-import add_pmbootstrap_to_import_path
-import pmb.core
-import pmb.parse
-import pmb.parse._apkbuild
-import pmb.helpers.pmaports
-from pmb.core.context import get_context
-
-
-def build_strict(packages, arch):
-    common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
-                            "--strict", "--force",
-                            "--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:
-        print("usage: build_changed_aports.py ARCH")
-        sys.exit(1)
-    arch = sys.argv[1]
-
-    # Get and print modified packages
-    common.add_upstream_git_remote()
-    packages = common.get_changed_packages()
-
-    # Package count sanity check
-    common.get_changed_packages_sanity_check(len(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 that either:
-    #  1. can't be built for given arch
-    #  2. 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 any available repos, 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.
-            systemd_pkgs.append(package)
-            continue
-
-        apkbuild_path = pmb.helpers.pmaports.find(package)
-        apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
-
-        if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
-            print(f"{package}: not enabled for {arch}, skipping")
-            packages.remove(package)
-
-    # No packages: skip build
-    if len(packages) == 0:
-        print(f"no packages changed, which can be built for {arch}")
-
-    else:
-        verify_only = common.commit_message_has_string("[ci:skip-build]")
-        if verify_only:
-            # [ci:skip-build]: verify checksums and stop
-            print("WARNING: not building changed packages ([ci:skip-build])!")
-            print("verifying checksums: " + ", ".join(packages))
-            verify_checksums(packages, arch)
-        else:
-            # Build packages
-            print(f"building in strict mode for {arch}: {', '.join(packages)}")
-            build_strict(packages, arch)
-
-    # Build packages in extra-repos/systemd
-    # FIXME: this should probably be more generic, if other repos are added later?
-    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}")
-
-        else:
-            verify_only = common.commit_message_has_string("[ci:skip-build]")
-            if verify_only:
-                # [ci:skip-build]: verify checksums
-                print("WARNING: not building changed packages for extra-repos/systemd: ([ci:skip-build])!")
-                print("verifying checksums: " + ", ".join(systemd_pkgs))
-                verify_checksums(systemd_pkgs, arch)
-            else:
-                # Build packages
-                print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(systemd_pkgs)}")
-                build_strict(systemd_pkgs, arch)

.ci/lib/build_changed_aports.sh

@@ -1,19 +0,0 @@
-#!/bin/sh -e
-# Description: build modified packages for this architecture
-# Options: native slow
-# 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
-
-# Get the architecture from the symlink we are running
-arch="$(echo "$0" | cut -d '-' -f 2 | cut -d '.' -f 1)"
-
-set -x
-.ci/lib/build_changed_aports.py "$arch"

.ci/lib/check_changed_aports_versions.py

@@ -1,205 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import pathlib
-import tempfile
-import sys
-import subprocess
-
-# Same dir
-import common
-
-# pmbootstrap
-import add_pmbootstrap_to_import_path  # noqa
-import pmb.parse
-import pmb.parse.version
-import pmb.helpers.logging
-from pmb.core.context import get_context
-
-def get_package_contents(package, revision, check=True):
-    # Redirect stderr to /dev/null, so git doesn't complain about files not
-    # existing in upstream branch for new packages
-    stderr = None
-    if not check:
-        stderr = subprocess.DEVNULL
-
-    # Run something like "git show upstream/master:main/hello-world/APKBUILD"
-    pmaports_dir = common.get_pmaports_dir()
-    pattern = pmaports_dir + "/**/" + package + "/APKBUILD"
-    path = glob.glob(pattern, recursive=True)[0][len(pmaports_dir + "/"):]
-    apkbuild_content = common.run_git(["show", revision + ":" + path], check,
-                                      stderr)
-    if not apkbuild_content:
-        return None
-
-    # Save APKBUILD to a temporary path and parse it from there. (Not the best
-    # way to do things, but good enough for this CI script.)
-    with tempfile.TemporaryDirectory() as tempdir:
-        with open(tempdir + "/APKBUILD", "w", encoding="utf-8") as handle:
-            handle.write(apkbuild_content)
-        parsed = pmb.parse.apkbuild(pathlib.Path(tempdir, "APKBUILD"),
-                                    False, False)
-
-    return parsed
-
-
-def get_package_version(package, revision, check=True):
-    """ returns version in the format "{pkgver}-r{pkgrel}", or None if no 
-        matching package is found """
-    parsed = get_package_contents(package, revision, check)
-    if parsed is None:
-        return None
-    return parsed["pkgver"] + "-r" + parsed["pkgrel"]
-
-
-def version_compare_operator(result):
-    """ :param result: return value from pmb.parse.version.compare() """
-    if result == -1:
-        return "<"
-    elif result == 0:
-        return "=="
-    elif result == 1:
-        return ">"
-
-    raise RuntimeError("Unexpected version_compare_operator input: " + result)
-
-
-def exit_with_error_message():
-    branch = common.get_upstream_branch()
-    print()
-    print("ERROR: Modified package(s) don't have an increased version or a")
-    print("new package has a nonzero pkgrel!")
-    print()
-    print("This can happen if you added a new package with a nonzero")
-    print("pkgrel, or if you did not change the pkgver/pkgrel")
-    print("variables in the APKBUILDs. Or you did change them, but the")
-    print(f"packages have been updated in the official '{branch}' branch, and")
-    print("now your versions are not higher anymore.")
-    print()
-    print("Your options:")
-    print("a) If you made changes to the packages, and did not increase the")
-    print("   pkgrel/pkgver: increase them now, and force push your branch.")
-    print("   => https://postmarketos.org/howto-bump-pkgrel-pkgver")
-    print("b) If you had already increased the package versions, rebase on")
-    print(f"   '{branch}', increase the versions again and then force push:")
-    print("   => https://postmarketos.org/rebase")
-    print("c) If you made a change, that does not require rebuilding the")
-    print("   packages, such as only changing the arch=... line: you can")
-    print("   disable this check by adding '[ci:skip-vercheck]' to the")
-    print("   latest commit message, then force push.")
-    print()
-    print("Thank you and sorry for the inconvenience.")
-    exit(1)
-
-
-def check_versions(packages):
-    error = False
-
-    # Get relevant commits: compare HEAD against upstream branch or HEAD~1
-    # (the latter if this CI check is running on upstream branch). Note that
-    # for the common.get_changed_files() code, we don't check against
-    # upstream branch HEAD, but against the latest common ancestor. This is not
-    # desired here, since we already know what packages changed, and really
-    # want to check if the version was increased towards *current* upstream
-    # branch HEAD.
-    commit = f"upstream/{common.get_upstream_branch()}"
-    if common.run_git(["rev-parse", "HEAD"]) == common.run_git(["rev-parse",
-                                                                commit]):
-        print(f"NOTE: {commit} is on same commit as HEAD, comparing"
-              " HEAD against HEAD~1.")
-        commit = "HEAD~1"
-
-    for package in packages:
-        # Get versions, skip new packages
-        head = get_package_version(package, "HEAD")
-        upstream = get_package_version(package, commit, False)
-        if not upstream:
-            if head.rpartition('r')[2] != "0":
-                print(f"- {package}: {head} (HEAD) (new package) [ERROR]")
-                error = True
-            else:
-                print(f"- {package}: {head} (HEAD) (new package)")
-            continue
-
-        # Check pkgver follows expected format for device packages
-        pkgver = head.rpartition('-r')[0]
-        if package.startswith('device-') and not pkgver.isdigit():
-            print(f" - {package}: invalid pkgver \"{pkgver}\""
-                  "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-            error = True
-
-        # Additional checks for device packages
-        if package.startswith('device-'):
-            head_parsed = get_package_contents(package, "HEAD", False)
-            upstream_parsed = get_package_contents(package, commit, False)
-
-            # checksums did not change
-            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
-                # Check that pkgver did not change
-                if head_parsed["pkgver"] != upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should not change when package source checksums did not change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # We do not check for a bumped pkgrel, because not everything
-                # needs it, e.g: pmb_recommends
-            # checksums changed
-            else:
-                # Check that pkgrel was reset to 0
-                if head_parsed["pkgrel"] != "0":
-                    print(f" - {package}: pkgrel should be 0 when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # Check that pkgver was changed
-                if head_parsed["pkgver"] == upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should change when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-
-        # Compare head and upstream versions
-        result = pmb.parse.version.compare(head, upstream)
-        if result != 1:
-            error = True
-
-        # Print result line ("- hello-world: 1-r2 (HEAD) > 1-r1 (HEAD~1)")
-        formatstr = "- {}: {} (HEAD) {} {} ({})"
-        if result != 1:
-            formatstr += " [ERROR]"
-        operator = version_compare_operator(result)
-        print(formatstr.format(package, head, operator, upstream, commit))
-
-    if error:
-        exit_with_error_message()
-
-
-if __name__ == "__main__":
-    # Get and print modified packages
-    common.add_upstream_git_remote()
-    packages = common.get_changed_packages()
-    print(f"Changed packages: {packages}")
-
-    # Verify modified package count
-    common.get_changed_packages_sanity_check(len(packages))
-    if len(packages) == 0:
-        print("no aports changed in this branch")
-        exit(0)
-
-    # Potentially skip this check
-    if common.commit_message_has_string("[ci:skip-vercheck]"):
-        print("WARNING: not checking for changed package versions"
-              " ([ci:skip-vercheck])!")
-        exit(0)
-
-    # Initialize args (so we can use pmbootstrap's APKBUILD parsing)
-    sys.argv = ["pmbootstrap.py", "chroot"]
-    args = pmb.parse.arguments()
-    context = get_context()
-
-    # pmb.helpers.logging.init(args)
-    pmb.helpers.logging.init(context.log, args.verbose, context.details_to_stdout)
-
-
-    # Verify package versions
-    print("checking changed package versions...")
-    check_versions(packages)

.ci/lib/check_changed_kernels.py

@@ -1,98 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2024 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import tempfile
-import sys
-import subprocess
-
-# Same dir
-import common
-
-
-def check_kconfig(pkgnames):
-    last_failed = None
-    for i in range(len(pkgnames)):
-        pkgname = pkgnames[i]
-        print(f"  ({i+1}/{len(pkgnames)}) {pkgname}")
-
-        p = subprocess.run(["pmbootstrap", "kconfig", "check", "--keep-going", pkgname],
-                           check=False)
-
-        if p.returncode:
-            last_failed = pkgname
-
-    return last_failed
-
-
-def check_kconfig_all():
-    p = subprocess.run(["pmbootstrap", "kconfig", "check", "--keep-going"], check=False)
-    return p.returncode == 0
-
-
-def show_error(last_failed):
-    print("")
-    print("---")
-    print("")
-    print("Please adjust your kernel config. This is required for getting your"
-          " patch merged.")
-    print("")
-    print("Edit your kernel config:")
-    print(f"  pmbootstrap kconfig edit {last_failed}")
-    print("")
-    print("Test this kernel config again:")
-    print(f"  pmbootstrap kconfig check {last_failed}")
-    print("")
-    print("Run this check again (on all kernels you modified):")
-    print("  pmbootstrap ci kconfig")
-    print("")
-    print("---")
-    print("")
-
-
-def show_error_all():
-    print("")
-    print("---")
-    print("")
-    print("Please adjust the failed kernel configs. This is required for")
-    print("getting your patch merged.")
-    print("")
-    print("If a kernel in the testing category failed, and fixing is too much")
-    print("effort, remove 'pmb:kconfigcheck-community' from the APKBUILD.")
-    print("")
-    print("Edit a kernel config:")
-    print("  pmbootstrap kconfig edit <PACKAGE NAME>")
-    print("")
-    print("Test a specific kernel config again:")
-    print("  pmbootstrap kconfig check <PACKAGE NAME>")
-    print("")
-    print("Run this check again (on all kernels you modified):")
-    print("  pmbootstrap ci kconfig")
-    print("")
-    print("---")
-    print("")
-
-
-if __name__ == "__main__":
-    common.add_upstream_git_remote()
-
-    if "kconfigcheck.toml" in common.get_changed_files():
-        print("kconfigcheck.toml changed -> checking all kernels")
-        if not check_kconfig_all():
-            show_error_all()
-            exit(1)
-        exit(0)
-
-    pkgnames = common.get_changed_kernels()
-    print(f"Changed kernels: {pkgnames}")
-
-    if len(pkgnames) == 0:
-        print("No kernels changed in this branch")
-        exit(0)
-
-    last_failed = check_kconfig(pkgnames)
-
-    if last_failed:
-        show_error(last_failed)
-        exit(1)

.ci/lib/gitlab_prepare_ci.sh

@@ -1,17 +0,0 @@
-#!/bin/sh -e
-# Copyright 2023 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-if ! mount | grep -q /proc/sys/fs/binfmt_misc; then
-	echo "Mounting binfmt_misc"
-	mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
-fi
-
-if id "build" > /dev/null 2>&1; then
-	echo "User 'build' exists already"
-else
-	echo "Creating build user"
-	adduser -D build
-	chown -R build:build .
-	echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
-fi

.ci/move_logs.sh

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ -z "$1" ]; then
-	echo "usage: $(basename "$0") \$CI_PROJECT_DIR"
+	echo "usage: $(basename $0) \$CI_PROJECT_DIR"
 	exit 1
 fi
 

.ci/pytest.sh

@@ -1,42 +0,0 @@
-#!/bin/sh -e
-# Copyright 2023 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-# Description: lint with various python tests
-# Options: native
-# Use 'native' because it requires 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 pytest
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
-fi
-
-# Require pytest to be installed on the host system
-if [ -z "$(command -v pytest)" ]; then
-	echo "ERROR: pytest command not found, make sure it is in your PATH."
-	exit 1
-fi
-
-pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
-# Make sure that the work folder format is up to date, and that there are no
-# mounts from aborted test cases (pmbootstrap#1595)
-pmbootstrap work_migrate
-pmbootstrap config aports "$pmaports"
-pmbootstrap -q shutdown
-
-# Make sure we have a valid device (pmbootstrap#1128)
-device="$(pmbootstrap config device)"
-deviceinfo="$pmaports/device/*/device-$device/deviceinfo"
-# shellcheck disable=SC2086
-if ! [ -e $deviceinfo ]; then
-	echo "ERROR: Could not find deviceinfo file for selected device '$device'."
-	echo "Expected path: $deviceinfo"
-	echo "Maybe you have switched to a branch where your device does not exist?"
-	echo "Use 'pmbootstrap config device qemu-amd64' to switch to a valid device."
-	exit 1
-fi
-
-# Run testcases
-pytest -vv -x --tb=native "$pmaports/.ci/testcases" "$@"

.ci/ruff.sh

@@ -1,14 +0,0 @@
-#!/bin/sh -e
-# Description: lint CI related python scripts/tests
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add ruff
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-set -x
-
-# shellcheck disable=SC2046
-ruff check --ignore E501,F401,E722,W605 $(find .ci -name '*.py')

.ci/run_testcases.sh

@@ -0,0 +1,35 @@
+#!/bin/sh -e
+# Copyright 2021 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# Require pmbootstrap
+if ! command -v pmbootstrap > /dev/null; then
+	echo "ERROR: pmbootstrap needs to be installed."
+	exit 1
+fi
+
+# Wrap pmbootstrap to use this repository for --aports
+pmaports="$(cd $(dirname $0)/..; pwd -P)"
+_pmbootstrap="$(command -v pmbootstrap)"
+pmbootstrap() {
+	"$_pmbootstrap" --aports="$pmaports" "$@"
+}
+
+# Make sure that the work folder format is up to date, and that there are no
+# mounts from aborted test cases (pmbootstrap#1595)
+pmbootstrap work_migrate
+pmbootstrap -q shutdown
+
+# Make sure we have a valid device (pmbootstrap#1128)
+device="$(pmbootstrap config device)"
+deviceinfo="$pmaports/device/*/device-$device/deviceinfo"
+if ! [ -e $deviceinfo ]; then
+	echo "ERROR: Could not find deviceinfo file for selected device '$device'."
+	echo "Expected path: $deviceinfo"
+	echo "Maybe you have switched to a branch where your device does not exist?"
+	echo "Use 'pmbootstrap config device qemu-amd64' to switch to a valid device."
+	exit 1
+fi
+
+# Run testcases
+pytest -vv -x --tb=native "$pmaports/.ci/testcases" "$@"

.ci/shellcheck.sh

@@ -1,30 +1,34 @@
 #!/bin/sh -e
-# Copyright 2023 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
-# Description: lint all shell scripts
-# https://postmarketos.org/pmb-ci
 
-DIR="$(cd "$(dirname "$0")/.." && pwd -P)"
+set -e
+DIR="$(cd "$(dirname "$0")" && pwd -P)"
+cd "$DIR/.."
 
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add shellcheck
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
+# Find CHANGEMEs in APKBUILDs
+if grep -qr '(CHANGEME!)' *; then
+	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
+	grep --color=always -r '(CHANGEME!)' *
+	exit 1
 fi
 
 # Shell: shellcheck
 sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
+	./main/osk-sdl/unlock.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/init.sh
+	./main/postmarketos-mkinitfs/init_functions.sh
+	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
+	./main/postmarketos-update-kernel/update-kernel.sh
+	./main/swclock-offset/swclock-offset-boot.sh
+	./main/swclock-offset/swclock-offset-shutdown.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
-	./device/community/soc-qcom/call_audio_idle_suspend_workaround.sh
+	./main/msm-firmware-loader/*.post-install
 
 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')
@@ -38,11 +42,10 @@ sh_files="
 	$(find . -path './main/devicepkg-dev/*.sh')
 	$(find . -path './main/postmarketos-mvcfg/*.sh')
 
-	$(find . -path './.ci/**.sh')
+	$(find . -path '.ci/*.sh')
 "
-
 for file in $sh_files; do
 	echo "Test with shellcheck: $file"
-	cd "$DIR/$(dirname "$file")"
-	shellcheck -e SC1008 -e SC3043 -x "$(basename "$file")"
+	cd "$DIR/../$(dirname "$file")"
+	shellcheck -e SC1008 -x "$(basename "$file")"
 done

.ci/testcases/add_pmbootstrap_to_import_path/__init__.py

@@ -7,7 +7,7 @@ import sys
 import os
 import importlib
 import importlib.util
-from site import getsitepackages
+from distutils.sysconfig import get_python_lib
 
 
 def path_pmbootstrap():
@@ -15,26 +15,23 @@ def path_pmbootstrap():
         code from there.
         returns: pmbootstrap installation folder
     """
-    # This variable is set by pmbootstrap 1.52 and later
-    # If it's undefined, try to find 'pmbootstrap' in path
-    bin = os.environ.get("PMBOOTSTRAP_CMD") or shutil.which("pmbootstrap")
-
+    # Find 'pmbootstrap' executable
+    bin = shutil.which("pmbootstrap")
     if not bin:
         print("ERROR: 'pmbootstrap' not found in $PATH")
         sys.exit(1)
 
     # Resolve the symlink and verify the folder
-    directory = os.path.dirname(os.path.realpath(bin))
-    if os.path.exists(directory + "/pmb/__init__.py"):
-        return directory
+    dir = os.path.dirname(os.path.realpath(bin))
+    if os.path.exists(dir + "/pmb/__init__.py"):
+        return dir
 
-    directories = getsitepackages()
-    for directory in directories:
-        if os.path.exists(directory + "/pmb/__init__.py"):
-            return directory
+    dir = get_python_lib()
+    if os.path.exists(dir + "/pmb/__init__.py"):
+        return dir
 
     # Symlink not set up properly
-    print("ERROR: unable to find path to pmbootstrap.py. Try setting 'PMBOOTSTRAP_CMD'.")
+    print("ERROR: 'pmbootstrap' is not a symlink to pmbootstrap.py")
     sys.exit(1)
 
 

.ci/testcases/conftest.py

@@ -2,33 +2,24 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from pathlib import Path
 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.helpers.args import init as init_args
-from pmb.types import PmbArgs
-import pmb.config
-from pmb.core.pkgrepo import pkgrepo_default_path
 import pytest
 import sys
 import os
 
-@pytest.fixture(scope="session", autouse=True)
+
+@pytest.fixture
 def args(request):
     # Initialize args
-    pmaports = Path(os.path.realpath(f"{os.path.dirname(__file__)}/../.."))
-    args = PmbArgs()
-    args.aports = [pmaports]
-    args.config = pmb.config.defaults["config"]
-    args.timeout = 900
-    args.details_to_stdout = False
-    args.quiet = False
-    args.verbose = True
-    args.offline = False
-    args.action = "init"
-    args.cross = False
-    args.log = None
+    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
+    sys.argv = ["pmbootstrap",
+                "--aports", pmaports,
+                "--log", "$WORK/log_testsuite_pmaports.txt"
+                "chroot"]
+    args = pmb.parse.arguments()
 
-    init_args(args)
+    # Initialize logging
+    pmb.helpers.logging.init(args)
     request.addfinalizer(pmb.helpers.logging.logfd.close)
     return args

.ci/testcases/test_device.py

@@ -1,132 +1,136 @@
 #!/usr/bin/env python3
-# Copyright 2024 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import fnmatch
 import glob
-import os
 import pytest
 import sys
+import os
 
 import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
-from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob, pkgrepo_relative_path
-from pmb.core.arch import Arch
-
-# Don't complain if these nicknames are the only maintainers of an APKBUILD,
-# because they are actually a group of people
-gitlab_groups = [
-    "@sdm845-mainline",
-]
 
 
 def device_dependency_check(apkbuild, path):
     """ Raise an error if a device package has a dependency that is not allowed
         (e.g. because it should be in a subpackage instead). """
 
+    # asus-me176c: without this, the device will simply run the broken ACPI
+    #              DSDT table, so we might as well update it. See pmaports!699.
+    firmware_ok = {"device-asus-me176c": ["firmware-asus-me176c-acpi"]}
+
+    pkgname = apkbuild["pkgname"]
     for depend in apkbuild["depends"]:
-        if depend == "mesa-dri-gallium":
-            raise RuntimeError(f"{path}: mesa-dri-gallium shouldn't be in"
-                               " depends anymore (see pmaports!3478)")
+        if (depend.startswith("firmware-") or
+                depend.startswith("linux-firmware")):
+            if pkgname in firmware_ok and depend in firmware_ok[pkgname]:
+                continue
+            raise RuntimeError("Firmware package '" + depend + "' found in"
+                               " depends of " + path + ". These go into"
+                               " subpackages now, see"
+                               " <https://postmarketos.org/devicepkg>.")
 
 
-def test_aports_device():
+def test_aports_device(args):
     """
     Various tests performed on the /device/*/device-* aports.
     """
-    for path in pkgrepo_iglob("device/*/device-*/APKBUILD"):
+    for path in glob.iglob(args.aports + "/device/*/device-*/APKBUILD"):
         apkbuild = pmb.parse.apkbuild(path)
 
         # Depends: Require "postmarketos-base"
-        depend_flag = False
-        for dependency in apkbuild["depends"]:
-            if "postmarketos-base" == dependency or "postmarketos-base>" in dependency:
-                depend_flag = True
-        if not depend_flag:
-            raise RuntimeError(f"Missing 'postmarketos-base' in depends of {path}")
+        if "postmarketos-base" not in apkbuild["depends"]:
+            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
+                               path)
 
-        # Depends: Must not have specific packages
+        # Depends: Must not have firmware packages
         for depend in apkbuild["depends"]:
             device_dependency_check(apkbuild, path)
 
         # Architecture
         device = apkbuild["pkgname"][len("device-"):]
-        deviceinfo = pmb.parse.deviceinfo(device)
-        if Arch.from_str("".join(apkbuild["arch"])) != deviceinfo.arch:
-            raise RuntimeError("wrong architecture, please change to arch=\""
-                               f"{deviceinfo.arch}\": {path}")
+        deviceinfo = pmb.parse.deviceinfo(args, device)
+        if "".join(apkbuild["arch"]) != deviceinfo["arch"]:
+            raise RuntimeError("wrong architecture, please change to arch=\"" +
+                               deviceinfo["arch"] + "\": " + path)
         if "!archcheck" not in apkbuild["options"]:
-            raise RuntimeError(f"!archcheck missing in options= line: {path}")
+            raise RuntimeError("!archcheck missing in options= line: " + path)
+
+        if deviceinfo["flash_kernel_on_update"] == "true" \
+                and "postmarketos-update-kernel" not in apkbuild["depends"]:
+            raise RuntimeError(
+                "Deviceinfo indicates this device supports automatic kernel"
+                " flashing on update, but doesn't depend on"
+                " 'postmarketos-update-kernel'. Please add the missing"
+                " dependency.")
 
 
-def test_aports_device_kernel():
+def test_aports_device_kernel(args):
     """
     Verify the kernels specified in the device packages:
     * Kernel must not be in depends when kernels are in subpackages
     * Check if only one kernel is defined in depends
     """
-    aports = pkgrepo_default_path()
+
     # Iterate over device aports
-    for path in aports.glob("device/*/device-*/APKBUILD"):
+    for path in glob.glob(args.aports + "/device/*/device-*/APKBUILD"):
         # Parse apkbuild and kernels from subpackages
         apkbuild = pmb.parse.apkbuild(path)
         device = apkbuild["pkgname"][len("device-"):]
-        kernels_subpackages = pmb.parse._apkbuild.kernels(device)
+        kernels_subpackages = pmb.parse._apkbuild.kernels(args, device)
 
         # Parse kernels from depends
         kernels_depends = []
         for depend in apkbuild["depends"]:
-            if not depend.startswith("linux-") or depend.startswith("linux-firmware-"):
+            if not depend.startswith("linux-"):
                 continue
             kernels_depends.append(depend)
 
             # Kernel in subpackages *and* depends
             if kernels_subpackages:
-                raise RuntimeError(f"Kernel package '{depend}' needs to"
+                raise RuntimeError("Kernel package '" + depend + "' needs to"
                                    " be removed when using kernel" +
-                                   f" subpackages: {path}")
+                                   " subpackages: " + path)
 
         # No kernel
         if not kernels_depends and not kernels_subpackages:
             raise RuntimeError("Device doesn't have a kernel in depends or"
-                               f" subpackages: {path}")
+                               " subpackages: " + path)
 
         # Multiple kernels in depends
         if len(kernels_depends) > 1:
             raise RuntimeError("Please use kernel subpackages instead of"
                                " multiple kernels in depends (see"
-                               f" <https://postmarketos.org/devicepkg>): {path}")
+                               " <https://postmarketos.org/devicepkg>): " +
+                               path)
 
 
-# @pytest.mark.xfail # Not all aports have been updated yet
-def test_aports_maintained():
+def test_aports_maintained(args):
     """
     Ensure that aports in /device/{main,community} have "Maintainer:" and
     "Co-Maintainer:" (only required for main) listed in their APKBUILDs.
     """
-
-    for path in pkgrepo_iglob("device/main/*/APKBUILD"):
-        if 'firmware-' in path.parent.name:
+    for path in glob.iglob(f"{args.aports}/device/main/*/APKBUILD"):
+        if '/firmware-' in path:
             continue
         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"
 
-    for path in pkgrepo_iglob("device/community/*/APKBUILD"):
-        if 'firmware-' in path.parent.name:
+    for path in glob.iglob(f"{args.aports}/device/community/*/APKBUILD"):
+        if '/firmware-' in path:
             continue
         maintainers = pmb.parse._apkbuild.maintainers(path)
         assert maintainers, f"{path} in community needs at least 1 Maintainer"
 
 
-def test_aports_unmaintained():
+def test_aports_unmaintained(args):
     """
     Ensure that aports in /device/unmaintained have an "Unmaintained:" comment
     that describes why the aport is unmaintained.
     """
-
-    for path in pkgrepo_iglob("device/unmaintained/*/APKBUILD"):
+    for path in glob.iglob(f"{args.aports}/device/unmaintained/*/APKBUILD"):
         unmaintained = pmb.parse._apkbuild.unmaintained(path)
         assert unmaintained, f"{path} should have an Unmaintained: " +\
             "comment that describes why the package is unmaintained"

.ci/testcases/test_deviceinfo.py

@@ -3,14 +3,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import glob
-import os
 import pytest
-import re
 import sys
+import os
 
 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iglob
 
 
 def deviceinfo_obsolete(info):
@@ -18,61 +16,41 @@ def deviceinfo_obsolete(info):
     Test for obsolete options used in the deviceinfo file. They must still be
     defined in pmbootstrap's config/__init__.py.
     """
-    obsolete_options = [
-        "usb_rndis_function",
-        "weston_pixman_type",
-    ]
+    obsolete_options = ["weston_pixman_type"]
     for option in obsolete_options:
-        if getattr(info, option, None):
-            raise RuntimeError(f"option {option} is obsolete, please rename"
-                               " or remove it (see reasons for removal of at"
-                               " https://postmarketos.org/deviceinfo)")
+        if info[option]:
+            raise RuntimeError("option '" + option + "' is obsolete, please"
+                               " remove it (reasons for removal are at"
+                               " <https://postmarketos.org/deviceinfo>)")
 
 
-def test_deviceinfo():
+def test_deviceinfo(args):
     """
     Parse all deviceinfo files successfully and run checks on the parsed data.
     """
     # Iterate over all devices
     last_exception = None
     count = 0
-    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"(\\s*# .*)?$")
+    for folder in glob.glob(args.aports + "/device/*/device-*"):
+        device = folder[len(args.aports):].split("-", 1)[1]
 
-    for folder in pkgrepo_iglob("device/*/device-*"):
-        device = folder.name.split("-", 1)[1]
-
-        f = open(folder / "deviceinfo")
+        f = open(folder[len(args.aports):][1:] + "/deviceinfo")
         lines = f.read().split("\n")
         f.close()
 
         try:
+            # variable can not be empty
             for line in lines:
-                # Require space after # for comments
-                if line.startswith("#") and not line.startswith("# "):
-                    raise RuntimeError("Comment style: please change '#' to"
-                                       f" '# ': {line}")
-
-                # Skip empty lines and comments
-                if not line or line.startswith("# "):
-                    continue
-
-                # Variable can not be empty
                 if '=""' in line:
                     raise RuntimeError("Please remove the empty variable: " + line)
 
-                # 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/malformed"
-                                       f" inline comment? {line}")
-
             # Successful deviceinfo parsing / obsolete options
-            info = pmb.parse.deviceinfo(device)
+            info = pmb.parse.deviceinfo(args, device)
             deviceinfo_obsolete(info)
 
             # deviceinfo_name must start with manufacturer
-            name = info.name
-            manufacturer = info.manufacturer
+            name = info["name"]
+            manufacturer = info["manufacturer"]
             if not name.startswith(manufacturer) and \
                     not name.startswith("Google"):
                 raise RuntimeError("Please add the manufacturer in front of"

.ci/testcases/test_directory_structure.py

@@ -6,11 +6,10 @@ import stat
 
 expected_directories = [
     "cross",
-    "device/archived",
     "device/community",
     "device/main",
     "device/testing",
-    "extra-repos/systemd",
+    "device/unmaintained",
     "main",
     "modem",
     "non-free",
@@ -29,9 +28,9 @@ def test_directories():
 
 
 # Ensure no file in pmaports are executable.
-# see https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/593.
+# see https://gitlab.com/postmarketOS/pmaports/-/issues/593.
 def test_executable_files():
-    for file in glob.iglob("[!temp]**/**/*", recursive=True):
+    for file in glob.iglob("**/*", recursive=True):
         if os.path.isdir(file) or os.path.islink(file):
             continue
             # still check other less common inode types

.ci/testcases/test_firmware.py

@@ -7,30 +7,26 @@ import os
 
 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob
 
 
-def test_aports_firmware():
+def test_aports_firmware(args):
     """
     Various tests performed on the /**/firmware-* aports.
     """
 
     excluded = [
-        "firmware-motorola-ali",  # Depends on firmware-qcom-adreno-a530
         "firmware-motorola-potter",  # Depends on soc-qcom-msm8916-ucm
         "firmware-oneplus-msm8998",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-xiaomi-sagit",  # Depends on soc-qcom-sdm845-nonfree-firmware
         "firmware-samsung-baffinlite",  # Depends on firmware-aosp-broadcom-wlan
         "firmware-samsung-crespo",  # Depends on firmware-aosp-broadcom-wlan
         "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):
+    for path in glob.iglob(f"{args.aports}/**/firmware-*/APKBUILD", recursive=True):
         apkbuild = pmb.parse.apkbuild(path)
-        aport_name = os.path.basename(path.parent)
+        aport_name = os.path.basename(os.path.dirname(path))
 
         if aport_name not in excluded:
             if "pmb:cross-native" not in apkbuild["options"]:
@@ -45,8 +41,3 @@ def test_aports_firmware():
             raise RuntimeError(f"{aport_name}: \"!tracedeps\" missing in"
                                " options= line. The tracedeps option is superfluous"
                                " for firmware packages.")
-
-        if "noarch" in apkbuild["arch"]:
-            raise RuntimeError(f"{aport_name}: \"arch\" must not be \"noarch\"!"
-                               " Please limit this firmware package to the"
-                               " required architectures only!")

.ci/testcases/test_framework_versions.py

@@ -15,10 +15,9 @@ import sys
 import add_pmbootstrap_to_import_path
 import pmb.config
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iter_package_dirs
 
 
-def get_categorized_packages():
+def get_categorized_packages(args):
     """
     Parse all aports and categorize them.
 
@@ -29,7 +28,7 @@ def get_categorized_packages():
     """
     ret = {}
 
-    for path in pkgrepo_iter_package_dirs():
+    for path in glob.glob(args.aports + "/*/*/APKBUILD"):
         # Parse APKBUILD
         apkbuild = pmb.parse.apkbuild(path)
         url = apkbuild["url"]
@@ -110,10 +109,10 @@ def check_categories(categories):
     return ret
 
 
-def test_framework_versions():
+def test_framework_versions(args):
     """
     Make sure that packages of the same framework have the same version.
     """
-    categories = get_categorized_packages()
+    categories = get_categorized_packages(args)
     if not check_categories(categories):
         raise RuntimeError("Framework version check failed!")

.ci/testcases/test_kernel.py

@@ -6,26 +6,20 @@ import glob
 import pytest
 import sys
 import os
-import re
-from pathlib import Path
 
 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iglob, pkgrepo_relative_path
 
 
-def test_aports_kernel():
+def test_aports_kernel(args):
     """
     Various tests performed on the /**/linux-* aports.
     """
 
-    for path in pkgrepo_iglob("**/linux-*/APKBUILD", recursive=True):
+    for path in glob.iglob(f"{args.aports}/**/linux-*/APKBUILD", recursive=True):
         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")
@@ -40,16 +34,9 @@ def test_aports_kernel():
                                    " pmbootstrap installs cross-compiler"
                                    " automatically.")
 
-        # check some options only for main and community devices
-        _, relpath = pkgrepo_relative_path(path)
-        for part in ["main", "community"]:
-            if part in relpath.parts:
-                if "pmb:kconfigcheck-community" not in apkbuild["options"]:
-                    raise RuntimeError(f"{aport_name}: \"pmb:kconfigcheck-community\" missing in"
-                                       " options= line, required for all community/main devices.")
-
-        # check for postmarketos-installkernel in makedepends when installing kernel with make
-        if bool(re.search("make z?install", path.read_text(encoding="utf-8"))):
-            if "postmarketos-installkernel" not in apkbuild["makedepends"]:
-                raise RuntimeError(f"{aport_name}: \"postmarketos-installkernel\" missing in"
-                                   " makedepends, required when using make install/zinstall.")
+        # nftables support in kernels used by main and community devices
+        for dir in ["main", "device/main", "device/community"]:
+            if path.startswith(f"{args.aports}/{dir}"):
+                assert pmb.parse.kconfig.check(args,
+                                               aport_name.replace("linux-", ""),
+                                               force_nftables_check=True)

.ci/testcases/test_provides.py

@@ -1,89 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2023 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-import glob
-import logging
-import os
-import pytest
-import sys
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-import pmb.parse._apkbuild
-from pmb.core.pkgrepo import pkgrepo_iter_package_dirs, pkgrepo_relative_path
-
-
-def apkbuild_check_provides(path, apkbuild, version, pkgname, subpkgname=None):
-    """
-    Verify that a package or subpackage is using provides correctly.
-
-    :param path: to the APKBUILD for the error message
-    :param apkbuild: either the full return of pmb.parse.apkbuild() or a
-                     subpackage of it (apkbuild["subpackages"][$subpkgname])
-    :param version: like 1.0.0-r3 so we can check against it
-    :param pkgname: package name
-    :param subpkgname: subpackage name, if we are looking at a subpackage
-    :returns: list of error strings
-    """
-    name = pkgname
-    if subpkgname:
-        name = f"{pkgname}:{subpkgname}"
-
-    logging.info(f"{name}: checking provides")
-    ret = []
-
-    if not apkbuild["provides"]:
-        return ret
-
-    for provide in apkbuild["provides"]:
-        # Having provides entries without version is valid if the
-        # provider_priorty is also set (pma#1766)
-        if apkbuild["provider_priority"]:
-            continue
-        # Otherwise the version =$pkgver-r$pkgrel needs to be set. pmbootstrap
-        # already replaces the variables, so we check against the inserted
-        # values here.
-        if not provide.endswith(f"={version}"):
-            provide_no_ver = provide.split("=", 1)[0]
-
-            error = f"error in {path}:\n"
-            if subpkgname:
-                error += f"in subpackage:\n  {subpkgname}\n"
-            else:
-                error += f"in package:\n  {pkgname}\n"
-            error += f"broken provides entry:\n  {provide_no_ver}\n"
-            error += "\n"
-            error += "This provides entry needs to be changed to"
-            error += f" '{provide_no_ver}=$pkgver-r$pkgrel'"
-            error += " (do not replace the variables, without '').\n"
-            error += "\n"
-            error += "If you know what you are doing and didn't add the"
-            error += " version on purpose, you also need to set a"
-            error += " provider_priority (pma#1766).\n"
-            error += "Reference:"
-            error += " https://wiki.alpinelinux.org/wiki/APKBUILD_Reference#provides"
-            ret += [error]
-    return ret
-
-
-def test_provides():
-    errors = []
-    for path in pkgrepo_iter_package_dirs():
-        path = path / "APKBUILD"
-        apkbuild = pmb.parse.apkbuild(path)
-        pkgname = apkbuild["pkgname"]
-        version = f"{apkbuild['pkgver']}-r{apkbuild['pkgrel']}"
-        _, path_rel = pkgrepo_relative_path(path)
-        errors += apkbuild_check_provides(path_rel, apkbuild, version, pkgname)
-
-        for subpkg, subpkg_data in apkbuild["subpackages"].items():
-            if not subpkg_data:
-                # default packaging function like -doc
-                continue
-            errors += apkbuild_check_provides(path_rel, subpkg_data, version,
-                                              pkgname, subpkg)
-
-    if errors:
-        for error in errors:
-            logging.error(error)
-        raise RuntimeError(f"test_provides failed with {len(errors)} errors")

.ci/testcases/test_source.py

@@ -1,157 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2023 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-# Various checks on source= in the APKBUILDs
-
-import glob
-import logging
-import os
-import pytest
-import sys
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-import pmb.parse._apkbuild
-import pmb.parse.apkindex
-import pmb.helpers.repo
-from pmb.core.pkgrepo import pkgrepo_iter_package_dirs, pkgrepo_relative_path
-
-
-def parse_source_from_checksums(apkbuild_path):
-    """
-    Read the APKBUILD file and parse source files from the checksums at the
-    bottom. This has always the same format, even if $source is built with hard
-    to parse shell code (like in postmarketos-base).
-
-    :param apkbuild_path: full path to the APKBUILD
-    :returns: dict of parsed "source" filenames and checksums, e.g.:
-              {"first.patch": "b4dc4f3…",
-               "second.patch": "b4dc4f3…"}
-    """
-    start = 'sha512sums="'
-    in_block = False
-    ret = {}
-
-    with open(apkbuild_path, encoding="utf-8") as handle:
-        for line in handle.readlines():
-            # Find start
-            if not in_block:
-                if line.startswith(start):
-                    in_block = True
-                else:
-                    continue
-
-            # sha512sums may have lines without checksums:
-            # https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/73
-            if "  " not in line:
-                continue
-
-            try:
-                checksum, filename = line.rstrip().split("  ", 2)
-            except ValueError:
-                raise ValueError("Failed to parse checksums. Try to delete the"
-                                 " checksums and generate them again with"
-                                 f" 'pmbootstrap checksum': {apkbuild_path}")
-
-            # Cut off 'sha512sums="' if the first checksum is in that line
-            if checksum.startswith(start):
-                checksum = checksum[len(start):]
-
-            # Find end
-            if filename.endswith('"'):
-                filename = filename[:-1]
-
-            ret[filename] = checksum
-    return ret
-
-
-def test_aports_unreferenced_files():
-    """
-    Raise an error if an unreferenced file is found
-    """
-    for apkbuild_path in pkgrepo_iter_package_dirs():
-        # pmbootstrap parser has some issues with complicated APKBUILDs, skip those.
-        _, relpath = pkgrepo_relative_path(apkbuild_path)
-        if relpath.parts[0] == "cross":
-            continue
-
-        apkbuild_path = apkbuild_path / "APKBUILD"
-
-        apkbuild = pmb.parse.apkbuild(apkbuild_path)
-        sources_chk = parse_source_from_checksums(apkbuild_path)
-
-        # Collect files from subpackages
-        subpackage_installs = []
-        subpackage_triggers = []
-        if apkbuild["subpackages"]:
-            for subpackage in apkbuild["subpackages"].values():
-                if not subpackage:
-                    continue
-                subpackage_installs += subpackage.get("install", [])
-                subpackage_triggers += subpackage.get("triggers", [])
-
-        # Collect trigger files
-        trigger_sources = []
-        for trigger in apkbuild["triggers"] + subpackage_triggers:
-            trigger_sources.append(trigger.split("=")[0])
-
-        dirname = os.path.dirname(apkbuild_path)
-        for file in glob.iglob(dirname + "/**", recursive=True):
-            rel_file_path = os.path.relpath(file, dirname)
-            # Skip APKBUILDs and directories
-            if rel_file_path == "APKBUILD" or os.path.isdir(file):
-                continue
-
-            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:
-                raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")
-
-
-def test_distfiles_conflict():
-    """
-    Make sure that each filename mentioned in any source= of any APKBUILD
-    always has the same checksum. This is important because apk caches
-    downloaded source files in a flat distfiles directory. So if two APKBUILDs
-    both download a file with the same filename but different checksum, and the
-    user builds both after each other, abuild will fail on the second build
-    with a checksum error.
-    """
-    source_all = {}
-    for apkbuild_path in pkgrepo_iter_package_dirs():
-        apkbuild_path = apkbuild_path / "APKBUILD"
-        source = parse_source_from_checksums(apkbuild_path)
-        dir_path = os.path.dirname(apkbuild_path)
-        _, apkbuild_rel = pkgrepo_relative_path(apkbuild_path)
-        for filename, checksum in source.items():
-            # Files bundled with the APKBUILD don't get copied to the distfiles
-            # cache, so not relevant for this check. Use glob.glob here and not
-            # iglob, because we don't want an iterator.
-            if glob.glob(f"{dir_path}/**/{filename}", recursive=True):
-                continue
-
-            # First time seeing this file
-            if filename not in source_all:
-                source_all[filename] = {"checksum": checksum,
-                                        "apkbuild_rel": apkbuild_rel}
-                continue
-
-            # Saw this file already with same checksum
-            if checksum == source_all[filename]["checksum"]:
-                continue
-
-            # Saw this file already with different checksum
-            logging.error("")
-            logging.error(f"ERROR: the source file '{filename}' has different"
-                          " checksums in the following files:")
-            logging.error(f"- {source_all[filename]['apkbuild_rel']}:")
-            logging.error(f"  {source_all[filename]['checksum']}")
-            logging.error(f"- {apkbuild_rel}:")
-            logging.error(f"  {checksum}")
-            logging.error("")
-            logging.error("Fix this by setting a different target filename in"
-                          " the package you modified:")
-            logging.error("https://wiki.alpinelinux.org/wiki/APKBUILD_Reference#source")
-            logging.error("")
-            raise RuntimeError(f"Conflict with source file '{filename}'")

.ci/testcases/test_ui.py

@@ -9,26 +9,25 @@ import os
 
 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iglob
 
 
-def test_aports_ui():
+def test_aports_ui(args):
     """
     Raise an error if package in _pmb_recommends is not found
     """
-    pmaports_cfg = pmb.config.pmaports.read_config()
+    pmaports_cfg = pmb.config.pmaports.read_config(args)
 
     for arch in pmaports_cfg["supported_arches"].split(","):
-        for path in pkgrepo_iglob("main/postmarketos-ui-*/APKBUILD"):
+        for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
             apkbuild = pmb.parse.apkbuild(path)
             # Skip if arch isn't enabled
-            if not pmb.helpers.package.check_arch(apkbuild["pkgname"], arch, False):
+            if not pmb.helpers.package.check_arch(args, apkbuild["pkgname"], arch, False):
                 continue
 
             for package in apkbuild["_pmb_recommends"]:
-                depend = pmb.helpers.package.get(package,
+                depend = pmb.helpers.package.get(args, package,
                                                  arch, must_exist=False)
-                if depend is None or not pmb.helpers.package.check_arch(package, arch):
+                if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
                     raise RuntimeError(f"{path}: package '{package}' from"
                                        f" _pmb_recommends not found for arch '{arch}'")
 
@@ -36,8 +35,8 @@ def test_aports_ui():
             if f"{apkbuild['pkgname']}-extras" in apkbuild["subpackages"]:
                 apkbuild = apkbuild["subpackages"][f"{apkbuild['pkgname']}-extras"]
                 for package in apkbuild["_pmb_recommends"]:
-                    depend = pmb.helpers.package.get(package,
+                    depend = pmb.helpers.package.get(args, package,
                                                      arch, must_exist=False)
-                    if depend is None or not pmb.helpers.package.check_arch(package, arch):
+                    if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
                         raise RuntimeError(f"{path}: package '{package}' from _pmb_recommends "
                                            f"of -extras subpackage is not found for arch '{arch}'")

.ci/testcases/test_unreferenced_files.py

@@ -0,0 +1,97 @@
+#!/usr/bin/env python3
+# Copyright 2021 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import glob
+import pytest
+import sys
+import os
+
+import add_pmbootstrap_to_import_path
+import pmb.parse
+import pmb.parse._apkbuild
+import pmb.parse.apkindex
+import pmb.helpers.repo
+
+
+def parse_source_from_checksums(args, apkbuild_path):
+    """
+    Read the APKBUILD file and parse source files from the checksums at the
+    bottom. This has always the same format, even if $source is built with hard
+    to parse shell code (like in postmarketos-base).
+
+    :param apkbuild_path: full path to the APKBUILD
+    :returns: list of parsed "source" files, e.g.:
+              ["first.patch", "second.patch"]
+    """
+    start = 'sha512sums="'
+    in_block = False
+    ret = []
+
+    with open(apkbuild_path, encoding="utf-8") as handle:
+        for line in handle.readlines():
+            # Find start
+            if not in_block:
+                if line.startswith(start):
+                    in_block = True
+                else:
+                    continue
+
+            # sha512sums may have lines without checksums:
+            # https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/73
+            if "  " not in line:
+                continue
+
+            try:
+                _, filename = line.rstrip().split("  ", 2)
+            except ValueError:
+                raise ValueError("Failed to parse checksums. Try to delete the"
+                                 " checksums and generate them again with"
+                                 f" 'pmbootstrap checksum': {apkbuild_path}")
+
+            # Find end
+            if filename.endswith('"'):
+                ret += [filename[:-1]]
+                break
+
+            ret += [filename]
+    return ret
+
+
+def test_aports_unreferenced_files(args):
+    """
+    Raise an error if an unreferenced file is found
+    """
+    for apkbuild_path in glob.iglob(args.aports + "/**/APKBUILD", recursive=True):
+        apkbuild = pmb.parse.apkbuild(apkbuild_path)
+        sources_chk = parse_source_from_checksums(args, apkbuild_path)
+
+        # Collect install files from subpackages
+        subpackage_installs = []
+        if apkbuild["subpackages"]:
+            for subpackage in apkbuild["subpackages"].values():
+                if not subpackage:
+                    continue
+                try:
+                    subpackage_installs += subpackage["install"]
+                except KeyError:
+                    continue
+
+        # Collect trigger files
+        trigger_sources = []
+        if apkbuild["triggers"]:
+            for trigger in apkbuild["triggers"]:
+                trigger_sources.append(trigger.split("=")[0])
+
+        dirname = os.path.dirname(apkbuild_path)
+        for file in glob.iglob(dirname + "/**", recursive=True):
+            rel_file_path = os.path.relpath(file, dirname)
+            # Skip APKBUILDs and directories
+            if rel_file_path == "APKBUILD" or os.path.isdir(file):
+                continue
+
+            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:
+                raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")

.ci/wiki.sh

@@ -1,15 +0,0 @@
-#!/bin/sh -e
-# Description: verify devices are documented in the wiki
-# Options: native
-# Run natively so we don't need to set up a chroot, python3 is the only dep.
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add \
-		python3
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-set -x
-.ci/lib/check_devices_in_wiki.py --booting

.ecrc

@@ -1,4 +0,0 @@
-{
-  "SpacesAftertabs": true,
-  "Exclude": ["temp"]
-}

.editorconfig

@@ -7,13 +7,8 @@
 # Top-most EditorConfig file.
 root = true
 
-[{**.{md,ini,sh,rules,nft},**/APKBUILD,CODEOWNERS}]
+[**/APKBUILD]
 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
+trim_trailing_whitespace = true

.githooks/pre-commit

@@ -1,129 +0,0 @@
-#!/bin/sh
-#
-# This hook checks that all local sources specified in the staged APKBUILDs
-# are staged too or already committed and that checksums are correct.
-#
-set -eu
-
-# Maximal allowed size (in bytes) of a file.
-FILE_SIZE_LIMIT=262144  # 256 kiB
-
-
-if ! command -v sha512sum >/dev/null; then
-	# macOS / BSDs (?) don't have sha512sum, but shasum.
-	alias sha512sum='shasum -a 512'
-fi
-
-error() {
-	printf '\033[0;31mpre-commit:\033[0m %s\n' "$1" >&2  # red
-}
-
-# Prints paths of created or modified files being committed.
-changed_files() {
-	git diff-index \
-		--name-only \
-		--cached \
-		--diff-filter=ACMR HEAD \
-		-- "$@"
-}
-
-# Prints file names and checksums (in format <SHA-512>:<filename>) of local
-# sources specified in the APKBUILD ($1).
-apkbuild_local_sources() {
-	apkbuild="$1"
-
-	set +eu
-	. "$apkbuild" || {
-		error "$apkbuild is invalid"
-		return 1
-	}
-	set -eu
-
-	status=0
-	: ${source:=""}
-	for src in $source; do
-		# Skip remote sources.
-		case "$src" in */*) continue;; esac
-
-		echo "$sha512sums" | awk -v src="$src" '
-				{ if ($2 == src) { ok=1; print($2 ":" $1) } }
-				END { if (ok != 1) exit 1 }' || {
-			status=1
-			error "${apkbuild%/*}: file \"$src\" is missing in \$sha512sums (hint: run pmbootstrap checksum)"
-		}
-	done
-
-	return $status
-}
-
-# check if given object is a symlink
-is_symlink() {
-	test "$(git ls-files --stage "$1" | awk '{print $1}')" = "120000"
-}
-
-# Checks that all local sources specified in the APKBUILD file ($1) are
-# available in git tree and checksums are correct.
-check_local_sources() {
-	local apkbuild="$1"
-	local startdir="$2"
-	local status=0
-	local checksum_act checksum_exp content filename line sources
-
-	sources=$(apkbuild_local_sources "$apkbuild")
-	for line in $sources; do
-		filename=${line%%:*}
-		checksum_exp=${line#*:}
-
-		if ! git cat-file -e ":$startdir/$filename" 2>/dev/null; then
-			error "$startdir: missing file \"$filename\""
-			status=1
-			continue
-		fi
-
-		if is_symlink ":$startdir/$filename"; then
-			continue
-		fi
-
-		checksum_act=$(git show ":$startdir/$filename" | sha512sum)
-		if [ "$checksum_act" != "$checksum_exp  -" ]; then
-			local cmd="pmbootstrap checksum $(basename "$startdir")"
-			error "$startdir: bad checksum for file \"$filename\" (hint: run $cmd)"
-			status=1
-		fi
-	done
-
-	return $status
-}
-
-# Checks if the file ($1) being committed is not bigger than FILE_SIZE_LIMIT.
-check_file_size() {
-	local path="$1"
-	local size
-
-	size=$(git cat-file -s ":$path")
-	if [ $size -gt $FILE_SIZE_LIMIT ]; then
-		local size_kb=$(( size / 1024 ))
-
-		error "file \"$path\" is quite big ($(( size / 1024 )) kiB), better put a remote url in source="
-		return 1
-	fi
-}
-
-cleanup() {
-  [ -f "$_staged" ] && rm "$_staged"
-}
-
-trap cleanup EXIT
-
-for apkbuild in $(changed_files '**/APKBUILD'); do
-	_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

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# This hook adds prefix "<repo>/<pkgname>: " to the commit message when
-# committing changes of a single package.
-#
-MSG_FILE="$1"
-SOURCE="$2"
-
-longest_common_prefix() {
-	awk -F/ '
-		(NR == 1) { split($0, prefix); prefix_len = NF }
-		(NR > 1) {
-			for (i = 1; i <= prefix_len; i++) {
-				if (prefix[i] != $i) {
-					prefix_len = i - 1; break
-				}
-			}
-		}
-		(prefix_len == 0) { exit }
-		END {
-			res = prefix[1]
-			for (i = 2; i <= prefix_len; i++) {
-				res = res FS prefix[i]
-			}
-			print(res)
-		}'
-}
-
-prepend_msg() {
-	local prefix="$1"
-
-	printf '%s\n%s\n' "$prefix" "$(cat "$MSG_FILE")" > "$MSG_FILE"
-}
-
-
-# Do nothing if message has been given using -m, template, merge etc.
-[ -z "$SOURCE" ] || exit 0
-
-lcp=$(git diff-index --name-only --cached HEAD | longest_common_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): ";;
-esac
-
-exit 0

.gitignore

@@ -20,6 +20,7 @@ dist/
 downloads/
 eggs/
 .eggs/
+lib/
 lib64/
 parts/
 sdist/

.gitlab-ci.yml

@@ -2,87 +2,75 @@
 
 # global settings
 image: alpine:latest
-before_script: &global_before_scripts
-  - apk upgrade -U
 after_script:
-  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
+  - .ci/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
   - build
-  - autoupdate
-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:
-    # Don't run branch pipeline if an MR is open (only the MR pipeline will run)
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
-      when: never
-    # Run for merge requests
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    # Run scheduled pipeline for autoupdate or manually triggered pipeline
-    - if: $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
+
+# defaults for "only"
+# We need to run the CI jobs in a "merge request specific context", if CI is
+# running in a merge request. Otherwise the environment variable that holds the
+# merge request ID is not available. This means, we must set the "only"
+# variable accordingly - and if we only do it for one job, all other jobs will
+# not get executed. So have the defaults here, and use them in all jobs that
+# should run on both the master branch, and in merge requests.
+# https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
+.only-default: &only-default
+  only:
+    - master
+    - merge_requests
+    - tags
 
 # device documentation
 wiki:
   stage: lint
-  rules:
-    - if: &mr_rule $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/**/*
-        - .gitlab-ci.yml
-        - device/*/device-*/*
+  <<: *only-default
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - device/*/device-*/*
+  before_script:
+    - apk -q add python3
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/wiki.sh
+    - .ci/check_devices_in_wiki.py --booting
 
 # testcases linting
-ruff:
+testcases-linting:
   stage: lint
-  rules:
-    - if: *mr_rule
-      changes:
-        - .ci/*
-        - .ci/*/*
-        - .gitlab-ci.yml
+  <<: *only-default
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - .ci/*
+      - .ci/*/*
+  before_script:
+    - apk -q add py-flake8
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/ruff.sh
+    - flake8 --ignore E501,F401,E722,W504,W605
 
-# shellcheck and various grep checks
-shellcheck-grep:
+# shellcheck
+shellcheck:
   stage: lint
+  <<: *only-default
   image: alpine:edge
-  rules:
-    - if: *mr_rule
+  before_script:
+    - apk -q add shellcheck
   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: *mr_rule
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/ec.sh
 
 # aports checks (generic)
-pytest-commits:
+aports-static:
   stage: lint
-  rules:
-    - if: *mr_rule
+  <<: *only-default
+  before_script:
+    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+    - sh ./install_pmbootstrap.sh pytest
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/pytest.sh
-    - .ci/commits.sh
+    - su pmos -c ".ci/run_testcases.sh"
+    - su pmos -c ".ci/check_changed_aports_versions.py"
   artifacts:
     when: on_failure
     paths:
@@ -91,109 +79,84 @@ pytest-commits:
       - pmbootstrap.cfg
     expire_in: 1 week
 
+distfile-check:
+  stage: lint
+  <<: *only-default
+  before_script:
+    - apk -q add make findutils
+    - wget "https://gitlab.com/postmarketOS/ci-common/-/archive/master/ci-common-master.tar.bz2"
+    - tar -xf ci-common-master.tar.bz2
+    - mv ci-common-master/distfile-check/*.sh ci-common-master/distfile-check/Makefile .
+    - rm -r ci-common-master ci-common-master.tar.bz2
+  script:
+    - make -j999
+
 # APKBUILD linting
 aport-lint:
   stage: lint
-  rules:
-    - if: *mr_rule
+  before_script:
+    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+    - sh ./install_pmbootstrap.sh
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/apkbuild-lint.sh
+    - su pmos -c ".ci/apkbuild-linting.py"
+  only:
+    - merge_requests
   allow_failure: true
 
 # kernel kconfig check
 kernel-kconfig:
   stage: lint
-  rules:
-    - if: *mr_rule
-      changes:
-        - kconfigcheck.toml
-      allow_failure: true
-    - if: *mr_rule
-      changes:
-        - device/*/linux-*/config-*
+  only:
+    refs:
+      - master
+      - merge_requests
+    changes:
+      - device/*/linux-*/config-*
+      - main/linux-*/config-*
+  before_script:
+    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+    - sh ./install_pmbootstrap.sh pytest
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/kconfig.sh
+    - su pmos -c "pmbootstrap kconfig check"
 
 # MR settings
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
   stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  only:
+    - merge_requests
   before_script:
-    - *global_before_scripts
     - apk -q add python3
   script:
-    - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
+    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
     - python3 ./check_mr_settings.py
 
 # build changed aports
 .build:
   stage: build
-  rules:
-    - if: *mr_rule
+  <<: *only-default
   before_script:
-    - *global_before_scripts
-    - .ci/lib/gitlab_prepare_ci.sh
-  after_script:
+    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+    - sh ./install_pmbootstrap.sh
+  script:
+    - .ci/build.sh
     - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
   artifacts:
     expire_in: 1 week
     paths:
       - packages/
-  timeout: 10 h
 
 build-x86_64:
   extends: .build
-  script:
-    - .ci/build-x86_64.sh
 
 build-x86:
   extends: .build
-  script:
-    - .ci/build-x86.sh
 
 build-aarch64:
   extends: .build
-  tags: [arm64]
-  script:
-    - .ci/build-aarch64.sh
 
 build-armv7:
   extends: .build
-  tags: [qemu]
-  script:
-    - .ci/build-armv7.sh
 
 build-armhf:
   extends: .build
-  tags: [qemu]
-  script:
-    - .ci/build-armhf.sh
-
-build-riscv64:
-  extends: .build
-  tags: [qemu]
-  script:
-    - .ci/build-riscv64.sh
-
-auto-update:
-  stage: autoupdate
-  rules:
-    # This variable is set in the scheduled pipeline configuration. It should be a space separated list of
-    # package names to update.
-    - if: $AUTOUPDATE_PACKAGES != null && $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
-  before_script:
-    - .ci/lib/gitlab_prepare_ci.sh
-  script:
-    - .ci/autoupdate.sh "$AUTOUPDATE_PACKAGES"
-  after_script:
-    - .ci/lib/move_logs.sh $CI_PROJECT_DIR
-  artifacts:
-    when: on_failure
-    paths:
-      - log.txt
-      - log_testsuite_pmaports.txt
-      - pmbootstrap.cfg

.gitlab/issue_templates/Change_Kernel_Config.md

@@ -1,31 +0,0 @@
-<!-- Use this template to kick off the discussion for changing one or more
-     related kernel config options.
--->
-
-### Read the fine manual, please :)
-
-- [ ] I have read https://postmarketos.org/kconfig-adjust-multiple
-
-### What benefit does the change have?
-
-### Which option(s) would you like to change?
-
-<!-- Make sure to specify if you would like to enable/disable/set a value. -->
-
-### Did you already test that this works as expected?
-
-<!-- Not required, but recommended. If you did test it, please list which
-     device you have tested it with. -->
-
-### For which kernel configs would you do the change?
-
-<!-- If it makes sense, we encourage to adjust all kernels used by devices in
-     the main and community categories, so devices behave consistently. -->
-
-- [ ] all in main and community
-- [ ] certain SoC(s):
-- [ ] other (please specify):
-
-
-<!-- leave this, so it applies the correct label in gitlab -->
-/label ~"change-kernel-config"

.gitlab/issue_templates/Default.md

@@ -1,66 +0,0 @@
-<!--
-	Thank you for using postmarketOS! In order to speed up process of resolving your issue,
-	we would like you to fill in the following form.
-
-	*** NOTE FOR CONFIDENTIAL ISSUES: ***
-	A lot of people can read confidential pmaports issues! If you want to
-	submit something that only the postmarketOS Core Team can see, write to
-		team@postmarketos.org
-	instead of opening an issue here!
--->
-### Describe your issue
-#### What's the expected behaviour?
-
-#### What's the current behaviour?
-
-#### How to reproduce your issue?
-
-### What device are you using?
-<!--
-	Leave name of your device in vendor-codename format.
-	If unsure, check name in the device package or leave full name of device
-	PinePhone: which revision exactly? See https://wiki.pine64.org/index.php/PinePhone#Hardware_revisions
--->
-
-### On what postmarketOS version did you encounter the issue?
-<!--
-	Replace space inside `[ ]` with `x` to fill the checkbox
--->
-* [ ] edge (`master` branch)
-* [ ] `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
-* [ ] 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
-* [ ] It was preinstalled on my device
-### What's the build date of the image? (in yyyy-mm-dd format)
-<!--
-	Notes:
-		can be left empty if unsure
-		If you downloaded image from images.postmarketos.org, date will be in yyyymmdd format
--->
-
-### Additional information
-<!--
-	logs, etc. -- make use <details> for long listings
-
-	If your device displays an error message on boot or drops to the debug
-	shell, attaching it to your PC with a USB cable may show a removable USB
-	drive. You can drag and drop the .tar.gz file or otherwise upload it
-	here.
-
-	Refer to the README file on the device for more information.
--->

.mrhlpr.json

@@ -1,10 +1,19 @@
 {
     "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+\\)|)$"
+            "^[a-z]+/[a-z-0-9*{}]+: new aport(s|)( \\(MR \\d+\\)|)$",
+            "^[a-z]+/[a-z-0-9*{}]+: pkgrel bump( \\(MR \\d+\\)|)$",
+            "^[a-z-0-9*{}]+: new device \\([^\\)]+\\)( \\(MR \\d+\\)|)",
+            "^[a-z]+/[a-z-0-9*{}]+: upgrade to [0-9\\.a-z\\-_]+( \\(MR \\d+\\)|)$",
+            "^[a-z]+/[a-z-0-9*{}]+: remove( \\(MR \\d+\\)|)$",
+            "^[a-z]+/[a-z-0-9*{}]+: remove, upstreamed( \\(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+\\)|)$"
         ]
     }
 }
+

.well-known/funding-manifest-urls

@@ -1 +0,0 @@
-https://postmarketos.org/funding.json

CODEOWNERS

@@ -1,160 +1,14 @@
 # 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
+device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
+device/*/*-purism-librem5/          @craftyguy @bshah
+main/osk-sdl/                       @craftyguy
+main/postmarketos-ui-plasma-mobile/ @bshah
+temp/u-boot-librem5/                @craftyguy @bshah
+device/community/*-qcom-sdm845      @calebccff @joelselvaraj
+device/community/device-oneplus-enchilada   @calebccff
+device/community/device-oneplus-fajita      @calebccff
+main/ttyescape                      @calebccff
+device/community/*-xiaomi-berrylium @joelselvaraj
+
+# vim: ts=4 sw=4 et

COMMITSTYLE.md

@@ -1,89 +0,0 @@
-# Policy for commits in pmaports
-
-This document defines policy for organising and titling commits for
-inclusion in pmaports.
-
-## Definitions
-
-### Device-specific package
-
-A device-specific package is used to apply configuration and
-functionality specifically for device support in postmarketOS.
-This is in contrast to other packages
-(e.g. main/postmarketos-ui-phosh) in postmarketOS that are used
-for configuring the distribution without consideration of the
-target device.
-
-## General policy
-
-We follow Alpine's aports commit style with some minor exceptions
-and additions. Alpine's commit style can be found here:
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/COMMITSTYLE.md
-
-## Exceptions
-
-### Changes to packages inside of the device directory
-
-While Alpine has the policy of always prefixing package names with
-the name of the repository they are in, in the case of pmaports
-this can lead to excessively long commit titles due to the nested
-subfolders of the device directory. As such, commits changing
-packages inside of the device directory should omit the directory
-prefix, for example:
-
-	device-pine64-pinephone: description of change
-
-Or:
-
-	soc-qcom-msm8996: description of change
-
-If the commit only makes device-specific changes, the
-commit title can opt to use the following format:
-
-	manufacturer-codename: description of change
-
-### Moving devices between categories
-
-As we do not include directory prefixes in device-related commits,
-Alpine's commit style for moving packages does not apply. Instead,
-we do the following:
-
-	manufacturer-codename: move from category to category
-
-For example:
-
-	samsung-m0: move from testing to community
-
-## Additions
-
-### Forking packages from Alpine
-
-Run `pmbootstrap aportgen --fork-alpine package` and modify it.
-
-#### Template
-
- - temp/package-name: fork from Alpine
-
-Example: temp/pulseaudio: fork from Alpine
-
-#### Rules
-
-One commit per forked package.
-
-### Adding new devices
-
-Adding a new device package and optionally also a device-specific
-Linux and firmware package.
-
-#### Template
-
- - manufacturer-codename: new device
-
-Example: htc-m8qlul: new device
-
-#### Rules
-
-If the device has the option of making use of a device-specific
-kernel and/or firmware package, those packages should be included
-in the same commit that adds the device package. One device per
-commit.

README.md

@@ -1,13 +1,8 @@
-# postmarketOS aports repository
-
-This repository contains the APKBUILD files for postmarketOS-specific packages, along with the required patches and scripts, if any.
-
-There are many more packages defined in the [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/) on which these packages depend.
+# postmarketOS aports
 
 Helpful resources:
 * [How to create a package](https://wiki.postmarketos.org/wiki/Create_a_package)
 * [APKBUILD reference](https://wiki.alpinelinux.org/wiki/APKBUILD_Reference)
 * [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/)
 * [Alpine Linux package search](https://pkgs.alpinelinux.org/packages)
-* [postmarketOS package search](https://pkgs.postmarketos.org/packages)
-* [postmarketOS commit style](./COMMITSTYLE.md)
+* [postmarketOS package search](https://pkgs.postmarketos.org/packages)

channels.cfg

@@ -8,38 +8,8 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
-[v24.12]
-description=Latest release / Recommended for best stability
-branch_pmaports=v24.12
-branch_aports=3.21-stable
-mirrordir_alpine=v3.21
-
-[v24.06]
-description=Old release (unsupported)
-branch_pmaports=v24.06
-branch_aports=3.20-stable
-mirrordir_alpine=v3.20
-
-[v23.12]
-description=Old release (unsupported)
-branch_pmaports=v23.12
-branch_aports=3.19-stable
-mirrordir_alpine=v3.19
-
-[v23.06]
-description=Old release (unsupported)
-branch_pmaports=v23.06
-branch_aports=3.18-stable
-mirrordir_alpine=v3.18
-
-[v22.12]
-description=Old release (unsupported)
-branch_pmaports=v22.12
-branch_aports=3.17-stable
-mirrordir_alpine=v3.17
-
 [v22.06]
-description=Old release (unsupported)
+description=Latest release / Recommended for best stability
 branch_pmaports=v22.06
 branch_aports=3.16-stable
 mirrordir_alpine=v3.16

cross/binutils-aarch64/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch

@@ -0,0 +1,55 @@
+From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Tue, 21 Sep 2021 14:53:13 +0000
+Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
+ libraries"
+
+This revert is needed to avoid wrongly tagging objects with the incompatible
+IBM long double ABI, which is not supported by musl and will result in
+linking errors if used.
+
+This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
+---
+ bfd/elf32-tic6x.c |  3 ---
+ ld/ldlang.c       | 10 ++++------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
+index 5754f3cb860..3ad1d612749 100644
+--- a/bfd/elf32-tic6x.c
++++ b/bfd/elf32-tic6x.c
+@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
+ 
+ 	case Tag_ABI_PIC:
+ 	case Tag_ABI_PID:
+-	  /* Don't transfer these tags from dynamic objects.  */
+-	  if ((ibfd->flags & DYNAMIC) != 0)
+-	    continue;
+ 	  if (out_attr[i].i > in_attr[i].i)
+ 	    out_attr[i].i = in_attr[i].i;
+ 	  break;
+diff --git a/ld/ldlang.c b/ld/ldlang.c
+index 37b64c89ee1..f13beaef9d9 100644
+--- a/ld/ldlang.c
++++ b/ld/ldlang.c
+@@ -7071,13 +7071,11 @@ lang_check (void)
+ 		   bfd_printable_name (input_bfd), input_bfd,
+ 		   bfd_printable_name (link_info.output_bfd));
+ 	}
+-
+-      /* If the input bfd has no contents, it shouldn't set the
+-	 private data of the output bfd.  */
+-      else if (!file->flags.just_syms
+-	       && ((input_bfd->flags & DYNAMIC) != 0
+-		   || bfd_count_sections (input_bfd) != 0))
++      else if (bfd_count_sections (input_bfd))
+ 	{
++	  /* If the input bfd has no contents, it shouldn't set the
++	     private data of the output bfd.  */
++
+ 	  bfd_error_handler_type pfn = NULL;
+ 
+ 	  /* If we aren't supposed to warn about mismatched input
+-- 
+2.33.0
+

cross/binutils-aarch64/APKBUILD

@@ -0,0 +1,88 @@
+# Automatically generated aport, do not edit!
+# Generator: pmbootstrap aportgen binutils-aarch64
+# Based on: main/binutils
+
+pkgname=binutils-aarch64
+pkgver=2.38
+pkgrel=3
+pkgdesc="Tools necessary to build programs for aarch64 targets"
+url="https://www.gnu.org/software/binutils/"
+makedepends="gettext libtool autoconf automake bison texinfo"
+arch="x86_64"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
+	binutils-ld-fix-static-linking.patch
+	gold-mips.patch
+	ld-bfd-mips.patch
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	binutils-mips-disable-assert.patch
+	binutils-ppc-fix-machine-options.patch
+	binutils-s390x-1.patch
+	binutils-s390x-2.patch
+	binutils-ppc64le-assertion.patch
+	"
+builddir="$srcdir/binutils-$pkgver"
+
+if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
+	subpackages=""
+fi
+
+if [ "$CHOST" != "$CTARGET" ]; then
+	pkgname="binutils-$CTARGET_ARCH"
+	subpackages=""
+	sonameprefix="binutils:"
+fi
+
+# secfixes:
+#   2.35.2-r1:
+#     - CVE-2021-3487
+#   2.32-r0:
+#     - CVE-2018-19931
+#     - CVE-2018-19932
+#     - CVE-2018-20002
+#     - CVE-2018-20712
+#   2.28-r1:
+#     - CVE-2017-7614
+
+build() {
+	_target="$(arch_to_hostspec aarch64)"
+	"$builddir"/configure \
+		--build="$CBUILD" \
+		--target=$_target \
+		--with-lib-path=/usr/lib \
+		--prefix=/usr \
+		--with-sysroot=/usr/$_target \
+		--enable-ld=default \
+		--enable-gold=yes \
+		--enable-plugins \
+		--enable-deterministic-archives \
+		--disable-multilib \
+		--disable-werror \
+		--disable-nls
+	make
+}
+
+package() {
+	make install DESTDIR="$pkgdir"
+
+	# remove man, info folders
+	rm -rf "$pkgdir"/usr/share
+
+	# remove files that conflict with non-cross binutils
+	rm -rf "$pkgdir"/usr/lib/bfd-plugins
+}
+
+
+
+sha512sums="
+8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
+ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
+314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
+a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
+0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
+63e58f45df3570279cb1ee5215ba3de77de012cac20da9cdd23f86a93890056e1efa397521559cfd0716d5239604607c440d8f4d089d83c98b8fbc1b5c5305f8  binutils-ppc64le-assertion.patch
+"

cross/binutils-aarch64/binutils-ld-fix-static-linking.patch

@@ -0,0 +1,46 @@
+This fixes static linking for our hardened toolchain
+diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
+index e8126cb..9532bfb 100644
+--- a/ld/scripttempl/elf.sc
++++ b/ld/scripttempl/elf.sc
+@@ -235,8 +235,8 @@ test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
+ if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then
+   SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))"
+   SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))"
+-  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors"
+-  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors"
++  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .ctors"
++  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .dtors"
+ else
+   SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))"
+   SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))"
+@@ -270,15 +270,14 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
+        doesn't matter which directory crtbegin.o
+        is in.  */
+ 
+-    KEEP (*crtbegin.o(.ctors))
+-    KEEP (*crtbegin?.o(.ctors))
++    KEEP (*crtbegin*.o(.ctors))
+ 
+     /* We don't want to include the .ctor section from
+        the crtend.o file until after the sorted ctors.
+        The .ctor section from the crtend file contains the
+        end of ctors marker and it must be last */
+ 
+-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))
++    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .ctors))
+     KEEP (*(SORT(.ctors.*)))
+     KEEP (*(.ctors))
+     ${CONSTRUCTING+${CTOR_END}}
+@@ -286,9 +285,8 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
+ DTOR=".dtors        ${CONSTRUCTING-0} :
+   {
+     ${CONSTRUCTING+${DTOR_START}}
+-    KEEP (*crtbegin.o(.dtors))
+-    KEEP (*crtbegin?.o(.dtors))
+-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))
++    KEEP (*crtbegin*.o(.dtors))
++    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
+     KEEP (*(SORT(.dtors.*)))
+     KEEP (*(.dtors))
+     ${CONSTRUCTING+${DTOR_END}}

cross/binutils-aarch64/binutils-mips-disable-assert.patch

@@ -0,0 +1,14 @@
+diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
+--- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
++++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
+@@ -6744,8 +6744,10 @@
+      in the relocation.  */
+   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
+     {
++#if 0
+       BFD_ASSERT (htab->root.target_os == is_vxworks
+ 		  || h->global_got_area != GGA_NONE);
++#endif
+       indx = h->root.dynindx;
+       if (SGI_COMPAT (output_bfd))
+ 	defined_p = h->root.def_regular;

cross/binutils-aarch64/binutils-ppc-fix-machine-options.patch

@@ -0,0 +1,41 @@
+Fix for DARN opcode error during ppc64le compilation of rng-tools which
+occurs with binutils 2.38 but not with binutils 2.37..
+
+https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
+
+
+diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
+--- a/gas/config/tc-ppc.c
++++ b/gas/config/tc-ppc.c
+@@ -5965,7 +5965,30 @@
+ 	     options do not count as a new machine, instead they add
+ 	     to currently selected opcodes.  */
+ 	  ppc_cpu_t machine_sticky = 0;
+-	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
++	  /* Unfortunately, some versions of gcc emit a .machine
++	     directive very near the start of the compiler's assembly
++	     output file.  This is bad because it overrides user -Wa
++	     cpu selection.  Worse, there are versions of gcc that
++	     emit the *wrong* cpu, not even respecting the -mcpu given
++	     to gcc.  See gcc pr101393.  And to compound the problem,
++	     as of 20220222 gcc doesn't pass the correct cpu option to
++	     gas on the command line.  See gcc pr59828.  Hack around
++	     this by keeping sticky options for an early .machine.  */
++	  asection *sec;
++	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
++	    {
++	      segment_info_type *info = seg_info (sec);
++	      /* Are the frags for this section perturbed from their
++	         initial state?  Even .align will count here.  */
++	      if (info != NULL
++	          && (info->frchainP->frch_root != info->frchainP->frch_last
++	              || info->frchainP->frch_root->fr_type != rs_fill
++	              || info->frchainP->frch_root->fr_fix != 0))
++	        break;
++	    }
++	  new_cpu = ppc_parse_cpu (ppc_cpu,
++	                           sec == NULL ? &sticky : &machine_sticky,
++	                           cpu_string);
+ 	  if (new_cpu != 0)
+ 	    ppc_cpu = new_cpu;
+ 	  else

cross/binutils-aarch64/binutils-ppc64le-assertion.patch

@@ -0,0 +1,32 @@
+From 97dd8079feb35456d7b387a594b5e00f7654b3b8 Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Thu, 23 Jun 2022 17:50:30 +0930
+Subject: [PATCH] PowerPC64: fix assertion in ppc_build_one_stub with -Os code
+
+save_res stubs aren't written in ppc_build_one_stub, their offsets
+(which are zero) should not be checked.
+
+	* elf64-ppc.c (ppc_build_one_stub): Don't check save_res offsets.
+
+(cherry picked from commit 570e911f4e533fad33ad5e4e1102929cf7e80bd7)
+---
+ bfd/elf64-ppc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index cb12ed476d8..df503341fe9 100644
+--- a/bfd/elf64-ppc.c
++++ b/bfd/elf64-ppc.c
+@@ -11700,7 +11700,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+   if (htab == NULL)
+     return false;
+ 
+-  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size);
++  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size
++	      || stub_entry->type.main == ppc_stub_save_res);
+   loc = stub_entry->group->stub_sec->contents + stub_entry->stub_offset;
+ 
+   htab->stub_count[stub_entry->type.main - 1] += 1;
+-- 
+2.31.1
+

cross/binutils-aarch64/binutils-s390x-1.patch

@@ -0,0 +1,147 @@
+From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <stli@linux.ibm.com>
+Date: Thu, 28 Apr 2022 14:29:58 +0200
+Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
+
+No dynamic relocs are needed for TLS defined in an executable, the
+TP relative offset is known at link time.
+
+Fixes
+FAIL: Build pr22263-1
+
+bfd/
+	PR ld/22263
+	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
+	instead of bfd_link_pic for TLS.
+	(elf_s390_check_relocs): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(elf_s390_relocate_section): Likewise.
+
+(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
+---
+ bfd/elf64-s390.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
+index e780efa7181..00ee386baab 100644
+--- a/bfd/elf64-s390.c
++++ b/bfd/elf64-s390.c
+@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
+ 			 int r_type,
+ 			 int is_local)
+ {
+-  if (bfd_link_pic (info))
++  if (bfd_link_dll (info))
+     return r_type;
+ 
+   switch (r_type)
+@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	case R_390_TLS_GOTIE20:
+ 	case R_390_TLS_GOTIE64:
+ 	case R_390_TLS_IEENT:
+-	  if (bfd_link_pic (info))
++	  if (bfd_link_dll (info))
+ 	    info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+ 
+@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
+ 	    break;
+ 
+-	  if (!bfd_link_pic (info))
++	  if (!bfd_link_dll (info))
+ 	    break;
+ 	  info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
+      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
+      we can save the dynamic TLS relocation.  */
+   if (h->got.refcount > 0
+-      && !bfd_link_pic (info)
++      && !bfd_link_dll (info)
+       && h->dynindx == -1
+       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
+     {
+@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 
+ 	  /* Relocations for tls literal pool entries.  */
+ 	case R_390_TLS_IE64:
+-	  if (bfd_link_pic (info))
++	  if (bfd_link_dll (info))
+ 	    {
+ 	      Elf_Internal_Rela outrel;
+ 	      asection *sreloc;
+@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  else if (h != NULL)
+ 	    {
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
++	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
+ 		r_type = R_390_TLS_LE64;
+ 	    }
+ 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
+@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	      if (local_got_offsets == NULL)
+ 		abort();
+ 	      off = local_got_offsets[r_symndx];
+-	      if (bfd_link_pic (info))
++	      if (bfd_link_dll (info))
+ 		goto emit_tls_relocs;
+ 	    }
+ 	  else
+ 	    {
+ 	      off = h->got.offset;
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
++	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
+ 		goto emit_tls_relocs;
+ 	    }
+ 
+@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  break;
+ 
+ 	case R_390_TLS_LDM64:
+-	  if (! bfd_link_pic (info))
++	  if (! bfd_link_dll (info))
+ 	    /* The literal pool entry this relocation refers to gets ignored
+ 	       by the optimized code of the local exec model. Do nothing
+ 	       and the value will turn out zero.  */
+@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  continue;
+ 
+ 	case R_390_TLS_LDO64:
+-	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
++	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
+ 	    relocation -= dtpoff_base (info);
+ 	  else
+ 	    /* When converting LDO to LE, we must negate.  */
+@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 
+ 	  if (r_type == R_390_TLS_LOAD)
+ 	    {
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
++	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* IE->LE transition. Four valid cases:
+ 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
+@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 		  invalid_tls_insn (input_bfd, input_section, rel);
+ 		  return false;
+ 		}
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
++	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* GD->LE transition.
+ 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	    }
+ 	  else if (r_type == R_390_TLS_LDCALL)
+ 	    {
+-	      if (!bfd_link_pic (info))
++	      if (!bfd_link_dll (info))
+ 		{
+ 		  unsigned int insn0, insn1;
+ 
+-- 
+2.27.0
+

cross/binutils-aarch64/binutils-s390x-2.patch

@@ -0,0 +1,51 @@
+From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <stli@linux.ibm.com>
+Date: Thu, 28 Apr 2022 14:30:55 +0200
+Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
+
+In static-pie case, there are IRELATIVE-relocs in
+.rela.iplt (htab->irelplt), which will later be grouped
+to .rela.plt.  On s390, the IRELATIVE relocations are
+always located in .rela.iplt - even for non-static case.
+Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
+to the dynamic section even if htab->srelplt->size == 0.
+See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
+
+bfd/
+	elf64-s390.c (elf_s390_size_dynamic_sections):
+	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
+
+(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
+---
+ bfd/elf64-s390.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
+index 00ee386baab..0b851f7ac0e 100644
+--- a/bfd/elf64-s390.c
++++ b/bfd/elf64-s390.c
+@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+       else if (startswith (bfd_section_name (s), ".rela"))
+ 	{
+ 	  if (s->size != 0 && s != htab->elf.srelplt)
+-	    relocs = true;
++	    {
++	      relocs = true;
++	      if (s == htab->elf.irelplt)
++		{
++		  /* In static-pie case, there are IRELATIVE-relocs in
++		     .rela.iplt (htab->irelplt), which will later be grouped
++		     to .rela.plt.  On s390, the IRELATIVE relocations are
++		     always located in .rela.iplt - even for non-static case.
++		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
++		     to the dynamic section even if htab->srelplt->size == 0.
++		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
++		  htab->elf.dt_jmprel_required = true;
++		}
++	    }
+ 
+ 	  /* We use the reloc_count field as a counter if we need
+ 	     to copy relocs into the output file.  */
+-- 
+2.27.0
+

cross/binutils-aarch64/gold-mips.patch

@@ -0,0 +1,39 @@
+# DP: Fix gold on mips64 targets.
+
+gold/
+
+2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
+
+ 
+--- a/gold/configure.tgt
++++ b/gold/configure.tgt
+@@ -153,6 +153,13 @@ aarch64*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
++mips*64*el*-*-*|mips*64*le*-*-*)
++ targ_obj=mips
++ targ_machine=EM_MIPS_RS3_LE
++ targ_size=64
++ targ_big_endian=false
++ targ_extra_big_endian=true
++ ;;
+ mips*el*-*-*|mips*le*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS_RS3_LE
+@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
++mips*64*-*-*)
++ targ_obj=mips
++ targ_machine=EM_MIPS
++ targ_size=64
++ targ_big_endian=true
++ targ_extra_big_endian=false
++ ;;
+ mips*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS

cross/binutils-aarch64/ld-bfd-mips.patch

@@ -0,0 +1,19 @@
+--- ./ld/configure.tgt.orig
++++ ./ld/configure.tgt
+@@ -541,12 +541,12 @@
+ 			;;
+ mips*-*-windiss)	targ_emul=elf32mipswindiss
+ 			;;
+-mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
+-			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
++mips64*el-*-linux-*)	targ_emul=elf64ltsmip
++			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+-mips64*-*-linux-*)	targ_emul=elf32btsmipn32
+-			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
++mips64*-*-linux-*)	targ_emul=elf64btsmip
++			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+ mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/binutils-armhf/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch

@@ -0,0 +1,55 @@
+From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Tue, 21 Sep 2021 14:53:13 +0000
+Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
+ libraries"
+
+This revert is needed to avoid wrongly tagging objects with the incompatible
+IBM long double ABI, which is not supported by musl and will result in
+linking errors if used.
+
+This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
+---
+ bfd/elf32-tic6x.c |  3 ---
+ ld/ldlang.c       | 10 ++++------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
+index 5754f3cb860..3ad1d612749 100644
+--- a/bfd/elf32-tic6x.c
++++ b/bfd/elf32-tic6x.c
+@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
+ 
+ 	case Tag_ABI_PIC:
+ 	case Tag_ABI_PID:
+-	  /* Don't transfer these tags from dynamic objects.  */
+-	  if ((ibfd->flags & DYNAMIC) != 0)
+-	    continue;
+ 	  if (out_attr[i].i > in_attr[i].i)
+ 	    out_attr[i].i = in_attr[i].i;
+ 	  break;
+diff --git a/ld/ldlang.c b/ld/ldlang.c
+index 37b64c89ee1..f13beaef9d9 100644
+--- a/ld/ldlang.c
++++ b/ld/ldlang.c
+@@ -7071,13 +7071,11 @@ lang_check (void)
+ 		   bfd_printable_name (input_bfd), input_bfd,
+ 		   bfd_printable_name (link_info.output_bfd));
+ 	}
+-
+-      /* If the input bfd has no contents, it shouldn't set the
+-	 private data of the output bfd.  */
+-      else if (!file->flags.just_syms
+-	       && ((input_bfd->flags & DYNAMIC) != 0
+-		   || bfd_count_sections (input_bfd) != 0))
++      else if (bfd_count_sections (input_bfd))
+ 	{
++	  /* If the input bfd has no contents, it shouldn't set the
++	     private data of the output bfd.  */
++
+ 	  bfd_error_handler_type pfn = NULL;
+ 
+ 	  /* If we aren't supposed to warn about mismatched input
+-- 
+2.33.0
+

cross/binutils-armhf/APKBUILD

@@ -0,0 +1,88 @@
+# Automatically generated aport, do not edit!
+# Generator: pmbootstrap aportgen binutils-armhf
+# Based on: main/binutils
+
+pkgname=binutils-armhf
+pkgver=2.38
+pkgrel=3
+pkgdesc="Tools necessary to build programs for armhf targets"
+url="https://www.gnu.org/software/binutils/"
+makedepends="gettext libtool autoconf automake bison texinfo"
+arch="x86_64"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
+	binutils-ld-fix-static-linking.patch
+	gold-mips.patch
+	ld-bfd-mips.patch
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	binutils-mips-disable-assert.patch
+	binutils-ppc-fix-machine-options.patch
+	binutils-s390x-1.patch
+	binutils-s390x-2.patch
+	binutils-ppc64le-assertion.patch
+	"
+builddir="$srcdir/binutils-$pkgver"
+
+if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
+	subpackages=""
+fi
+
+if [ "$CHOST" != "$CTARGET" ]; then
+	pkgname="binutils-$CTARGET_ARCH"
+	subpackages=""
+	sonameprefix="binutils:"
+fi
+
+# secfixes:
+#   2.35.2-r1:
+#     - CVE-2021-3487
+#   2.32-r0:
+#     - CVE-2018-19931
+#     - CVE-2018-19932
+#     - CVE-2018-20002
+#     - CVE-2018-20712
+#   2.28-r1:
+#     - CVE-2017-7614
+
+build() {
+	_target="$(arch_to_hostspec armhf)"
+	"$builddir"/configure \
+		--build="$CBUILD" \
+		--target=$_target \
+		--with-lib-path=/usr/lib \
+		--prefix=/usr \
+		--with-sysroot=/usr/$_target \
+		--enable-ld=default \
+		--enable-gold=yes \
+		--enable-plugins \
+		--enable-deterministic-archives \
+		--disable-multilib \
+		--disable-werror \
+		--disable-nls
+	make
+}
+
+package() {
+	make install DESTDIR="$pkgdir"
+
+	# remove man, info folders
+	rm -rf "$pkgdir"/usr/share
+
+	# remove files that conflict with non-cross binutils
+	rm -rf "$pkgdir"/usr/lib/bfd-plugins
+}
+
+
+
+sha512sums="
+8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
+ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
+314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
+a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
+0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
+63e58f45df3570279cb1ee5215ba3de77de012cac20da9cdd23f86a93890056e1efa397521559cfd0716d5239604607c440d8f4d089d83c98b8fbc1b5c5305f8  binutils-ppc64le-assertion.patch
+"

cross/binutils-armhf/binutils-ld-fix-static-linking.patch

@@ -0,0 +1,46 @@
+This fixes static linking for our hardened toolchain
+diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
+index e8126cb..9532bfb 100644
+--- a/ld/scripttempl/elf.sc
++++ b/ld/scripttempl/elf.sc
+@@ -235,8 +235,8 @@ test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
+ if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then
+   SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))"
+   SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))"
+-  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors"
+-  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors"
++  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .ctors"
++  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .dtors"
+ else
+   SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))"
+   SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))"
+@@ -270,15 +270,14 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
+        doesn't matter which directory crtbegin.o
+        is in.  */
+ 
+-    KEEP (*crtbegin.o(.ctors))
+-    KEEP (*crtbegin?.o(.ctors))
++    KEEP (*crtbegin*.o(.ctors))
+ 
+     /* We don't want to include the .ctor section from
+        the crtend.o file until after the sorted ctors.
+        The .ctor section from the crtend file contains the
+        end of ctors marker and it must be last */
+ 
+-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))
++    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .ctors))
+     KEEP (*(SORT(.ctors.*)))
+     KEEP (*(.ctors))
+     ${CONSTRUCTING+${CTOR_END}}
+@@ -286,9 +285,8 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
+ DTOR=".dtors        ${CONSTRUCTING-0} :
+   {
+     ${CONSTRUCTING+${DTOR_START}}
+-    KEEP (*crtbegin.o(.dtors))
+-    KEEP (*crtbegin?.o(.dtors))
+-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))
++    KEEP (*crtbegin*.o(.dtors))
++    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
+     KEEP (*(SORT(.dtors.*)))
+     KEEP (*(.dtors))
+     ${CONSTRUCTING+${DTOR_END}}

cross/binutils-armhf/binutils-mips-disable-assert.patch

@@ -0,0 +1,14 @@
+diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
+--- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
++++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
+@@ -6744,8 +6744,10 @@
+      in the relocation.  */
+   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
+     {
++#if 0
+       BFD_ASSERT (htab->root.target_os == is_vxworks
+ 		  || h->global_got_area != GGA_NONE);
++#endif
+       indx = h->root.dynindx;
+       if (SGI_COMPAT (output_bfd))
+ 	defined_p = h->root.def_regular;

cross/binutils-armhf/binutils-ppc-fix-machine-options.patch

@@ -0,0 +1,41 @@
+Fix for DARN opcode error during ppc64le compilation of rng-tools which
+occurs with binutils 2.38 but not with binutils 2.37..
+
+https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
+
+
+diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
+--- a/gas/config/tc-ppc.c
++++ b/gas/config/tc-ppc.c
+@@ -5965,7 +5965,30 @@
+ 	     options do not count as a new machine, instead they add
+ 	     to currently selected opcodes.  */
+ 	  ppc_cpu_t machine_sticky = 0;
+-	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
++	  /* Unfortunately, some versions of gcc emit a .machine
++	     directive very near the start of the compiler's assembly
++	     output file.  This is bad because it overrides user -Wa
++	     cpu selection.  Worse, there are versions of gcc that
++	     emit the *wrong* cpu, not even respecting the -mcpu given
++	     to gcc.  See gcc pr101393.  And to compound the problem,
++	     as of 20220222 gcc doesn't pass the correct cpu option to
++	     gas on the command line.  See gcc pr59828.  Hack around
++	     this by keeping sticky options for an early .machine.  */
++	  asection *sec;
++	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
++	    {
++	      segment_info_type *info = seg_info (sec);
++	      /* Are the frags for this section perturbed from their
++	         initial state?  Even .align will count here.  */
++	      if (info != NULL
++	          && (info->frchainP->frch_root != info->frchainP->frch_last
++	              || info->frchainP->frch_root->fr_type != rs_fill
++	              || info->frchainP->frch_root->fr_fix != 0))
++	        break;
++	    }
++	  new_cpu = ppc_parse_cpu (ppc_cpu,
++	                           sec == NULL ? &sticky : &machine_sticky,
++	                           cpu_string);
+ 	  if (new_cpu != 0)
+ 	    ppc_cpu = new_cpu;
+ 	  else

cross/binutils-armhf/binutils-ppc64le-assertion.patch

@@ -0,0 +1,32 @@
+From 97dd8079feb35456d7b387a594b5e00f7654b3b8 Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Thu, 23 Jun 2022 17:50:30 +0930
+Subject: [PATCH] PowerPC64: fix assertion in ppc_build_one_stub with -Os code
+
+save_res stubs aren't written in ppc_build_one_stub, their offsets
+(which are zero) should not be checked.
+
+	* elf64-ppc.c (ppc_build_one_stub): Don't check save_res offsets.
+
+(cherry picked from commit 570e911f4e533fad33ad5e4e1102929cf7e80bd7)
+---
+ bfd/elf64-ppc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index cb12ed476d8..df503341fe9 100644
+--- a/bfd/elf64-ppc.c
++++ b/bfd/elf64-ppc.c
+@@ -11700,7 +11700,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+   if (htab == NULL)
+     return false;
+ 
+-  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size);
++  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size
++	      || stub_entry->type.main == ppc_stub_save_res);
+   loc = stub_entry->group->stub_sec->contents + stub_entry->stub_offset;
+ 
+   htab->stub_count[stub_entry->type.main - 1] += 1;
+-- 
+2.31.1
+

cross/binutils-armhf/binutils-s390x-1.patch

@@ -0,0 +1,147 @@
+From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <stli@linux.ibm.com>
+Date: Thu, 28 Apr 2022 14:29:58 +0200
+Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
+
+No dynamic relocs are needed for TLS defined in an executable, the
+TP relative offset is known at link time.
+
+Fixes
+FAIL: Build pr22263-1
+
+bfd/
+	PR ld/22263
+	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
+	instead of bfd_link_pic for TLS.
+	(elf_s390_check_relocs): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(elf_s390_relocate_section): Likewise.
+
+(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
+---
+ bfd/elf64-s390.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
+index e780efa7181..00ee386baab 100644
+--- a/bfd/elf64-s390.c
++++ b/bfd/elf64-s390.c
+@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
+ 			 int r_type,
+ 			 int is_local)
+ {
+-  if (bfd_link_pic (info))
++  if (bfd_link_dll (info))
+     return r_type;
+ 
+   switch (r_type)
+@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	case R_390_TLS_GOTIE20:
+ 	case R_390_TLS_GOTIE64:
+ 	case R_390_TLS_IEENT:
+-	  if (bfd_link_pic (info))
++	  if (bfd_link_dll (info))
+ 	    info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+ 
+@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
+ 	    break;
+ 
+-	  if (!bfd_link_pic (info))
++	  if (!bfd_link_dll (info))
+ 	    break;
+ 	  info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
+      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
+      we can save the dynamic TLS relocation.  */
+   if (h->got.refcount > 0
+-      && !bfd_link_pic (info)
++      && !bfd_link_dll (info)
+       && h->dynindx == -1
+       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
+     {
+@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 
+ 	  /* Relocations for tls literal pool entries.  */
+ 	case R_390_TLS_IE64:
+-	  if (bfd_link_pic (info))
++	  if (bfd_link_dll (info))
+ 	    {
+ 	      Elf_Internal_Rela outrel;
+ 	      asection *sreloc;
+@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  else if (h != NULL)
+ 	    {
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
++	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
+ 		r_type = R_390_TLS_LE64;
+ 	    }
+ 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
+@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	      if (local_got_offsets == NULL)
+ 		abort();
+ 	      off = local_got_offsets[r_symndx];
+-	      if (bfd_link_pic (info))
++	      if (bfd_link_dll (info))
+ 		goto emit_tls_relocs;
+ 	    }
+ 	  else
+ 	    {
+ 	      off = h->got.offset;
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
++	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
+ 		goto emit_tls_relocs;
+ 	    }
+ 
+@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  break;
+ 
+ 	case R_390_TLS_LDM64:
+-	  if (! bfd_link_pic (info))
++	  if (! bfd_link_dll (info))
+ 	    /* The literal pool entry this relocation refers to gets ignored
+ 	       by the optimized code of the local exec model. Do nothing
+ 	       and the value will turn out zero.  */
+@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  continue;
+ 
+ 	case R_390_TLS_LDO64:
+-	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
++	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
+ 	    relocation -= dtpoff_base (info);
+ 	  else
+ 	    /* When converting LDO to LE, we must negate.  */
+@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 
+ 	  if (r_type == R_390_TLS_LOAD)
+ 	    {
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
++	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* IE->LE transition. Four valid cases:
+ 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
+@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 		  invalid_tls_insn (input_bfd, input_section, rel);
+ 		  return false;
+ 		}
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
++	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* GD->LE transition.
+ 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	    }
+ 	  else if (r_type == R_390_TLS_LDCALL)
+ 	    {
+-	      if (!bfd_link_pic (info))
++	      if (!bfd_link_dll (info))
+ 		{
+ 		  unsigned int insn0, insn1;
+ 
+-- 
+2.27.0
+

cross/binutils-armhf/binutils-s390x-2.patch

@@ -0,0 +1,51 @@
+From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <stli@linux.ibm.com>
+Date: Thu, 28 Apr 2022 14:30:55 +0200
+Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
+
+In static-pie case, there are IRELATIVE-relocs in
+.rela.iplt (htab->irelplt), which will later be grouped
+to .rela.plt.  On s390, the IRELATIVE relocations are
+always located in .rela.iplt - even for non-static case.
+Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
+to the dynamic section even if htab->srelplt->size == 0.
+See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
+
+bfd/
+	elf64-s390.c (elf_s390_size_dynamic_sections):
+	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
+
+(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
+---
+ bfd/elf64-s390.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
+index 00ee386baab..0b851f7ac0e 100644
+--- a/bfd/elf64-s390.c
++++ b/bfd/elf64-s390.c
+@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+       else if (startswith (bfd_section_name (s), ".rela"))
+ 	{
+ 	  if (s->size != 0 && s != htab->elf.srelplt)
+-	    relocs = true;
++	    {
++	      relocs = true;
++	      if (s == htab->elf.irelplt)
++		{
++		  /* In static-pie case, there are IRELATIVE-relocs in
++		     .rela.iplt (htab->irelplt), which will later be grouped
++		     to .rela.plt.  On s390, the IRELATIVE relocations are
++		     always located in .rela.iplt - even for non-static case.
++		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
++		     to the dynamic section even if htab->srelplt->size == 0.
++		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
++		  htab->elf.dt_jmprel_required = true;
++		}
++	    }
+ 
+ 	  /* We use the reloc_count field as a counter if we need
+ 	     to copy relocs into the output file.  */
+-- 
+2.27.0
+

cross/binutils-armhf/gold-mips.patch

@@ -0,0 +1,39 @@
+# DP: Fix gold on mips64 targets.
+
+gold/
+
+2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
+
+ 
+--- a/gold/configure.tgt
++++ b/gold/configure.tgt
+@@ -153,6 +153,13 @@ aarch64*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
++mips*64*el*-*-*|mips*64*le*-*-*)
++ targ_obj=mips
++ targ_machine=EM_MIPS_RS3_LE
++ targ_size=64
++ targ_big_endian=false
++ targ_extra_big_endian=true
++ ;;
+ mips*el*-*-*|mips*le*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS_RS3_LE
+@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
++mips*64*-*-*)
++ targ_obj=mips
++ targ_machine=EM_MIPS
++ targ_size=64
++ targ_big_endian=true
++ targ_extra_big_endian=false
++ ;;
+ mips*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS

cross/binutils-armhf/ld-bfd-mips.patch

@@ -0,0 +1,19 @@
+--- ./ld/configure.tgt.orig
++++ ./ld/configure.tgt
+@@ -541,12 +541,12 @@
+ 			;;
+ mips*-*-windiss)	targ_emul=elf32mipswindiss
+ 			;;
+-mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
+-			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
++mips64*el-*-linux-*)	targ_emul=elf64ltsmip
++			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+-mips64*-*-linux-*)	targ_emul=elf32btsmipn32
+-			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
++mips64*-*-linux-*)	targ_emul=elf64btsmip
++			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+ mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/binutils-armv7/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch

@@ -0,0 +1,55 @@
+From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Tue, 21 Sep 2021 14:53:13 +0000
+Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
+ libraries"
+
+This revert is needed to avoid wrongly tagging objects with the incompatible
+IBM long double ABI, which is not supported by musl and will result in
+linking errors if used.
+
+This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
+---
+ bfd/elf32-tic6x.c |  3 ---
+ ld/ldlang.c       | 10 ++++------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
+index 5754f3cb860..3ad1d612749 100644
+--- a/bfd/elf32-tic6x.c
++++ b/bfd/elf32-tic6x.c
+@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
+ 
+ 	case Tag_ABI_PIC:
+ 	case Tag_ABI_PID:
+-	  /* Don't transfer these tags from dynamic objects.  */
+-	  if ((ibfd->flags & DYNAMIC) != 0)
+-	    continue;
+ 	  if (out_attr[i].i > in_attr[i].i)
+ 	    out_attr[i].i = in_attr[i].i;
+ 	  break;
+diff --git a/ld/ldlang.c b/ld/ldlang.c
+index 37b64c89ee1..f13beaef9d9 100644
+--- a/ld/ldlang.c
++++ b/ld/ldlang.c
+@@ -7071,13 +7071,11 @@ lang_check (void)
+ 		   bfd_printable_name (input_bfd), input_bfd,
+ 		   bfd_printable_name (link_info.output_bfd));
+ 	}
+-
+-      /* If the input bfd has no contents, it shouldn't set the
+-	 private data of the output bfd.  */
+-      else if (!file->flags.just_syms
+-	       && ((input_bfd->flags & DYNAMIC) != 0
+-		   || bfd_count_sections (input_bfd) != 0))
++      else if (bfd_count_sections (input_bfd))
+ 	{
++	  /* If the input bfd has no contents, it shouldn't set the
++	     private data of the output bfd.  */
++
+ 	  bfd_error_handler_type pfn = NULL;
+ 
+ 	  /* If we aren't supposed to warn about mismatched input
+-- 
+2.33.0
+

cross/binutils-armv7/APKBUILD

@@ -0,0 +1,88 @@
+# Automatically generated aport, do not edit!
+# Generator: pmbootstrap aportgen binutils-armv7
+# Based on: main/binutils
+
+pkgname=binutils-armv7
+pkgver=2.38
+pkgrel=3
+pkgdesc="Tools necessary to build programs for armv7 targets"
+url="https://www.gnu.org/software/binutils/"
+makedepends="gettext libtool autoconf automake bison texinfo"
+arch="x86_64"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
+	binutils-ld-fix-static-linking.patch
+	gold-mips.patch
+	ld-bfd-mips.patch
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	binutils-mips-disable-assert.patch
+	binutils-ppc-fix-machine-options.patch
+	binutils-s390x-1.patch
+	binutils-s390x-2.patch
+	binutils-ppc64le-assertion.patch
+	"
+builddir="$srcdir/binutils-$pkgver"
+
+if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
+	subpackages=""
+fi
+
+if [ "$CHOST" != "$CTARGET" ]; then
+	pkgname="binutils-$CTARGET_ARCH"
+	subpackages=""
+	sonameprefix="binutils:"
+fi
+
+# secfixes:
+#   2.35.2-r1:
+#     - CVE-2021-3487
+#   2.32-r0:
+#     - CVE-2018-19931
+#     - CVE-2018-19932
+#     - CVE-2018-20002
+#     - CVE-2018-20712
+#   2.28-r1:
+#     - CVE-2017-7614
+
+build() {
+	_target="$(arch_to_hostspec armv7)"
+	"$builddir"/configure \
+		--build="$CBUILD" \
+		--target=$_target \
+		--with-lib-path=/usr/lib \
+		--prefix=/usr \
+		--with-sysroot=/usr/$_target \
+		--enable-ld=default \
+		--enable-gold=yes \
+		--enable-plugins \
+		--enable-deterministic-archives \
+		--disable-multilib \
+		--disable-werror \
+		--disable-nls
+	make
+}
+
+package() {
+	make install DESTDIR="$pkgdir"
+
+	# remove man, info folders
+	rm -rf "$pkgdir"/usr/share
+
+	# remove files that conflict with non-cross binutils
+	rm -rf "$pkgdir"/usr/lib/bfd-plugins
+}
+
+
+
+sha512sums="
+8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
+ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
+314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
+a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
+0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
+63e58f45df3570279cb1ee5215ba3de77de012cac20da9cdd23f86a93890056e1efa397521559cfd0716d5239604607c440d8f4d089d83c98b8fbc1b5c5305f8  binutils-ppc64le-assertion.patch
+"

cross/binutils-armv7/binutils-ld-fix-static-linking.patch

@@ -0,0 +1,46 @@
+This fixes static linking for our hardened toolchain
+diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
+index e8126cb..9532bfb 100644
+--- a/ld/scripttempl/elf.sc
++++ b/ld/scripttempl/elf.sc
+@@ -235,8 +235,8 @@ test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
+ if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then
+   SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))"
+   SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))"
+-  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors"
+-  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors"
++  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .ctors"
++  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .dtors"
+ else
+   SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))"
+   SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))"
+@@ -270,15 +270,14 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
+        doesn't matter which directory crtbegin.o
+        is in.  */
+ 
+-    KEEP (*crtbegin.o(.ctors))
+-    KEEP (*crtbegin?.o(.ctors))
++    KEEP (*crtbegin*.o(.ctors))
+ 
+     /* We don't want to include the .ctor section from
+        the crtend.o file until after the sorted ctors.
+        The .ctor section from the crtend file contains the
+        end of ctors marker and it must be last */
+ 
+-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))
++    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .ctors))
+     KEEP (*(SORT(.ctors.*)))
+     KEEP (*(.ctors))
+     ${CONSTRUCTING+${CTOR_END}}
+@@ -286,9 +285,8 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
+ DTOR=".dtors        ${CONSTRUCTING-0} :
+   {
+     ${CONSTRUCTING+${DTOR_START}}
+-    KEEP (*crtbegin.o(.dtors))
+-    KEEP (*crtbegin?.o(.dtors))
+-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))
++    KEEP (*crtbegin*.o(.dtors))
++    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
+     KEEP (*(SORT(.dtors.*)))
+     KEEP (*(.dtors))
+     ${CONSTRUCTING+${DTOR_END}}

cross/binutils-armv7/binutils-mips-disable-assert.patch

@@ -0,0 +1,14 @@
+diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
+--- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
++++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
+@@ -6744,8 +6744,10 @@
+      in the relocation.  */
+   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
+     {
++#if 0
+       BFD_ASSERT (htab->root.target_os == is_vxworks
+ 		  || h->global_got_area != GGA_NONE);
++#endif
+       indx = h->root.dynindx;
+       if (SGI_COMPAT (output_bfd))
+ 	defined_p = h->root.def_regular;

cross/binutils-armv7/binutils-ppc-fix-machine-options.patch

@@ -0,0 +1,41 @@
+Fix for DARN opcode error during ppc64le compilation of rng-tools which
+occurs with binutils 2.38 but not with binutils 2.37..
+
+https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
+
+
+diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
+--- a/gas/config/tc-ppc.c
++++ b/gas/config/tc-ppc.c
+@@ -5965,7 +5965,30 @@
+ 	     options do not count as a new machine, instead they add
+ 	     to currently selected opcodes.  */
+ 	  ppc_cpu_t machine_sticky = 0;
+-	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
++	  /* Unfortunately, some versions of gcc emit a .machine
++	     directive very near the start of the compiler's assembly
++	     output file.  This is bad because it overrides user -Wa
++	     cpu selection.  Worse, there are versions of gcc that
++	     emit the *wrong* cpu, not even respecting the -mcpu given
++	     to gcc.  See gcc pr101393.  And to compound the problem,
++	     as of 20220222 gcc doesn't pass the correct cpu option to
++	     gas on the command line.  See gcc pr59828.  Hack around
++	     this by keeping sticky options for an early .machine.  */
++	  asection *sec;
++	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
++	    {
++	      segment_info_type *info = seg_info (sec);
++	      /* Are the frags for this section perturbed from their
++	         initial state?  Even .align will count here.  */
++	      if (info != NULL
++	          && (info->frchainP->frch_root != info->frchainP->frch_last
++	              || info->frchainP->frch_root->fr_type != rs_fill
++	              || info->frchainP->frch_root->fr_fix != 0))
++	        break;
++	    }
++	  new_cpu = ppc_parse_cpu (ppc_cpu,
++	                           sec == NULL ? &sticky : &machine_sticky,
++	                           cpu_string);
+ 	  if (new_cpu != 0)
+ 	    ppc_cpu = new_cpu;
+ 	  else

cross/binutils-armv7/binutils-ppc64le-assertion.patch

@@ -0,0 +1,32 @@
+From 97dd8079feb35456d7b387a594b5e00f7654b3b8 Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Thu, 23 Jun 2022 17:50:30 +0930
+Subject: [PATCH] PowerPC64: fix assertion in ppc_build_one_stub with -Os code
+
+save_res stubs aren't written in ppc_build_one_stub, their offsets
+(which are zero) should not be checked.
+
+	* elf64-ppc.c (ppc_build_one_stub): Don't check save_res offsets.
+
+(cherry picked from commit 570e911f4e533fad33ad5e4e1102929cf7e80bd7)
+---
+ bfd/elf64-ppc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index cb12ed476d8..df503341fe9 100644
+--- a/bfd/elf64-ppc.c
++++ b/bfd/elf64-ppc.c
+@@ -11700,7 +11700,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+   if (htab == NULL)
+     return false;
+ 
+-  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size);
++  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size
++	      || stub_entry->type.main == ppc_stub_save_res);
+   loc = stub_entry->group->stub_sec->contents + stub_entry->stub_offset;
+ 
+   htab->stub_count[stub_entry->type.main - 1] += 1;
+-- 
+2.31.1
+

cross/binutils-armv7/binutils-s390x-1.patch

@@ -0,0 +1,147 @@
+From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <stli@linux.ibm.com>
+Date: Thu, 28 Apr 2022 14:29:58 +0200
+Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
+
+No dynamic relocs are needed for TLS defined in an executable, the
+TP relative offset is known at link time.
+
+Fixes
+FAIL: Build pr22263-1
+
+bfd/
+	PR ld/22263
+	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
+	instead of bfd_link_pic for TLS.
+	(elf_s390_check_relocs): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(elf_s390_relocate_section): Likewise.
+
+(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
+---
+ bfd/elf64-s390.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
+index e780efa7181..00ee386baab 100644
+--- a/bfd/elf64-s390.c
++++ b/bfd/elf64-s390.c
+@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
+ 			 int r_type,
+ 			 int is_local)
+ {
+-  if (bfd_link_pic (info))
++  if (bfd_link_dll (info))
+     return r_type;
+ 
+   switch (r_type)
+@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	case R_390_TLS_GOTIE20:
+ 	case R_390_TLS_GOTIE64:
+ 	case R_390_TLS_IEENT:
+-	  if (bfd_link_pic (info))
++	  if (bfd_link_dll (info))
+ 	    info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+ 
+@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
+ 	    break;
+ 
+-	  if (!bfd_link_pic (info))
++	  if (!bfd_link_dll (info))
+ 	    break;
+ 	  info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
+      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
+      we can save the dynamic TLS relocation.  */
+   if (h->got.refcount > 0
+-      && !bfd_link_pic (info)
++      && !bfd_link_dll (info)
+       && h->dynindx == -1
+       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
+     {
+@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 
+ 	  /* Relocations for tls literal pool entries.  */
+ 	case R_390_TLS_IE64:
+-	  if (bfd_link_pic (info))
++	  if (bfd_link_dll (info))
+ 	    {
+ 	      Elf_Internal_Rela outrel;
+ 	      asection *sreloc;
+@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  else if (h != NULL)
+ 	    {
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
++	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
+ 		r_type = R_390_TLS_LE64;
+ 	    }
+ 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
+@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	      if (local_got_offsets == NULL)
+ 		abort();
+ 	      off = local_got_offsets[r_symndx];
+-	      if (bfd_link_pic (info))
++	      if (bfd_link_dll (info))
+ 		goto emit_tls_relocs;
+ 	    }
+ 	  else
+ 	    {
+ 	      off = h->got.offset;
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
++	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
+ 		goto emit_tls_relocs;
+ 	    }
+ 
+@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  break;
+ 
+ 	case R_390_TLS_LDM64:
+-	  if (! bfd_link_pic (info))
++	  if (! bfd_link_dll (info))
+ 	    /* The literal pool entry this relocation refers to gets ignored
+ 	       by the optimized code of the local exec model. Do nothing
+ 	       and the value will turn out zero.  */
+@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  continue;
+ 
+ 	case R_390_TLS_LDO64:
+-	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
++	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
+ 	    relocation -= dtpoff_base (info);
+ 	  else
+ 	    /* When converting LDO to LE, we must negate.  */
+@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 
+ 	  if (r_type == R_390_TLS_LOAD)
+ 	    {
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
++	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* IE->LE transition. Four valid cases:
+ 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
+@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 		  invalid_tls_insn (input_bfd, input_section, rel);
+ 		  return false;
+ 		}
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
++	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* GD->LE transition.
+ 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	    }
+ 	  else if (r_type == R_390_TLS_LDCALL)
+ 	    {
+-	      if (!bfd_link_pic (info))
++	      if (!bfd_link_dll (info))
+ 		{
+ 		  unsigned int insn0, insn1;
+ 
+-- 
+2.27.0
+

cross/binutils-armv7/binutils-s390x-2.patch

@@ -0,0 +1,51 @@
+From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <stli@linux.ibm.com>
+Date: Thu, 28 Apr 2022 14:30:55 +0200
+Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
+
+In static-pie case, there are IRELATIVE-relocs in
+.rela.iplt (htab->irelplt), which will later be grouped
+to .rela.plt.  On s390, the IRELATIVE relocations are
+always located in .rela.iplt - even for non-static case.
+Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
+to the dynamic section even if htab->srelplt->size == 0.
+See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
+
+bfd/
+	elf64-s390.c (elf_s390_size_dynamic_sections):
+	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
+
+(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
+---
+ bfd/elf64-s390.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
+index 00ee386baab..0b851f7ac0e 100644
+--- a/bfd/elf64-s390.c
++++ b/bfd/elf64-s390.c
+@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+       else if (startswith (bfd_section_name (s), ".rela"))
+ 	{
+ 	  if (s->size != 0 && s != htab->elf.srelplt)
+-	    relocs = true;
++	    {
++	      relocs = true;
++	      if (s == htab->elf.irelplt)
++		{
++		  /* In static-pie case, there are IRELATIVE-relocs in
++		     .rela.iplt (htab->irelplt), which will later be grouped
++		     to .rela.plt.  On s390, the IRELATIVE relocations are
++		     always located in .rela.iplt - even for non-static case.
++		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
++		     to the dynamic section even if htab->srelplt->size == 0.
++		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
++		  htab->elf.dt_jmprel_required = true;
++		}
++	    }
+ 
+ 	  /* We use the reloc_count field as a counter if we need
+ 	     to copy relocs into the output file.  */
+-- 
+2.27.0
+

cross/binutils-armv7/gold-mips.patch

@@ -0,0 +1,39 @@
+# DP: Fix gold on mips64 targets.
+
+gold/
+
+2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
+
+ 
+--- a/gold/configure.tgt
++++ b/gold/configure.tgt
+@@ -153,6 +153,13 @@ aarch64*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
++mips*64*el*-*-*|mips*64*le*-*-*)
++ targ_obj=mips
++ targ_machine=EM_MIPS_RS3_LE
++ targ_size=64
++ targ_big_endian=false
++ targ_extra_big_endian=true
++ ;;
+ mips*el*-*-*|mips*le*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS_RS3_LE
+@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
++mips*64*-*-*)
++ targ_obj=mips
++ targ_machine=EM_MIPS
++ targ_size=64
++ targ_big_endian=true
++ targ_extra_big_endian=false
++ ;;
+ mips*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS

cross/binutils-armv7/ld-bfd-mips.patch

@@ -0,0 +1,19 @@
+--- ./ld/configure.tgt.orig
++++ ./ld/configure.tgt
+@@ -541,12 +541,12 @@
+ 			;;
+ mips*-*-windiss)	targ_emul=elf32mipswindiss
+ 			;;
+-mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
+-			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
++mips64*el-*-linux-*)	targ_emul=elf64ltsmip
++			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+-mips64*-*-linux-*)	targ_emul=elf32btsmipn32
+-			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
++mips64*-*-linux-*)	targ_emul=elf64btsmip
++			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+ mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/busybox-static-aarch64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-aarch64
-pkgver=1.37.0
-pkgrel=14
+pkgver=1.35.0
+pkgrel=18
 
 _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
+2dd9617a1e0938a692acdb5c0ed943197f100a87274df96bc3ed7f77e0a5713d4e8c9642a666bb0391c5ceebc50960cf4ef9a467c813d6f5a149c6bd89b2dc3a  busybox-static-1.35.0-r18-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armhf
-pkgver=1.37.0
-pkgrel=14
+pkgver=1.35.0
+pkgrel=18
 
 _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
+35461f4429030b5841c6cb071aac692f42f4935c5b94f80b848c8a9ce217b25370f9bb0df167f6d597535708d3c1d25b8e12d6d9b57588c4291facbc7681dd03  busybox-static-1.35.0-r18-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armv7
-pkgver=1.37.0
-pkgrel=14
+pkgver=1.35.0
+pkgrel=18
 
 _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
+e91b9f5bd8e21525c471aeaf83a4fdc86098e8245b2d4119a3e6717d3402e9e134cf8cae6df8b076f0020eaf8a4eda68cfa417d4319ba5be4b32daf480133dd4  busybox-static-1.35.0-r18-armv7-edge.apk
 "

cross/ccache-cross-symlinks/APKBUILD

@@ -5,7 +5,7 @@
 
 pkgname=ccache-cross-symlinks
 pkgver=3
-pkgrel=1
+pkgrel=0
 pkgdesc="Enable ccache for cross-compilers with symlinks"
 url="https://ccache.samba.org/"
 arch="noarch"
@@ -15,7 +15,7 @@ options="!check"
 
 package() {
 	# Keep in sync with pmb.config.build_device_architectures
-	local _archs="armhf armv7 aarch64 x86_64 x86 riscv64"
+	local _archs="armhf armv7 aarch64 x86_64 x86"
 
 	local _bins="c++ cc cpp g++ gcc clang clang++"
 	mkdir -p "$pkgdir/usr/lib/ccache/bin"

cross/crossdirect/APKBUILD

@@ -1,6 +1,3 @@
-# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
-# https://wiki.postmarketos.org/wiki/Pmbootstrap:_Cross_Compiling
-#
 # Wrapper for the "crossdirect" compilation method.
 # pmbootstrap mounts the native chroot in the foreign arch (e.g. armhf) chroot
 # as /native. This package gets installed into the native chroot, and creates
@@ -19,19 +16,19 @@
 # version is implemented as simple shell wrappers.
 
 pkgname=crossdirect
-pkgver=5.2.0
-pkgrel=1
+pkgver=4
+pkgrel=3
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
 arch="all"
 license="MIT"
 options="!check"
-source="cargo.sh crossdirect.c rustc.sh rust-qemu-linker.sh"
+source="crossdirect.c rustc.sh rust-qemu-linker.sh"
 
 build() {
 	cd "$srcdir"
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64 riscv64"
+	_archs="x86_64 armhf armv7 aarch64"
 	for _arch in $_archs; do
 		[ "$_arch" == "$CARCH" ] && continue
 		_hostspec="$(arch_to_hostspec $_arch)"
@@ -43,19 +40,20 @@ build() {
 			-Werror \
 			-DHOSTSPEC="\"$_hostspec\"" \
 			crossdirect.c
+
+		# rustc
+		sed "s/@ARCH@/$_arch/g" rustc.sh >rustc-"$_arch"
 	done
 }
 
 package() {
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64 riscv64"
+	_archs="x86_64 armhf armv7 aarch64"
 	_bins="c++ cc cpp g++ gcc clang clang++"
 
-	# Rust wrappers
+	# Rust: qemu-linker
 	install -Dm755 "$srcdir/rust-qemu-linker.sh" \
 		"$pkgdir/usr/lib/crossdirect/rust-qemu-linker"
-	install -Dm755 "$srcdir/cargo.sh" "$pkgdir/usr/lib/crossdirect/cargo.sh"
-	install -Dm755 "$srcdir/rustc.sh" "$pkgdir/usr/lib/crossdirect/rustc.sh"
 
 	# Iterate over architectures
 	for _arch in $_archs; do
@@ -75,14 +73,10 @@ package() {
 			ln -s "crossdirect-$_arch" "$_hostspec-$_bin"
 		done
 
-		ln -s ../cargo.sh cargo
-		ln -s ../rustc.sh rustc
+		# Rust: arch-specific rustc wrapper
+		install -Dm755 "$srcdir/rustc-$_arch" "$_bindir/rustc"
 	done
 }
-
-sha512sums="
-0f4b48f250425dc57f63955fc8b38477d23db793bee367c3fbe03c3d2a559ba576434d07518310db4cae9d90d501af4051b80038b10fae94b980e537fc9374ad  cargo.sh
-b2e602b7fc95ed403d29f0d754879d5f773c39ee33e726bb10cff17b3c088406dac84f2ca6d8ad563c64370007d98af805d6ee9cd4a06fe3d4c61c0cb90c5c0c  crossdirect.c
-de2aa6929bbff5db9132673e667f4525b333d062cb1f7a0597dd924de9e5c7215a9f8e2e6263b6fb5ace06f2c4b64f4ebfd0ede9b78add07c2cd08ec8613e98f  rustc.sh
-ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh
-"
+sha512sums="500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
+6be16ba88720e628a3ecc8fa53f8e7a21d2af268b0509745d989139874d6b94b640bfcff09575eaa19073810be6ef91169c1f83e94f5cf8e6819f2670d9408de  rustc.sh
+ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh"

cross/crossdirect/cargo.sh

@@ -1,66 +0,0 @@
-#!/bin/sh -e
-
-if [ -n "$CROSSDIRECT_DEBUG" ]; then
-	set -x
-fi
-
-native_version=$(LD_LIBRARY_PATH=/native/lib:/native/usr/lib /native/usr/bin/rustc -V)
-target_version=$(/usr/bin/rustc -V)
-
-if [ "$target_version" != "$native_version" ]; then
-	echo "ERROR: crossdirect: rustc version mismatch between native and build chroot. Please update your chroots and try again." >&2
-	exit 1
-fi
-
-triplet=$(/usr/bin/rustc -vV | sed -n 's/host: //p')
-cmd=$1
-shift
-
-case "$cmd" in
-	build|test|run)
-		;;
-	*)
-		echo "WARNING: crossdirect: 'cargo $cmd $*' command not supported, running in QEMU (slow!)" >&2
-		export PATH="$(echo "$PATH" | sed 's,/native/usr/lib/crossdirect/[^:]*:,,')"
-		exec /usr/bin/cargo "$cmd" "$@"
-		;;
-esac
-
-target_dir=${CARGO_TARGET_DIR:-target}
-target_already_specified=${CARGO_BUILD_TARGET:+1}
-
-if [ -z "$target_specified" ]; then
-	for arg in "$@"; do
-		if [ "$arg_target_dir" = 1 ]; then
-			target_dir=$arg
-			arg_target_dir=0
-		fi
-		case "$arg" in
-			--target|--target=*)
-				target_already_specified=1
-				break
-				;;
-			--target-dir)
-				arg_target_dir=1
-				;;
-			--target-dir=*)
-				target_dir=${arg##--target-dir=}
-				;;
-		esac
-	done
-fi
-
-if [ -n "$target_already_specified" ]; then
-	exec /usr/bin/cargo "$cmd" "$@"
-fi
-
-/usr/bin/cargo "$cmd" --target=$triplet "$@"
-
-# copy target/$triplet/{release,debug,...} to target/{release,debug,...}
-if [ -d "$target_dir/$triplet" ]; then
-	for dir in "$target_dir/$triplet"/*/; do
-		build=$(basename "$dir")
-		rm -rf "$target_dir/$build"
-		cp -r "$target_dir/$triplet/$build" "$target_dir/$build"
-	done
-fi

cross/crossdirect/crossdirect.c

@@ -43,8 +43,9 @@
 
 void exit_userfriendly()
 {
-	fprintf(stderr, "Please report this at: https://gitlab.postmarketos.org/postmarketOS/pmaports/issues\n");
-	fprintf(stderr, "As a workaround, you can compile without crossdirect with options=\"!pmb:crossdirect\".\n");
+	fprintf(stderr, "Please report this at: https://gitlab.com/postmarketOS/pmaports/issues\n");
+	fprintf(stderr, "As a workaround, you can compile without crossdirect.\n");
+	fprintf(stderr, "See 'pmbootstrap -h' for related options.\n");
 	exit(1);
 }
 
@@ -117,17 +118,11 @@ int main(int argc, char **argv)
 		NULL };
 	char *ldPreload = getenv("LD_PRELOAD");
 	if (ldPreload) {
-		if (strstr(ldPreload, "libfakeroot.so")) {
-			fprintf(stderr, "============================================================================================\n");
-			fprintf(stderr, "ERROR: crossdirect was called with: LD_PRELOAD=%s\n", ldPreload);
-			fprintf(stderr, "This means your package tried to run a compiler during package().\n");
-			fprintf(stderr, "This is not supported by crossdirect, and usually not a good idea.\n");
-			fprintf(stderr, "* Try to fix your APKBUILD so it does not run the compiler during package(), only in build()\n");
-			fprintf(stderr, "  * If you're using 'meson install', try to add '--no-rebuild'\n");
-			fprintf(stderr, "* If this is not possible, you can work around it by setting options=\"!pmb:crossdirect\"\n");
-			fprintf(stderr, "  (compilation will be slower!)\n");
-			fprintf(stderr, "============================================================================================\n");
-			exit(1);
+		if (strcmp(ldPreload, "/usr/lib/libfakeroot.so") == 0) {
+			env[0] = "LD_PRELOAD=/native/usr/lib/libfakeroot.so";
+		} else {
+			fprintf(stderr, "ERROR: crossdirect: can't handle LD_PRELOAD: %s\n", ldPreload);
+			exit_userfriendly();
 		}
 	}
 

cross/crossdirect/rustc.sh

@@ -1,38 +1,48 @@
 #!/bin/sh -e
 
-if [ -n "$CROSSDIRECT_DEBUG" ]; then
-	set -x
-fi
+rust_triplet() {
+	# Find the triplets in Alpine's rust APKBUILD or with:
+	# pmbootstrap chroot -barmhf --add=rust -- ls /usr/lib/rustlib
+	case "$1" in
+		x86_64)
+			echo "x86_64-alpine-linux-musl"
+			;;
+		armhf)
+			echo "armv6-alpine-linux-musleabihf"
+			;;
+		armv7)
+			echo "armv7-alpine-linux-musleabihf"
+			;;
+		aarch64)
+			echo "aarch64-alpine-linux-musl"
+			;;
+		*)
+			echo "ERROR: don't know the rust triple for $1!" >&2
+			exit 1
+			;;
+	esac
+}
 
-# return the correct host architecture when cargo requests it
-if [ "$*" = "-vV" ] || [ "$*" = "-V" ]; then
-	exec /usr/bin/rustc "$*"
-fi
+arch="@ARCH@" # filled in by APKBUILD
 
-# pmbootstrap installs sccache when building a rust program, unless --no-ccache
-# is set. In that case it also sets CCACHE_DISABLE.
-SCCACHE=/native/usr/bin/sccache
-if ! [ -e "$SCCACHE" ] || [ -n "$CCACHE_DISABLE" ]; then
-	SCCACHE=""
-fi
-
-# We expect the right target to be set in the arguments if compiling for the
-# target architecture. Our cargo wrapper passes the right "--target" argument
-# automatically. If no target is provided, this is probably a macro or a
-# build script, so it should be compiled for the native architecture.
-if echo "$*" | grep -qFe "--target"; then
-	# Not using sccache when building for foreign architecture, as it
-	# doesn't cache the output with "Non-cacheable reasons: --sysroot"
-	LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
-		/native/usr/bin/rustc \
+if ! LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
+	/native/usr/bin/rustc \
 		-Clinker=/native/usr/lib/crossdirect/rust-qemu-linker \
+		--target=$(rust_triplet "$arch") \
 		--sysroot=/usr \
-		"$@"
-else
-	PATH=/native/usr/bin:/native/bin \
-	LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
-		$SCCACHE \
-		/native/usr/bin/rustc \
-		-Clink-arg=-Wl,-rpath,/native/lib:/native/usr/lib \
-		"$@"
+		"$@"; then
+	echo "---" >&2
+	echo "WARNING: crossdirect: cross compiling with rustc failed, trying"\
+		"again with rustc + qemu" >&2
+	echo "---" >&2
+	# Usually the crossdirect approach works; however, when passing
+	# --extern to rustc with a dynamic library (.so), it fails with an
+	# error like 'can't find crate for `serde_derive`' (although the crate
+	# does exist). I think it fails to parse the metadata of the so file
+	# for some reason. We probably need to adjust rustc's
+	# librustc_metadata/locator.rs or something (and upstream that
+	# change!), but I've spent enough time on this already. Let's simply
+	# fall back to compiling in qemu in the very few cases where this is
+	# necessary.
+	/usr/bin/rustc "$@"
 fi

cross/gcc-aarch64/0001-posix_memalign.patch

@@ -1,14 +1,14 @@
-From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
+From feb04e50d907683385cc4dc0163cf1d82258073a Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 01/35] posix_memalign
+Subject: [PATCH] posix_memalign
 
 ---
  gcc/config/i386/pmm_malloc.h | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 3527283693b..c4071b64b53 100644
+index 1b0bfe37852..d7b2b19bb3c 100644
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
 @@ -27,12 +27,13 @@
@@ -38,5 +38,5 @@ index 3527283693b..c4071b64b53 100644
    else
      return NULL;
 -- 
-2.41.0
+2.35.1
 

cross/gcc-aarch64/0002-gcc-poison-system-directories.patch

@@ -1,7 +1,7 @@
-From 4fa620d8c3e6730211bfb071eb4c817320491bd0 Mon Sep 17 00:00:00 2001
+From d64825212f807435a4b2f8e068c0f65195c8e2e6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 29 Mar 2013 08:59:00 +0400
-Subject: [PATCH 02/35] gcc: poison-system-directories
+Subject: [PATCH] gcc: poison-system-directories
 
 Add /sw/include and /opt/include based on the original
 zecke-no-host-includes.patch patch.  The original patch checked for
@@ -21,15 +21,15 @@ Upstream-Status: Pending
  gcc/configure       | 16 ++++++++++++++++
  gcc/configure.ac    | 10 ++++++++++
  gcc/doc/invoke.texi |  9 +++++++++
- gcc/gcc.cc          |  2 ++
- gcc/incpath.cc      | 21 +++++++++++++++++++++
+ gcc/gcc.c           |  2 ++
+ gcc/incpath.c       | 21 +++++++++++++++++++++
  7 files changed, 68 insertions(+)
 
 diff --git a/gcc/common.opt b/gcc/common.opt
-index 862c474d3c8..64c4277c991 100644
+index a75b44ee47e..d15105a73f3 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -711,6 +711,10 @@ Wreturn-local-addr
+@@ -683,6 +683,10 @@ Wreturn-local-addr
  Common Var(warn_return_local_addr) Init(1) Warning
  Warn about returning a pointer/reference to a local or temporary variable.
  
@@ -41,10 +41,10 @@ index 862c474d3c8..64c4277c991 100644
  Common Var(warn_shadow) Warning
  Warn when one variable shadows another.  Same as -Wshadow=global.
 diff --git a/gcc/config.in b/gcc/config.in
-index 4cad077bfbe..0679fbbf4c6 100644
+index 2de5a463315..059c818c895 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -236,6 +236,12 @@
+@@ -218,6 +218,12 @@
  #endif
  
  
@@ -58,10 +58,10 @@ index 4cad077bfbe..0679fbbf4c6 100644
     optimizer and back end) to be checked for dynamic type safety at runtime.
     This is quite expensive. */
 diff --git a/gcc/configure b/gcc/configure
-index c7b26d1927d..8c46369f73f 100755
+index 708328e1670..4b977e313b5 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -1026,6 +1026,7 @@ enable_maintainer_mode
+@@ -1020,6 +1020,7 @@ enable_maintainer_mode
  enable_link_mutex
  enable_link_serialization
  enable_version_specific_runtime_libs
@@ -69,7 +69,7 @@ index c7b26d1927d..8c46369f73f 100755
  enable_plugin
  enable_host_shared
  enable_libquadmath_support
-@@ -1788,6 +1789,8 @@ Optional Features:
+@@ -1782,6 +1783,8 @@ Optional Features:
    --enable-version-specific-runtime-libs
                            specify that runtime libraries should be installed
                            in a compiler-specific directory
@@ -78,7 +78,7 @@ index c7b26d1927d..8c46369f73f 100755
    --enable-plugin         enable plugin support
    --enable-host-shared    build host code as shared libraries
    --disable-libquadmath-support
-@@ -31753,6 +31756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -31790,6 +31793,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
  fi
  
  
@@ -99,10 +99,10 @@ index c7b26d1927d..8c46369f73f 100755
  
  
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 09082e8ccae..5504bf6eb01 100644
+index df1c9cc3200..5461bab88a9 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7292,6 +7292,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -7311,6 +7311,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
                  [specify that runtime libraries should be
                   installed in a compiler-specific directory])])
  
@@ -120,49 +120,49 @@ index 09082e8ccae..5504bf6eb01 100644
  AC_SUBST(subdirs)
  AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index af0e5933fdb..b6731a4673c 100644
+index cf536a15116..7d3f1ccddf3 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
- -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded
- -Wparentheses  -Wno-pedantic-ms-format
- -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast
-+-Wno-poison-system-directories
- -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
- -Wrestrict  -Wno-return-local-addr  -Wreturn-type
- -Wno-scalar-storage-order  -Wsequence-point
-@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded @gol
+ -Wparentheses  -Wno-pedantic-ms-format @gol
+ -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast @gol
++-Wno-poison-system-directories @gol
+ -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
+ -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
+ -Wno-scalar-storage-order  -Wsequence-point @gol
+@@ -7728,6 +7729,14 @@ made up of data only and thus requires no special treatment.  But, for
  most targets, it is made up of code and thus requires the stack to be
  made executable in order for the program to work properly.
  
-+@opindex Wno-poison-system-directories
 +@item -Wno-poison-system-directories
++@opindex Wno-poison-system-directories
 +Do not warn for @option{-I} or @option{-L} options using system
 +directories such as @file{/usr/include} when cross compiling.  This
 +option is intended for use in chroot environments when such
 +directories contain the correct headers and libraries for the target
 +system rather than the host.
 +
+ @item -Wfloat-equal
  @opindex Wfloat-equal
  @opindex Wno-float-equal
- @item -Wfloat-equal
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 16bb07f2cdc..33b56e721d2 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1177,6 +1187,8 @@ proper position among the other output files.  */
-    "-z now " \
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 8ba410c9e17..a83ba34ac4b 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -1152,6 +1152,8 @@ proper position among the other output files.  */
+    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
     "%X %{o*} %{e*} %{N} %{n} %{r}\
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
 +    %{Wno-poison-system-directories:--no-poison-system-directories} \
 +    %{Werror=poison-system-directories:--error-poison-system-directories} \
-     %{static|no-pie|static-pie:} %@{L*} %(link_libgcc) " \
+     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
      VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
      %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
-diff --git a/gcc/incpath.cc b/gcc/incpath.cc
-index 4d44321183f..0f3f071b44c 100644
---- a/gcc/incpath.cc
-+++ b/gcc/incpath.cc
+diff --git a/gcc/incpath.c b/gcc/incpath.c
+index 446d280321d..fbfc0ce03b8 100644
+--- a/gcc/incpath.c
++++ b/gcc/incpath.c
 @@ -26,6 +26,7 @@
  #include "intl.h"
  #include "incpath.h"
@@ -171,7 +171,7 @@ index 4d44321183f..0f3f071b44c 100644
  
  /* Microsoft Windows does not natively support inodes.
     VMS has non-numeric inodes.  */
-@@ -399,6 +400,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
+@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
  	}
        fprintf (stderr, _("End of search list.\n"));
      }
@@ -199,5 +199,5 @@ index 4d44321183f..0f3f071b44c 100644
  
  /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.41.0
+2.35.1
 

cross/gcc-aarch64/0003-specs-turn-on-Wl-z-now-by-default.patch

@@ -1,7 +1,7 @@
-From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
+From 9675297b3a46b65a54e9df97f26ea445d53c67c6 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH 03/35] specs: turn on -Wl,-z,now by default
+Subject: [PATCH] specs: turn on -Wl,-z,now by default
 
 Previously, we also used to turn on -z relro here, but we now build
 binutils with --enable-relro, which is functionally equivalent.
@@ -10,28 +10,28 @@ Binutils does not appear to have a similar option for enabling -z
 now by default.
 ---
  gcc/doc/invoke.texi | 3 +++
- gcc/gcc.cc          | 1 +
+ gcc/gcc.c           | 1 +
  2 files changed, 4 insertions(+)
 
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index b6731a4673c..f393c7846c6 100644
+index 7d3f1ccddf3..485d2d6b742 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -15921,6 +15921,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
  linker.  When using the GNU linker, you can also get the same effect with
  @option{-Wl,-Map=output.map}.
  
 +NOTE: In Alpine Linux, for LDFLAGS, the option
 +@option{-Wl,-z,now} is used.  To disable, use @option{-Wl,-z,nonow}.
 +
- @opindex u
  @item -u @var{symbol}
+ @opindex u
  Pretend the symbol @var{symbol} is undefined, to force linking of
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 33b56e721d2..f82fae23c22 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1144,6 +1144,7 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index a83ba34ac4b..faf9ce76b3d 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -1150,6 +1150,7 @@ proper position among the other output files.  */
     "%{flto|flto=*:%<fcompare-debug*} \
      %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
     "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
@@ -40,5 +40,5 @@ index 33b56e721d2..f82fae23c22 100644
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
      %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.41.0
+2.35.1
 

cross/gcc-aarch64/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch

@@ -1,19 +1,19 @@
-From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
+From 4eb1b3849325b77c4cb66b675119299de35125bb Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
-Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
- ObjC, ObjC++, if the optimization level is > 0
+Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
+ ObjC++, if the optimization level is > 0
 
 ---
- gcc/c-family/c-cppbuiltin.cc | 4 ++++
- gcc/doc/invoke.texi          | 6 ++++++
+ gcc/c-family/c-cppbuiltin.c | 4 ++++
+ gcc/doc/invoke.texi         | 6 ++++++
  2 files changed, 10 insertions(+)
 
-diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc
-index 5d64625fcd7..868d69506e4 100644
---- a/gcc/c-family/c-cppbuiltin.cc
-+++ b/gcc/c-family/c-cppbuiltin.cc
-@@ -1546,6 +1546,10 @@ c_cpp_builtins (cpp_reader *pfile)
+diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
+index 11e015bdb87..de8b7bf246f 100644
+--- a/gcc/c-family/c-cppbuiltin.c
++++ b/gcc/c-family/c-cppbuiltin.c
+@@ -1427,6 +1427,10 @@ c_cpp_builtins (cpp_reader *pfile)
    builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
    builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
  
@@ -25,10 +25,10 @@ index 5d64625fcd7..868d69506e4 100644
    if (flag_gnu89_inline)
      cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index f393c7846c6..ef3c14a189e 100644
+index 485d2d6b742..164929f7583 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
+@@ -10225,6 +10225,12 @@ also turns on the following optimization flags:
  Please note the warning under @option{-fgcse} about
  invoking @option{-O2} on programs that use computed gotos.
  
@@ -38,9 +38,9 @@ index f393c7846c6..ef3c14a189e 100644
 +functions.  To disable, specify either @option{-U_FORTIFY_SOURCE} or
 +@option{-D_FORTIFY_SOURCE=0}.
 +
- @opindex O3
  @item -O3
+ @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.41.0
+2.35.1