WIP: main/amazfish: new aport

.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://postmarktos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	wget "https://gitlab.com/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/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/commits.sh

@@ -1,20 +0,0 @@
-#!/bin/sh -e
-# Copyright 2022 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://postmarktos.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.com/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/ec.sh

@@ -1,13 +0,0 @@
-#!/bin/sh -e
-# Description: editorconfig-checker: lint for trailing whitespaces etc.
-# https://postmarktos.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/flake8.sh

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

.ci/grep.sh

@@ -1,24 +0,0 @@
-#!/bin/sh -e
-# Description: check various bad patterns with grep
-# https://postmarktos.org/pmb-ci
-
-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 1
-fi
-
-# DTBs installed to /usr/share/db
-# FIXME: doesn't pass currently, fix it and enable it afterwards
-# if grep -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb'; then
-# 	echo 'Please do not install dtbs to /usr/share/dtb!'
-# 	echo 'Unless you have a good reason not to, please put them in /boot/dtbs'
-# 	exit 1
-# fi

.ci/kconfig.sh

@@ -1,22 +0,0 @@
-#!/bin/sh -e
-# Description: check all kernel configs with 'pmbootstrap kconfig check'
-# Options: native
-# Use 'native' because it requires running pmbootstrap.
-# https://postmarktos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	wget "https://gitlab.com/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" "$@"
-}
-
-set -x
-pmbootstrap kconfig check

.ci/lib/add_pmbootstrap_to_import_path

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

.ci/lib/apkbuild_linting.py

@@ -1,31 +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)
-
-    result = common.run_pmbootstrap(["-q", "lint"] + packages, output_return=True)
-
-    if len(result) > 0:
-        print("Linting issues found:")
-        print(result)
-        sys.exit(1)

.ci/lib/build_changed_aports.sh

@@ -1,19 +0,0 @@
-#!/bin/sh -e
-# Description: build modified packages for this architecture
-# Options: native slow
-# https://postmarktos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	wget "https://gitlab.com/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,223 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2022 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import logging
-import os
-import subprocess
-import sys
-import tempfile
-
-# Same dir
-import common
-
-# pmbootstrap
-import add_pmbootstrap_to_import_path  # noqa
-import pmb.parse
-import pmb.parse.version
-import pmb.helpers.logging
-
-
-def get_package_version_sources(args, package, revision, check=True):
-    """
-    Get the version ($pkgver-r$pkgrel), checksums and a list of remote files
-    (not bundled with the APKBUILD) from a specific git revision.
-    :param package: name of the package
-    :param revision: git revision to look at
-    :param check: complain if the file does not exist
-    :returns: {"checksums": see lib.common.parse_apkbuild_checksums(),
-               "pkgrel": 3,
-               "pkgver": "1.0.0",
-               "sources_remote": ["x-1.0.0-r2.tar.bz2", ...],
-               "version": "1.0.0-r2"}
-    """
-    # 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:
-        apkbuild_path = f"{tempdir}/APKBUILD"
-        with open(apkbuild_path, "w", encoding="utf-8") as handle:
-            handle.write(apkbuild_content)
-        parsed = pmb.parse.apkbuild(apkbuild_path, False, False)
-        checksums = common.parse_apkbuild_checksums(args, apkbuild_path)
-
-    # Build sources_remote from files in checksums that are not bundled.
-    # To make the logic not overly complicated, only glob in the currently
-    # checked out directory. This is inaccurate for the previous commit, but
-    # good enough for how it's used in check_versions() below.
-    sources_remote = []
-    for filename, checksum in checksums.items():
-        bundled_path_pattern = f"{os.path.dirname(path)}/**/{filename}"
-        if not glob.glob(bundled_path_pattern, recursive=True):
-            sources_remote += filename
-
-    return {"checksums": checksums,
-            "pkgrel": int(parsed['pkgrel']),
-            "pkgver": parsed['pkgver'],
-            "sources_remote": sources_remote,
-            "version": f"{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()
-    logging.error("")
-    logging.error("NOTE: use 'pmbootstrap ci commits' to run this check"
-                  " on your PC.")
-    logging.error("")
-    logging.error("Some more hints:")
-    logging.error(f"* You may need to rebase on {branch}.")
-    logging.error("* Detailed rules for bumping pkgrel/pkgver:")
-    logging.error("  https://postmarketos.org/howto-bump-pkgrel-pkgver")
-    logging.error("* If the error doesn't make sense (e.g. you want to")
-    logging.error("  intentionally downgrade a package), add [ci:skip-build]")
-    logging.error("  with reasoning to the last commit message.")
-    logging.error("")
-    logging.error("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]):
-        logging.info(f"NOTE: {commit} is on same commit as HEAD, comparing"
-                     " HEAD against HEAD~1.")
-        commit = "HEAD~1"
-
-    for package in packages:
-        logging.info("")
-        # Get versions and sources, skip new packages
-        head = get_package_version_sources(args, package, "HEAD")
-        head_v = head["version"]
-        upstream = get_package_version_sources(args, package, commit, False)
-        if not upstream:
-            if head["pkgrel"] != 0:
-                logging.error(f"- {package}: {head_v} (HEAD) (new package)")
-                logging.error("  ERROR: new package should have pkgrel=0")
-                error = True
-            else:
-                logging.info(f"- {package}: {head_v} (HEAD) (new package)")
-            continue
-        upstream_v = upstream["version"]
-
-        # Compare head and upstream versions based on rules from:
-        # https://postmarketos.org/howto-bump-pkgrel-pkgver
-        error_str = ""
-        if head["sources_remote"]:
-            if head["sources_remote"] == upstream["sources_remote"]:
-                pkgver = upstream["pkgver"]
-                pkgrel = upstream["pkgrel"] + 1
-                if head["pkgver"] != pkgver or head["pkgrel"] != pkgrel:
-                    error_str = f"expected pkgver={pkgver}, pkgrel={pkgrel}" \
-                                " (pkgver unchanged, pkgrel + 1), because" \
-                                " this package has unchanged remote sources"
-            else:  # remote sources changed
-                if upstream["pkgver"] == "9999":
-                    pkgver = "9999"
-                    pkgrel = upstream["pkgrel"] + 1
-                    if head["pkgver"] != pkgver or head["pkgrel"] != pkgrel:
-                        error_str = f"expected pkgver={pkgver}," \
-                                    f" pkgrel={pkgrel} (pkgver unchanged," \
-                                    " pkgrel + 1), because this package has" \
-                                    " pkgver=9999"
-                elif head["pkgver"] == upstream["pkgver"] or head["pkgrel"] != 0:
-                    error_str = "expected pkgver to change and pkgrel=0," \
-                                " because this package has changed remote" \
-                                " sources"
-        else:  # no remote sources
-            if head["checksums"] == upstream["checksums"]:
-                pkgver = upstream["pkgver"]
-                pkgrel = upstream["pkgrel"] + 1
-                if head["pkgver"] != pkgver or head["pkgrel"] != pkgrel:
-                    error_str = f"expected pkgver={pkgver}, pkgrel={pkgrel} " \
-                                " (pkgver unchanged, pkgrel + 1), because" \
-                                " this package has no remote sources and the" \
-                                " bundled sources didn't change"
-            else:  # checksums changed
-                if head["pkgver"] == upstream["pkgver"] or head["pkgrel"] != 0:
-                    error_str = "expected pkgver to change and pkgrel=0," \
-                                " because this package has no remote sources" \
-                                " but the bundled files changed"
-
-        result = pmb.parse.version.compare(head_v, upstream_v)
-        if result != 1:
-            error_str = "new version is not higher than the previous version"
-
-        # Print result line ("- hello-world: 1-r2 (HEAD) > 1-r1 (HEAD~1)")
-        formatstr = "- {}: {} (HEAD) {} {} ({})"
-        operator = version_compare_operator(result)
-        logging.error(formatstr.format(package, head_v, operator, upstream_v,
-                                       commit))
-
-        # Detailed error message should help the user to resolve it and explain
-        # why it failed.
-        if error_str:
-            logging.error(f"  ERROR: {error_str}")
-            error = True
-
-    if error:
-        exit_with_error_message()
-
-
-if __name__ == "__main__":
-    # Get and print modified packages
-    common.add_upstream_git_remote()
-    packages = common.get_changed_packages()
-    logging.info(f"Changed packages: {packages}")
-
-    # Verify modified package count
-    common.get_changed_packages_sanity_check(len(packages))
-    if len(packages) == 0:
-        logging.info("no aports changed in this branch")
-        exit(0)
-
-    # Potentially skip this check
-    if common.commit_message_has_string("[ci:skip-vercheck]"):
-        logging.warning("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
-    logging.info("Checking changed package versions...")
-    check_versions(args, packages)

.ci/lib/common.py

@@ -1,241 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Various functions used in CI scripts and tests. This file is in
-# .ci/lib/common.py and symlinked to .ci/testcases/common.py.
-
-import configparser
-import os
-import subprocess
-import sys
-
-
-cache = {}
-
-
-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__) + "/../.."))
-    cache["pmaports_dir"] = ret
-    return ret
-
-
-def run_git(parameters, check=True, stderr=None):
-    """ Run git in the pmaports dir and return the output """
-    cmd = ["git", "-C", get_pmaports_dir()] + parameters
-    try:
-        return subprocess.check_output(cmd, stderr=stderr).decode()
-    except subprocess.CalledProcessError:
-        if check:
-            raise
-        return None
-
-
-def add_upstream_git_remote():
-    """ Add a remote pointing to postmarketOS/pmaports. """
-    run_git(["remote", "add", "upstream",
-             "https://gitlab.com/postmarketOS/pmaports.git"], False)
-    run_git(["fetch", "-q", "upstream"])
-
-
-def commit_message_has_string(needle):
-    return needle in run_git(["show", "-s", "--format=full", "HEAD"])
-
-
-def run_pmbootstrap(parameters, output_return=False):
-    """ Run pmbootstrap with the pmaports dir as --aports """
-    cmd = ["pmbootstrap", "--aports", get_pmaports_dir()] + parameters
-    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():
-    """ Use pmaports.cfg from current branch (e.g. "v20.05_fix-ci") and
-        channels.cfg from master to retrieve the upstream branch.
-
-        :returns: branch name, e.g. "v20.05" """
-    global cache
-    if "upstream_branch" in cache:
-        return cache["upstream_branch"]
-
-    # Get channel (e.g. "stable") from pmaports.cfg
-    # https://postmarketos.org/pmaports.cfg
-    pmaports_dir = get_pmaports_dir()
-    pmaports_cfg = configparser.ConfigParser()
-    pmaports_cfg.read(f"{pmaports_dir}/pmaports.cfg")
-    channel = pmaports_cfg["pmaports"]["channel"]
-
-    # Get branch_pmaports (e.g. "v20.05") from channels.cfg
-    # https://postmarketos.org/channels.cfg
-    channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"])
-    channels_cfg = configparser.ConfigParser()
-    channels_cfg.read_string(channels_cfg_str)
-    assert channel in channels_cfg, \
-        f"Channel '{channel}' from pmaports.cfg in your branch is unknown." \
-        " This appears to be an old branch, consider recreating your change" \
-        " on top of master."
-
-    ret = channels_cfg[channel]["branch_pmaports"]
-    cache["upstream_branch"] = ret
-    return ret
-
-
-def get_changed_files(removed=True):
-    """ Get all changed files and print them, as well as the branch and the
-        commit that was used for the diff.
-        :param removed: also return removed files (default: True)
-        :returns: set of changed files
-    """
-    branch_upstream = f"upstream/{get_upstream_branch()}"
-    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}: f{commit_upstream}")
-
-    # Check if we are HEAD on the upstream branch
-    if commit_head == commit_upstream:
-        # then compare with previous commit
-        commit = "HEAD~1"
-    else:
-        # otherwise compare with latest common ancestor
-        commit = run_git(["merge-base", branch_upstream, "HEAD"])[:-1]
-    print("comparing HEAD with: " + commit)
-
-    # Changed files
-    ret = set()
-    print("changed file(s):")
-    for file in run_git(["diff", "--name-only", commit, "HEAD"]).splitlines():
-        message = "  " + file
-        if not os.path.exists(file):
-            message += " (deleted)"
-            if removed:
-                ret.add(file)
-        else:
-            ret.add(file)
-        print(message)
-    return ret
-
-
-def get_changed_packages_sanity_check(count):
-    for mark in ["[ci:ignore-count]", "[ci:skip-build]"]:
-        if commit_message_has_string(mark):
-            print("NOTE: package count sanity check skipped (" + mark + ").")
-            return
-    if count <= 10:
-        return
-
-    branch = get_upstream_branch()
-    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)
-
-
-def get_changed_packages():
-    ret = set()
-    for file in get_changed_files():
-        dirname, filename = os.path.split(file)
-
-        # Skip files:
-        # * in the root dir of pmaports (e.g. README.md)
-        # * path with a dot (e.g. .ci/, device/.shared-patches/)
-        if not dirname or file.startswith(".") or "/." in file:
-            continue
-
-        if filename != "APKBUILD":
-            # Walk up directories until we (eventually) find the package
-            # the file belongs to (could be in a subdirectory of a package)
-            while dirname and not os.path.exists(os.path.join(dirname, "APKBUILD")):
-                dirname = os.path.dirname(dirname)
-
-            # Unable to find APKBUILD the file belong to
-            if not dirname:
-                # ... maybe the package was deleted entirely?
-                if not os.path.exists(file):
-                    continue
-
-                # Weird, file does not belong to any package?
-                # Here we just warn, there is an extra check
-                # to make sure that files are organized properly.
-                print(f"WARNING: Changed file {file} does not belong to any package")
-                continue
-
-        elif not os.path.exists(file):
-            continue  # APKBUILD was deleted
-
-        ret.add(os.path.basename(dirname))
-
-    return ret
-
-
-def parse_apkbuild_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: 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

.ci/lib/gitlab_prepare_ci.sh

@@ -1,17 +0,0 @@
-#!/bin/sh -e
-# Copyright 2022 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/pytest.sh

@@ -1,46 +0,0 @@
-#!/bin/sh -e
-# Copyright 2022 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://postmarktos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	wget "https://gitlab.com/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
-
-# 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,51 +0,0 @@
-#!/bin/sh -e
-# Copyright 2022 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-# Description: lint all shell scripts
-# https://postmarktos.org/pmb-ci
-
-DIR="$(cd "$(dirname "$0")/.." && pwd -P)"
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add shellcheck
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-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-installkernel/installkernel-pmos
-	./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
-	./main/msm-firmware-loader/*.post-install
-
-	$(find . -path './main/postmarketos-ui-*/*.sh')
-	$(find . -path './main/postmarketos-ui-*/*.pre-install')
-	$(find . -path './main/postmarketos-ui-*/*.post-install')
-	$(find . -path './main/postmarketos-ui-*/*.pre-upgrade')
-	$(find . -path './main/postmarketos-ui-*/*.post-upgrade')
-	$(find . -path './main/postmarketos-ui-*/*.pre-deinstall')
-	$(find . -path './main/postmarketos-ui-*/*.post-deinstall')
-
-	$(find . -name '*.trigger')
-	$(find . -path './main/devicepkg-dev/*.sh')
-	$(find . -path './main/postmarketos-mvcfg/*.sh')
-
-	$(find . -path '.ci/*.sh')
-"
-
-for file in $sh_files; do
-	echo "Test with shellcheck: $file"
-	cd "$DIR/$(dirname "$file")"
-	shellcheck -e SC1008 -x "$(basename "$file")"
-done

.ci/testcases/common.py

@@ -1 +0,0 @@
-../lib/common.py

.ci/testcases/conftest.py

@@ -1,25 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-import pytest
-import sys
-import os
-
-
-@pytest.fixture
-def args(request):
-    # Initialize args
-    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()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(pmb.helpers.logging.logfd.close)
-    return args

.ci/testcases/test_device.py

@@ -1,134 +0,0 @@
-#!/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
-
-
-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). """
-
-    for depend in apkbuild["depends"]:
-        if depend == "linux-firmware-none":
-            continue
-        if (depend.startswith("firmware-") or
-                depend.startswith("linux-firmware")):
-            raise RuntimeError("Firmware package '" + depend + "' found in"
-                               " depends of " + path + ". These go into"
-                               " subpackages now, see"
-                               " <https://postmarketos.org/devicepkg>.")
-        if depend == "mesa-dri-gallium":
-            raise RuntimeError(f"{path}: mesa-dri-gallium shouldn't be in"
-                               " depends anymore (see pmaports!3478)")
-
-
-def test_aports_device(args):
-    """
-    Various tests performed on the /device/*/device-* aports.
-    """
-    for path in glob.iglob(args.aports + "/device/*/device-*/APKBUILD"):
-        apkbuild = pmb.parse.apkbuild(path)
-
-        # Depends: Require "postmarketos-base"
-        if "postmarketos-base" not in apkbuild["depends"]:
-            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
-                               path)
-
-        # 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(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("!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(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
-    """
-
-    # Iterate over device aports
-    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(args, device)
-
-        # Parse kernels from depends
-        kernels_depends = []
-        for depend in apkbuild["depends"]:
-            if not depend.startswith("linux-") or depend.startswith("linux-firmware-"):
-                continue
-            kernels_depends.append(depend)
-
-            # Kernel in subpackages *and* depends
-            if kernels_subpackages:
-                raise RuntimeError("Kernel package '" + depend + "' needs to"
-                                   " be removed when using kernel" +
-                                   " subpackages: " + path)
-
-        # No kernel
-        if not kernels_depends and not kernels_subpackages:
-            raise RuntimeError("Device doesn't have a kernel in depends or"
-                               " subpackages: " + path)
-
-        # Multiple kernels in depends
-        if len(kernels_depends) > 1:
-            raise RuntimeError("Please use kernel subpackages instead of"
-                               " multiple kernels in depends (see"
-                               " <https://postmarketos.org/devicepkg>): " +
-                               path)
-
-
-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 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 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(args):
-    """
-    Ensure that aports in /device/unmaintained have an "Unmaintained:" comment
-    that describes why the aport is unmaintained.
-    """
-    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

@@ -1,87 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import os
-import pytest
-import re
-import sys
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-
-
-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 = ["weston_pixman_type"]
-    for option in obsolete_options:
-        if info[option]:
-            raise RuntimeError("option '" + option + "' is obsolete, please"
-                               " remove it (reasons for removal are at"
-                               " <https://postmarketos.org/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_]*=\".*\"$")
-
-    for folder in glob.glob(args.aports + "/device/*/device-*"):
-        device = folder[len(args.aports):].split("-", 1)[1]
-
-        f = open(folder[len(args.aports):][1:] + "/deviceinfo")
-        lines = f.read().split("\n")
-        f.close()
-
-        try:
-            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/comment next"
-                                       f" to line instead of above? {line}")
-
-            # Successful deviceinfo parsing / obsolete options
-            info = pmb.parse.deviceinfo(args, device)
-            deviceinfo_obsolete(info)
-
-            # deviceinfo_name must start with 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"
-                                   " the deviceinfo_name, e.g.: '" +
-                                   manufacturer + " " + name + "'")
-
-        # Don't abort on first error
-        except Exception as e:
-            last_exception = e
-            count += 1
-            print(device + ": " + str(e))
-
-    # Raise the last exception
-    if last_exception:
-        print("deviceinfo error count: " + str(count))
-        raise last_exception

.ci/testcases/test_firmware.py

@@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Johannes Marbach
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import os
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-
-
-def test_aports_firmware(args):
-    """
-    Various tests performed on the /**/firmware-* aports.
-    """
-
-    excluded = [
-        "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)
-    ]
-
-    for path in glob.iglob(f"{args.aports}/**/firmware-*/APKBUILD", recursive=True):
-        apkbuild = pmb.parse.apkbuild(path)
-        aport_name = os.path.basename(os.path.dirname(path))
-
-        if aport_name not in excluded:
-            if "pmb:cross-native" not in apkbuild["options"]:
-                raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
-                                   " options= line. The pmb:cross-native option is"
-                                   " preferred because it results in significantly"
-                                   " lower build times. If the package doesn't build"
-                                   " with the option, you can add an exemption in"
-                                   " .gitlab-ci/testcases/test_firmware.py.")
-
-        if "!tracedeps" not in apkbuild["options"]:
-            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

@@ -1,118 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-""" Make sure that components of frameworks (Qt, KDE, ...) have the same
-    version in all packages. We scan all packages, categorize them by URL
-    and then compare the versions of all packages in each category. """
-
-import glob
-import logging
-import os
-import pytest
-import sys
-
-import add_pmbootstrap_to_import_path
-import pmb.config
-import pmb.parse
-
-
-def get_categorized_packages(args):
-    """
-    Parse all aports and categorize them.
-
-    :returns: {"plasma": {"kwin": "5.13.3", ...},
-               "kde": {"kcrash": "5.48.0", ...},
-               "qt": {"qt5-qtbase": "5.12.0", ...},
-               "other": {"konsole": "1234", ...}}
-    """
-    ret = {}
-
-    for path in glob.glob(args.aports + "/*/*/APKBUILD"):
-        # Parse APKBUILD
-        apkbuild = pmb.parse.apkbuild(path)
-        url = apkbuild["url"]
-        pkgname = apkbuild["pkgname"]
-        pkgver = apkbuild["pkgver"]
-        if pkgver == "9999":
-            pkgver = apkbuild["_pkgver"]
-
-        if "_git" in pkgver:
-            continue
-
-        # Categorize by URL
-        category = "other"
-        if "https://www.kde.org/workspaces/plasmadesktop" in url:
-            category = "plasma"
-        elif "https://community.kde.org/Frameworks" in url:
-            category = "kde"
-        elif url in ["http://qt-project.org/",
-                     "https://www.qt.io/developers/"]:
-            category = "qt"
-
-        # Remove hotfix number (i.e. 5.16.90.1 becomes 5.16.90)
-        if category in ["kde", "plasma"]:
-            pkgver = ".".join(pkgver.split(".")[0:3])
-
-        # Save result
-        if category not in ret:
-            ret[category] = {}
-        ret[category][pkgname] = pkgver
-    return ret
-
-
-def check_categories(categories):
-    """
-    Make sure that all packages in one framework (kde, plasma, ...) have the
-    same package version (and that there is at least one package in each
-    category).
-
-    :param categories: see return of get_categorized_packages()
-    :returns: True when the check passed, False otherwise
-    """
-    ret = True
-    for category, packages in categories.items():
-        reference = None
-        for pkgname, pkgver in packages.items():
-
-            # Use the first package as reference and print a summary
-            if not reference:
-                logging.info("---")
-                logging.info("Package category: " + category)
-                logging.info("Packages count: " + str(len(packages)))
-
-                # Category "other": done after printing the basic summary, no
-                # need to print each package or compare the package versions
-                if category == "other":
-                    reference = True
-                    break
-
-                # Print all packages
-                logging.info("Packages: " + ", ".join(sorted(packages.keys())))
-
-                # Print the reference and skip checking it against itself
-                reference = {"pkgname": pkgname, "pkgver": pkgver}
-                logging.info("Reference pkgver: " + pkgver + " (from '" +
-                             pkgname + "')")
-                continue
-
-            # Check version against reference
-            if pkgver != reference["pkgver"]:
-                logging.info("ERROR: " + pkgname + " has version " + pkgver)
-                ret = False
-
-        # Each category must at least have one package
-        if not reference:
-            logging.info("ERROR: could not find any packages in category: " +
-                         category)
-            ret = False
-    return ret
-
-
-def test_framework_versions(args):
-    """
-    Make sure that packages of the same framework have the same version.
-    """
-    categories = get_categorized_packages(args)
-    if not check_categories(categories):
-        raise RuntimeError("Framework version check failed!")

.ci/testcases/test_kernel.py

@@ -1,42 +0,0 @@
-#!/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
-
-
-def test_aports_kernel(args):
-    """
-    Various tests performed on the /**/linux-* aports.
-    """
-
-    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 "pmb:cross-native" not in apkbuild["options"]:
-            raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
-                               " options= line")
-
-        # cross-compilers should not be in makedepends
-        for ccc in ["gcc-armv7", "gcc-armhf", "gcc-aarch64",
-                    "gcc4-armv7", "gcc4-armhf", "gcc4-aarch64",
-                    "gcc6-armv7", "gcc6-armhf", "gcc6-aarch64"]:
-            if ccc in apkbuild["makedepends"]:
-                raise RuntimeError(f"{aport_name}: Cross-compiler ({ccc}) should"
-                                   " not be explicitly specified in makedepends!"
-                                   " pmbootstrap installs cross-compiler"
-                                   " automatically.")
-
-        # check some options only for main and community devices
-        for dir in ["main", "device/main", "device/community"]:
-            if path.startswith(f"{args.aports}/{dir}"):
-                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.")

.ci/testcases/test_provides.py

@@ -1,87 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2022 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
-
-
-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(args):
-    errors = []
-    for path in glob.iglob(f"{args.aports}/**/APKBUILD", recursive=True):
-        apkbuild = pmb.parse.apkbuild(path)
-        pkgname = apkbuild["pkgname"]
-        version = f"{apkbuild['pkgver']}-r{apkbuild['pkgrel']}"
-        path_rel = os.path.relpath(path, args.aports)
-        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,108 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2022 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
-
-# Same dir
-import common
-
-# pmbootstrap
-import add_pmbootstrap_to_import_path
-import pmb.parse
-import pmb.parse._apkbuild
-import pmb.parse.apkindex
-import pmb.helpers.repo
-
-
-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):
-        # pmbootstrap parser has some issues with complicated APKBUILDs, skip those.
-        if apkbuild_path.startswith(args.aports + "/cross/"):
-            continue
-
-        apkbuild = pmb.parse.apkbuild(apkbuild_path)
-        sources_chk = common.parse_apkbuild_checksums(args, 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(args):
-    """
-    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 glob.iglob(f"{args.aports}/**/APKBUILD", recursive=True):
-        source = common.parse_apkbuild_checksums(args, apkbuild_path)
-        dir_path = os.path.dirname(apkbuild_path)
-        apkbuild_rel = os.path.relpath(apkbuild_path, args.aports)
-        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

@@ -1,42 +0,0 @@
-#!/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
-
-
-def test_aports_ui(args):
-    """
-    Raise an error if package in _pmb_recommends is not found
-    """
-    pmaports_cfg = pmb.config.pmaports.read_config(args)
-
-    for arch in pmaports_cfg["supported_arches"].split(","):
-        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(args, apkbuild["pkgname"], arch, False):
-                continue
-
-            for package in apkbuild["_pmb_recommends"]:
-                depend = pmb.helpers.package.get(args, package,
-                                                 arch, must_exist=False)
-                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}'")
-
-            # Check packages from "_pmb_recommends" of -extras subpackage if one exists
-            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(args, package,
-                                                     arch, must_exist=False)
-                    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/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://postmarktos.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 @@
-{
-  "Version": "2.6.0",
-  "SpacesAftertabs": true
-}

.editorconfig

@@ -7,8 +7,8 @@
 # Top-most EditorConfig file.
 root = true
 
-[{**.{md,ini,sh,rules,nft},**/APKBUILD}]
+[**/APKBUILD]
 indent_style = tab
 end_of_line = lf
-trim_trailing_whitespace = true
 insert_final_newline = true
+trim_trailing_whitespace = true

.gitignore

@@ -20,6 +20,7 @@ dist/
 downloads/
 eggs/
 .eggs/
+lib/
 lib64/
 parts/
 sdist/
@@ -114,7 +115,7 @@ ENV/
 .idea
 
 # Sources as unpacked and built by abuild
-**/src/
+/*/*/src/
 
 # Allow having untracked packages in aports using a custom-something directory
 /custom-*/

.gitlab-ci.yml

@@ -3,7 +3,7 @@
 # global settings
 image: alpine:latest
 after_script:
-  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
+  - .gitlab-ci/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
   - build
@@ -31,52 +31,47 @@ wiki:
       - merge_requests
     changes:
       - device/*/device-*/*
+  before_script:
+    - apk -q add python3
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/wiki.sh
+    - .gitlab-ci/check_devices_in_wiki.py --booting
 
 # testcases linting
-flake8:
+testcases-linting:
   stage: lint
   <<: *only-default
   only:
     refs:
       - merge_requests
     changes:
-      - .ci/*
-      - .ci/*/*
+      - .gitlab-ci/*
+      - .gitlab-ci/*/*
   before_script:
     - apk -q add py-flake8
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/flake8.sh
+    - flake8 --ignore E501,F401,E722,W504,W605
 
-# shellcheck and various grep checks
-shellcheck-grep:
+# shellcheck
+shellcheck:
   stage: lint
   <<: *only-default
   image: alpine:edge
+  before_script:
+    - apk -q upgrade
+    - apk -q add shellcheck
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/shellcheck.sh
-    - .ci/grep.sh
-
-editor-config:
-  stage: lint
-  <<: *only-default
-  image: alpine:edge
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/ec.sh
+    - .gitlab-ci/shellcheck.sh
 
 # aports checks (generic)
-pytest-commits:
+aports-static:
   stage: lint
   <<: *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 ".gitlab-ci/run_testcases.sh"
+    - su pmos -c ".gitlab-ci/check_changed_aports_versions.py"
   artifacts:
     when: on_failure
     paths:
@@ -85,12 +80,26 @@ 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
+  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 ".gitlab-ci/apkbuild-linting.py"
   only:
     - merge_requests
   allow_failure: true
@@ -105,9 +114,11 @@ kernel-kconfig:
     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")
@@ -126,41 +137,27 @@ mr-settings:
   stage: build
   <<: *only-default
   before_script:
-    - .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:
+    - .gitlab-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
-  script:
-    - .ci/build-aarch64.sh
 
 build-armv7:
   extends: .build
-  script:
-    - .ci/build-armv7.sh
 
 build-armhf:
   extends: .build
-  script:
-    - .ci/build-armhf.sh
-
-build-riscv64:
-  extends: .build
-  script:
-    - .ci/build-riscv64.sh

.gitlab-ci/apkbuild-linting.py

@@ -0,0 +1,32 @@
+#!/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)
+
+    issues = []
+    for apkbuild in apkbuilds:
+        if apkbuild.startswith("temp/") or apkbuild.startswith("cross/"):
+            print(f"NOTE: Skipping linting of {apkbuild}")
+            continue
+
+        package = os.path.basename(os.path.dirname(apkbuild))
+        result = common.run_pmbootstrap(["-q", "lint", package], output_return=True)
+        if len(result) > 0:
+            issues.append([apkbuild, result])
+
+    if len(issues) > 0:
+        print("Linting issues found:")
+        for issue in issues:
+            print(issue[0] + ": " + issue[1])
+
+        sys.exit(1)

.gitlab-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 ".gitlab-ci/build_changed_aports.py $JOB_ARCH"

.gitlab-ci/build_changed_aports.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2020 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
 
@@ -7,7 +7,7 @@ import sys
 import common
 
 # pmbootstrap
-import add_pmbootstrap_to_import_path
+import testcases.add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports
@@ -15,9 +15,8 @@ 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))
+    common.run_pmbootstrap(["--details-to-stdout", "build", "--strict",
+                            "--force", "--arch", arch] + list(packages))
 
 
 def verify_checksums(packages, arch):
@@ -67,7 +66,8 @@ if __name__ == "__main__":
     # (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")
+        apkbuild = pmb.parse._apkbuild.apkbuild(args,
+                                                f"{apkbuild_path}/APKBUILD")
 
         if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
             print(f"{package}: not enabled for {arch}, skipping")

.gitlab-ci/check_changed_aports_versions.py

@@ -0,0 +1,156 @@
+#!/usr/bin/env python3
+# Copyright 2020 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(args, 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)

.gitlab-ci/check_devices_in_wiki.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2022 Oliver Smith
+# Copyright 2020 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import argparse
@@ -13,17 +13,9 @@ 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]
-
-        # -downstream suffix is used when packaging the downstream kernel for
-        # devices that have a working mainline kernel. Those are usually
-        # unmaintained and therefore might not appear in the wiki. However,
-        # the main device should be documented (remove the -downstream suffix).
-        if device.endswith('-downstream'):
-            device = device[:-len('-downstream')]
-
         ret.append(device)
     return sorted(ret)
 
@@ -53,13 +45,6 @@ def get_wiki_devices_html(path):
     return {"booting": split[0], "not_booting": split[1]}
 
 
-def get_wiki_renamed_devices_html():
-    """:returns: HTML of the page"""
-    # Download wiki page
-    url = "http://wiki.postmarketos.org/wiki/Renamed_Devices"
-    return urllib.request.urlopen(url).read().decode("utf-8")
-
-
 def check_device(device, html, is_booting):
     """:param is_booting: require the device to be in the booting section, not
                           just anywhere in the page (i.e. in the not booting
@@ -74,9 +59,6 @@ def check_device(device, html, is_booting):
                   " section already)")
             return False
         return True
-    if device in html["renamed"]:
-        print(f"WARNING: {device} was renamed in the wiki")
-        return True
 
     print(device + ": not in the wiki yet.")
     return False
@@ -97,7 +79,6 @@ def main():
 
     # Check all devices
     html = get_wiki_devices_html(args.path)
-    html["renamed"] = get_wiki_renamed_devices_html()
     error = False
     for device in get_devices():
         if not check_device(device, html, args.booting):
@@ -110,7 +91,7 @@ def main():
         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'")
@@ -121,10 +102,6 @@ def main():
         print("it more easily. Many times one person did a port with basic")
         print("functionality, and then someone else jumped in and")
         print("contributed major new features.")
-        print("")
-        print("NOTE: if you renamed a device in pmaports, rename it in the")
-        print("wiki as well and make sure to add it here:")
-        print("https://postmarketos.org/renamed")
         return 1
     else:
         print("*** Wiki check successful!")

.gitlab-ci/common.py

@@ -0,0 +1,192 @@
+#!/usr/bin/env python3
+# Copyright 2020 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# Various functions used in CI scripts
+
+import configparser
+import os
+import subprocess
+import sys
+
+
+cache = {}
+
+
+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__) + "/.."))
+    cache["pmaports_dir"] = ret
+    return ret
+
+
+def run_git(parameters, check=True, stderr=None):
+    """ Run git in the pmaports dir and return the output """
+    cmd = ["git", "-C", get_pmaports_dir()] + parameters
+    try:
+        return subprocess.check_output(cmd, stderr=stderr).decode()
+    except subprocess.CalledProcessError:
+        if check:
+            raise
+        return None
+
+
+def add_upstream_git_remote():
+    """ Add a remote pointing to postmarketOS/pmaports. """
+    run_git(["remote", "add", "upstream",
+             "https://gitlab.com/postmarketOS/pmaports.git"], False)
+    run_git(["fetch", "-q", "upstream"])
+
+
+def commit_message_has_string(needle):
+    return needle in run_git(["show", "-s", "--format=full", "HEAD"])
+
+
+def run_pmbootstrap(parameters, output_return=False):
+    """ Run pmbootstrap with the pmaports dir as --aports """
+    cmd = ["pmbootstrap", "--aports", get_pmaports_dir()] + parameters
+    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():
+    """ Use pmaports.cfg from current branch (e.g. "v20.05_fix-ci") and
+        channels.cfg from master to retrieve the upstream branch.
+
+        :returns: branch name, e.g. "v20.05" """
+    global cache
+    if "upstream_branch" in cache:
+        return cache["upstream_branch"]
+
+    # Get channel (e.g. "stable") from pmaports.cfg
+    # https://postmarketos.org/pmaports.cfg
+    pmaports_dir = get_pmaports_dir()
+    pmaports_cfg = configparser.ConfigParser()
+    pmaports_cfg.read(f"{pmaports_dir}/pmaports.cfg")
+    channel = pmaports_cfg["pmaports"]["channel"]
+
+    # Get branch_pmaports (e.g. "v20.05") from channels.cfg
+    # https://postmarketos.org/channels.cfg
+    channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"])
+    channels_cfg = configparser.ConfigParser()
+    channels_cfg.read_string(channels_cfg_str)
+    assert channel in channels_cfg, \
+        f"Channel '{channel}' from pmaports.cfg in your branch is unknown." \
+        " This appears to be an old branch, consider recreating your change" \
+        " on top of master."
+
+    ret = channels_cfg[channel]["branch_pmaports"]
+    cache["upstream_branch"] = ret
+    return ret
+
+
+def get_changed_files(removed=True):
+    """ Get all changed files and print them, as well as the branch and the
+        commit that was used for the diff.
+        :param removed: also return removed files (default: True)
+        :returns: set of changed files
+    """
+    branch_upstream = f"upstream/{get_upstream_branch()}"
+    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}: f{commit_upstream}")
+
+    # Check if we are HEAD on the upstream branch
+    if commit_head == commit_upstream:
+        # then compare with previous commit
+        commit = "HEAD~1"
+    else:
+        # otherwise compare with latest common ancestor
+        commit = run_git(["merge-base", branch_upstream, "HEAD"])[:-1]
+    print("comparing HEAD with: " + commit)
+
+    # Changed files
+    ret = set()
+    print("changed file(s):")
+    for file in run_git(["diff", "--name-only", commit, "HEAD"]).splitlines():
+        message = "  " + file
+        if not os.path.exists(file):
+            message += " (deleted)"
+            if removed:
+                ret.add(file)
+        else:
+            ret.add(file)
+        print(message)
+    return ret
+
+
+def get_changed_packages_sanity_check(count):
+    for mark in ["[ci:ignore-count]", "[ci:skip-build]"]:
+        if commit_message_has_string(mark):
+            print("NOTE: package count sanity check skipped (" + mark + ").")
+            return
+    if count <= 10:
+        return
+
+    branch = get_upstream_branch()
+    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)
+
+
+def get_changed_packages():
+    ret = set()
+    for file in get_changed_files():
+        dirname, filename = os.path.split(file)
+
+        # Skip files:
+        # * in the root dir of pmaports (e.g. README.md)
+        # * path with a dot (e.g. .gitlab-ci/, device/.shared-patches/)
+        if not dirname or file.startswith(".") or "/." in file:
+            continue
+
+        if filename != "APKBUILD":
+            # Walk up directories until we (eventually) find the package
+            # the file belongs to (could be in a subdirectory of a package)
+            while dirname and not os.path.exists(os.path.join(dirname, "APKBUILD")):
+                dirname = os.path.dirname(dirname)
+
+            # Unable to find APKBUILD the file belong to
+            if not dirname:
+                # ... maybe the package was deleted entirely?
+                if not os.path.exists(file):
+                    continue
+
+                # Weird, file does not belong to any package?
+                # Here we just warn, there is an extra check
+                # to make sure that files are organized properly.
+                print(f"WARNING: Changed file {file} does not belong to any package")
+                continue
+
+        elif not os.path.exists(file):
+            continue  # APKBUILD was deleted
+
+        ret.add(os.path.basename(dirname))
+
+    return ret

.gitlab-ci/move_logs.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2021 Oliver Smith
+# Copyright 2020 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ -z "$1" ]; then

.gitlab-ci/run_testcases.sh

@@ -0,0 +1,35 @@
+#!/bin/sh -e
+# Copyright 2020 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/.gitlab-ci/testcases" "$@"

.gitlab-ci/shellcheck.sh

@@ -0,0 +1,47 @@
+#!/bin/sh -e
+# Copyright 2020 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+set -e
+DIR="$(cd "$(dirname "$0")" && pwd -P)"
+cd "$DIR/.."
+
+# 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/postmarketos-base/rootfs-usr-lib-firmwareload.sh
+	./main/postmarketos-base/rootfs-usr-libexec-elogind-system-sleep-suspend-disable-conditions.hook
+	./main/postmarketos-mkinitfs/init.sh.in
+	./main/postmarketos-mkinitfs/init_functions.sh
+	./main/postmarketos-mkinitfs/mkinitfs.sh
+	./main/postmarketos-mkinitfs/mkinitfs_functions.sh
+	./main/postmarketos-mkinitfs/mkinitfs_test.sh
+	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
+	./main/postmarketos-update-kernel/update-kernel.sh
+	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
+
+	$(find . -path './main/postmarketos-ui-*/*.sh')
+	$(find . -path './main/postmarketos-ui-*/*.pre-install')
+	$(find . -path './main/postmarketos-ui-*/*.post-install')
+	$(find . -path './main/postmarketos-ui-*/*.pre-upgrade')
+	$(find . -path './main/postmarketos-ui-*/*.post-upgrade')
+	$(find . -path './main/postmarketos-ui-*/*.pre-deinstall')
+	$(find . -path './main/postmarketos-ui-*/*.post-deinstall')
+
+	$(find . -name '*.trigger')
+	$(find . -path './main/devicepkg-dev/*.sh')
+	$(find . -path './main/postmarketos-mvcfg/*.sh')
+
+	$(find . -path '.gitlab-ci/*.sh')
+"
+for file in $sh_files; do
+	echo "Test with shellcheck: $file"
+	cd "$DIR/../$(dirname "$file")"
+	shellcheck -e SC1008 -x "$(basename "$file")"
+done

.gitlab-ci/testcases/add_pmbootstrap_to_import_path/__init__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2020 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import shutil

.gitlab-ci/testcases/test_aports.py

@@ -0,0 +1,289 @@
+#!/usr/bin/env python3
+# Copyright 2020 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
+
+
+@pytest.fixture
+def args(request):
+    # Initialize args
+    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()
+
+    # Initialize logging
+    pmb.helpers.logging.init(args)
+    request.addfinalizer(args.logfd.close)
+    return args
+
+
+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 = ["weston_pixman_type"]
+    for option in obsolete_options:
+        if info[option]:
+            raise RuntimeError("option '" + option + "' is obsolete, please"
+                               " remove it (reasons for removal are at"
+                               " <https://postmarketos.org/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
+    for folder in glob.glob(args.aports + "/device/*/device-*"):
+        device = folder[len(args.aports):].split("-", 1)[1]
+
+        try:
+            # Successful deviceinfo parsing / obsolete options
+            info = pmb.parse.deviceinfo(args, device)
+            deviceinfo_obsolete(info)
+
+            # deviceinfo_name must start with 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"
+                                   " the deviceinfo_name, e.g.: '" +
+                                   manufacturer + " " + name + "'")
+
+        # Don't abort on first error
+        except Exception as e:
+            last_exception = e
+            count += 1
+            print(device + ": " + str(e))
+
+    # Raise the last exception
+    if last_exception:
+        print("deviceinfo error count: " + str(count))
+        raise last_exception
+
+
+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.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_kernel(args):
+    """
+    Various tests performed on the /**/linux-* aports.
+    """
+    for path in glob.iglob(args.aports + "**/linux-*/APKBUILD", recursive=True):
+        apkbuild = pmb.parse.apkbuild(args, path)
+
+        if "pmb:cross-native" not in apkbuild["options"]:
+            raise RuntimeError("\"pmb:cross-native\" missing in"
+                               f" options= line: {path}")
+
+
+def test_aports_device(args):
+    """
+    Various tests performed on the /device/*/device-* aports.
+    """
+    for path in glob.iglob(args.aports + "/device/*/device-*/APKBUILD"):
+        apkbuild = pmb.parse.apkbuild(args, path)
+
+        # Depends: Require "postmarketos-base"
+        if "postmarketos-base" not in apkbuild["depends"]:
+            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
+                               path)
+
+        # 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(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("!archcheck missing in options= line: " + path)
+
+
+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
+    """
+
+    # Iterate over device aports
+    for path in glob.glob(args.aports + "/device/*/device-*/APKBUILD"):
+        # Parse apkbuild and kernels from subpackages
+        apkbuild = pmb.parse.apkbuild(args, path)
+        device = apkbuild["pkgname"][len("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-"):
+                continue
+            kernels_depends.append(depend)
+
+            # Kernel in subpackages *and* depends
+            if kernels_subpackages:
+                raise RuntimeError("Kernel package '" + depend + "' needs to"
+                                   " be removed when using kernel" +
+                                   " subpackages: " + path)
+
+        # No kernel
+        if not kernels_depends and not kernels_subpackages:
+            raise RuntimeError("Device doesn't have a kernel in depends or"
+                               " subpackages: " + path)
+
+        # Multiple kernels in depends
+        if len(kernels_depends) > 1:
+            raise RuntimeError("Please use kernel subpackages instead of"
+                               " multiple kernels in depends (see"
+                               " <https://postmarketos.org/devicepkg>): " +
+                               path)
+
+
+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(args, 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}")
+
+
+def test_aports_ui(args):
+    """
+    Raise an error if package in _pmb_recommends is not found
+    """
+    for arch in pmb.config.build_device_architectures:
+        for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
+            apkbuild = pmb.parse.apkbuild(args, path)
+            # Skip if arch isn't enabled
+            if not pmb.helpers.package.check_arch(args, apkbuild["pkgname"], arch, False):
+                continue
+
+            for package in apkbuild["_pmb_recommends"]:
+                depend = pmb.helpers.package.get(args, package,
+                                                 arch, must_exist=False)
+                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}'")
+
+            # Check packages from "_pmb_recommends" of -extras subpackage if one exists
+            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(args, package,
+                                                     arch, must_exist=False)
+                    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}'")

.gitlab-ci/testcases/test_aports_framework_versions.py

@@ -0,0 +1,133 @@
+#!/usr/bin/env python3
+# Copyright 2020 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+""" Make sure that components of frameworks (Qt, KDE, ...) have the same
+    version in all packages. We scan all packages, categorize them by URL
+    and then compare the versions of all packages in each category. """
+
+import glob
+import logging
+import os
+import pytest
+import sys
+
+import add_pmbootstrap_to_import_path
+import pmb.config
+import pmb.parse
+
+
+@pytest.fixture
+def args(request):
+    # Initialize args
+    sys.argv = ["pmbootstrap",
+                "--aports", os.path.dirname(__file__) + "/../..",
+                "--log", "$WORK/log_testsuite_pmaports.txt"
+                "chroot"]
+    args = pmb.parse.arguments()
+
+    # Initialize logging
+    pmb.helpers.logging.init(args)
+    request.addfinalizer(args.logfd.close)
+    return args
+
+
+def get_categorized_packages(args):
+    """
+    Parse all aports and categorize them.
+
+    :returns: {"plasma": {"kwin": "5.13.3", ...},
+               "kde": {"kcrash": "5.48.0", ...},
+               "qt": {"qt5-qtbase": "5.12.0", ...},
+               "other": {"konsole": "1234", ...}}
+    """
+    ret = {}
+
+    for path in glob.glob(args.aports + "/*/*/APKBUILD"):
+        # Parse APKBUILD
+        apkbuild = pmb.parse.apkbuild(args, path)
+        url = apkbuild["url"]
+        pkgname = apkbuild["pkgname"]
+        pkgver = apkbuild["pkgver"]
+        if pkgver == "9999":
+            pkgver = apkbuild["_pkgver"]
+
+        if "_git" in pkgver:
+            continue
+
+        # Categorize by URL
+        category = "other"
+        if "https://www.kde.org/workspaces/plasmadesktop" in url:
+            category = "plasma"
+        elif "https://community.kde.org/Frameworks" in url:
+            category = "kde"
+        elif url in ["http://qt-project.org/",
+                     "https://www.qt.io/developers/"]:
+            category = "qt"
+
+        # Remove hotfix number (i.e. 5.16.90.1 becomes 5.16.90)
+        if category in ["kde", "plasma"]:
+            pkgver = ".".join(pkgver.split(".")[0:3])
+
+        # Save result
+        if category not in ret:
+            ret[category] = {}
+        ret[category][pkgname] = pkgver
+    return ret
+
+
+def check_categories(categories):
+    """
+    Make sure that all packages in one framework (kde, plasma, ...) have the
+    same package version (and that there is at least one package in each
+    category).
+
+    :param categories: see return of get_categorized_packages()
+    :returns: True when the check passed, False otherwise
+    """
+    ret = True
+    for category, packages in categories.items():
+        reference = None
+        for pkgname, pkgver in packages.items():
+
+            # Use the first package as reference and print a summary
+            if not reference:
+                logging.info("---")
+                logging.info("Package category: " + category)
+                logging.info("Packages count: " + str(len(packages)))
+
+                # Category "other": done after printing the basic summary, no
+                # need to print each package or compare the package versions
+                if category == "other":
+                    reference = True
+                    break
+
+                # Print all packages
+                logging.info("Packages: " + ", ".join(sorted(packages.keys())))
+
+                # Print the reference and skip checking it against itself
+                reference = {"pkgname": pkgname, "pkgver": pkgver}
+                logging.info("Reference pkgver: " + pkgver + " (from '" +
+                             pkgname + "')")
+                continue
+
+            # Check version against reference
+            if pkgver != reference["pkgver"]:
+                logging.info("ERROR: " + pkgname + " has version " + pkgver)
+                ret = False
+
+        # Each category must at least have one package
+        if not reference:
+            logging.info("ERROR: could not find any packages in category: " +
+                         category)
+            ret = False
+    return ret
+
+
+def test_framework_versions(args):
+    """
+    Make sure that packages of the same framework have the same version.
+    """
+    categories = get_categorized_packages(args)
+    if not check_categories(categories):
+        raise RuntimeError("Framework version check failed!")

.gitlab-ci/testcases/test_directory_structure.py

@@ -5,14 +5,15 @@ import os
 import stat
 
 expected_directories = [
+    "console",
     "cross",
     "device/community",
     "device/main",
     "device/testing",
-    "device/unmaintained",
+    "kde",
+    "maemo",
     "main",
     "modem",
-    "non-free",
     "sxmo",
     "temp",
 ]
@@ -46,7 +47,7 @@ def test_executable_files():
 
 # Make sure files are either:
 #  - in root directory (README.md)
-#  - hidden (.ci/, device/.shared-patches/)
+#  - hidden (.gitlab-ci/, device/.shared-patches/)
 #  - or belong to a package (below a directory with APKBUILD)
 def test_files_belong_to_package():
     # Walk directories and set package_dir when we find an APKBUILD

CODEOWNERS

@@ -1,68 +1,8 @@
 # https://docs.gitlab.com/ee/user/project/code_owners.html
 
-device/*/*-htc-golfu/				@Newbyte
-device/*/*-pine64-pinephone/			@craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
-device/*/*-htc-m8qlul/				@Newbyte
-device/*/*-purism-librem5/			@craftyguy @bshah
-device/*/device-lg-judyln/			@Newbyte
-device/*/device-samsung-m0/			@Newbyte
-device/*/linux-postmarketos-exynos4/		@Newbyte
-device/*/linux-postmarketos-msm8939/		@Newbyte
-device/*/linux-postmarketos-stericsson/		@Newbyte
-device/*/*-qcom-sdm845/				@sdm845-mainline
-device/*/*-xiaomi-berrylium/ 			@joelselvaraj
-device/*/device-oneplus-enchilada/		@calebccff
-device/*/device-oneplus-fajita/			@calebccff
-device/*/firmware-oneplus-sdm845/		@calebccff
-device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
-device/*/*-lenovo-a6010/			@jenneron
-device/*/*-lenovo-a6000/			@jenneron
-device/*/device-microsoft-surface-rt/		@jenneron
-device/*/device-google-fennel/			@jenneron
-device/*/device-google-veyron-minnie/		@jenneron
-device/*/device-google-burnet/			@jenneron
-device/*/device-google-elm/			@jenneron
-device/*/device-google-nyan-big/		@jenneron
-device/*/device-google-peach-pi/		@jenneron
-device/*/device-google-veyron-speedy/		@jenneron
-device/*/linux-google-veyron/			@jenneron
-device/*/u-boot-peach-pi/			@jenneron
-device/*/device-google-cozmo/			@jenneron
-device/*/u-boot-veyron-speedy/			@jenneron
-device/*/device-google-juniper/			@jenneron
-device/*/u-boot-peach-pit/			@jenneron
-device/*/device-google-damu/			@jenneron
-device/*/u-boot-nyan-4gb/			@jenneron
-device/*/device-google-kenzo/			@jenneron
-device/*/device-google-kodama/			@jenneron
-device/*/u-boot-snow/				@jenneron
-device/*/device-google-kevin/			@jenneron
-device/*/linux-postmarketos-exynos5/		@jenneron
-device/*/device-google-krane/			@jenneron
-device/*/soc-mediatek-mt8183/			@jenneron
-device/*/u-boot-veyron-minnie/			@jenneron
-device/*/device-google-fennel14/		@jenneron
-device/*/linux-google-nyan/			@jenneron
-device/*/device-google-willow/			@jenneron
-device/*/linux-postmarketos-mediatek-mt8173/	@jenneron
-device/*/device-google-nyan-blaze/		@jenneron
-device/*/firmware-powervr-gx6250/		@jenneron
-device/*/device-google-hana/			@jenneron
-device/*/device-google-snow/			@jenneron
-device/*/device-google-kappa/			@jenneron
-device/*/u-boot-nyan-2gb/			@jenneron
-device/*/device-google-veyron-jerry/		@jenneron
-device/*/device-google-kakadu/			@jenneron
-device/*/firmware-google-veyron-brcm/		@jenneron
-device/*/device-google-peach-pit/		@jenneron
-device/*/device-lg-judyp/			@jenneron
+device/*/*-pine64-pinephone/        @craftyguy
+device/*/*-purism-librem5/          @craftyguy
+main/osk-sdl/                       @craftyguy
+temp/u-boot-librem5/                @craftyguy
 
-main/postmarketos-update-depthcharge-kernel/	@jenneron
-main/osk-sdl/					@craftyguy
-main/postmarketos-ui-plasma-mobile/ 		@bshah
-main/ttyescape					@calebccff
-temp/u-boot-librem5/				@craftyguy @bshah
-temp/alsa-ucm-conf-google-kukui/		@jenneron
-temp/alsa-ucm-conf-google-gru/			@jenneron
-
-# vim: ts=8 sw=4 et
+# vim: ts=4 sw=4 et

README.md

@@ -3,6 +3,5 @@
 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)
+* [Alpine Linux aports](https://git.alpinelinux.org/cgit/aports)
+* [Alpine Linux package search](https://pkgs.alpinelinux.org/packages)

channels.cfg

@@ -3,37 +3,13 @@
 recommended=edge
 
 [edge]
-description=Rolling release / Most devices / Occasional breakage: https://postmarketos.org/edge
+description=Rolling release channel
 branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
-[v22.06]
-description=Latest release / Recommended for best stability
-branch_pmaports=v22.06
-branch_aports=3.16-stable
-mirrordir_alpine=v3.16
-
-[v21.12]
-description=Old release (unsupported)
-branch_pmaports=v21.12
-branch_aports=3.15-stable
-mirrordir_alpine=v3.15
-
-[v21.06]
-description=Old release (unsupported)
-branch_pmaports=v21.06
-branch_aports=3.14-stable
-mirrordir_alpine=v3.14
-
-[v21.03]
-description=Old release (unsupported)
-branch_pmaports=v21.03
-branch_aports=3.13-stable
-mirrordir_alpine=v3.13
-
-[v20.05]
-description=Old release (unsupported)
+[stable]
+description=Stable release channel (first beta v20.05, does not have many devices yet)
 branch_pmaports=v20.05
 branch_aports=3.12-stable
 mirrordir_alpine=v3.12

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

@@ -1,24 +1,39 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
+From b1faf99f3e546df2cd302bb1ad36a2078224fe8b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
+Date: Fri, 30 Oct 2020 16:59:48 -0600
 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(-)
+ bfd/ChangeLog     | 6 ------
+ bfd/elf32-tic6x.c | 3 ---
+ ld/ChangeLog      | 6 ------
+ ld/ldlang.c       | 9 ++++-----
+ 4 files changed, 4 insertions(+), 20 deletions(-)
 
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 9fac12538a..b5461494e8 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1422,12 +1422,6 @@
+ 	accessing root.u.def of symbols.  Also check root.u.def.section
+ 	is non-NULL.  Reverse tests so as to make the logic positive.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* elf32-tic6x.c (elf32_tic6x_merge_attributes): Don't transfer
+-	Tag_ABI_PIC or Tag_ABI_PID from dynamic objects to the output.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	PR 25882
 diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
+index b8b916bfd3..91bb6a10b1 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)
+@@ -3748,9 +3748,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
  
  	case Tag_ABI_PIC:
  	case Tag_ABI_PID:
@@ -28,20 +43,36 @@ index 5754f3cb860..3ad1d612749 100644
  	  if (out_attr[i].i > in_attr[i].i)
  	    out_attr[i].i = in_attr[i].i;
  	  break;
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index 4eec7d2977..b93452f70c 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1319,12 +1319,6 @@
+ 	* testsuite/ld-aarch64/farcall-group.d: New test driver.
+ 	* testsuite/ld-aarch64/aarch64-elf.exp: Run the new test.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* ldlang.c (lang_check): Call bfd_merge_private_bfd_data for
+-	shared libraries.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	* po/BLD-POTFILES.in: Regenerate.
 diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
+index 9977195074..173d8ec349 100644
 --- a/ld/ldlang.c
 +++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
+@@ -6972,12 +6972,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 ((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
@@ -51,5 +82,5 @@ index 37b64c89ee1..f13beaef9d9 100644
  
  	  /* If we aren't supposed to warn about mismatched input
 -- 
-2.33.0
+2.29.2
 

cross/binutils-aarch64/APKBUILD

@@ -2,35 +2,22 @@
 # Generator: pmbootstrap aportgen binutils-aarch64
 # Based on: main/binutils
 
-
-CTARGET_ARCH=aarch64
-CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
-
 pkgname=binutils-aarch64
-pkgver=2.39
-pkgrel=2
+pkgver=2.35.1
+pkgrel=1
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
-makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
-makedepends="$makedepends_build $makedepends_host"
+makedepends="gettext libtool autoconf automake bison texinfo"
 arch="x86_64"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-subpackages="binutils-dev binutils-doc"
 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
-	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages="$subpackages binutils-gold"
-fi
-
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -38,12 +25,6 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.39-r2:
-#     - CVE-2022-38533
-#   2.39-r0:
-#     - CVE-2022-38126
-#   2.35.2-r1:
-#     - CVE-2021-3487
 #   2.32-r0:
 #     - CVE-2018-19931
 #     - CVE-2018-19932
@@ -53,103 +34,34 @@ fi
 #     - CVE-2017-7614
 
 build() {
-	local _sysroot=/
-	local _cross_configure="--enable-install-libiberty --enable-shared"
-	local _arch_configure=""
-	local _gold_configure="--disable-gold"
-	local _plugin_configure="--enable-plugins"
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		_sysroot="$CBUILDROOT"
-		_cross_configure="--disable-install-libiberty"
-		_plugin_configure="--disable-plugins"
-	fi
-
-	if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-		_gold_configure="--enable-gold"
-	fi
-
-	if [ "$CTARGET_ARCH" = "x86_64" ]; then
-		_arch_configure="--enable-targets=x86_64-pep"
-	fi
-
-	if [ "$CTARGET_ARCH" = "riscv64" ]; then
-		_gold_configure="--disable-gold"
-	fi
-
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--with-build-sysroot="$CBUILDROOT" \
-		--with-sysroot=$_sysroot \
+	_target="$(arch_to_hostspec aarch64)"
+	"$builddir"/configure \
+		--build="$CBUILD" \
+		--target=$_target \
+		--with-lib-path=/usr/lib \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-multilib \
-		--disable-gprofng \
+		--with-sysroot=/usr/$_target \
 		--enable-ld=default \
-		$_gold_configure \
-		--enable-64-bit-bfd \
-		$_plugin_configure \
-		--enable-relro \
+		--enable-gold=yes \
+		--enable-plugins \
 		--enable-deterministic-archives \
-		--enable-default-execstack=no \
-		$_cross_configure \
-		$_arch_configure \
-		$_hash_style_configure \
-		--with-pic \
+		--disable-multilib \
 		--disable-werror \
-		--disable-nls \
-		--with-mmap \
-		--with-system-zlib
+		--disable-nls
 	make
 }
 
 package() {
 	make install DESTDIR="$pkgdir"
-	if [ -d "$pkgdir"/usr/lib64 ]; then
-		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
-		rmdir "$pkgdir"/usr/lib64
-	fi
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# creating cross tools: remove any files that would conflict
-		# with the native tools, or other cross tools
-		rm -r "${pkgdir:?}"/usr/share
-		rm -f "$pkgdir"/usr/lib/libiberty.a
-		rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
-	fi
+
+	# remove man, info folders
+	rm -rf "$pkgdir"/usr/share
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
 
-gold() {
-	pkgdesc="GNU binutils - gold linker"
-
-	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
-	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
-}
-
-sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+sha512sums="94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb  binutils-2.35.1.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
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
-"
+642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch"

cross/binutils-aarch64/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

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

@@ -1,14 +0,0 @@
-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/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch

@@ -1,24 +1,39 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
+From b1faf99f3e546df2cd302bb1ad36a2078224fe8b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
+Date: Fri, 30 Oct 2020 16:59:48 -0600
 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(-)
+ bfd/ChangeLog     | 6 ------
+ bfd/elf32-tic6x.c | 3 ---
+ ld/ChangeLog      | 6 ------
+ ld/ldlang.c       | 9 ++++-----
+ 4 files changed, 4 insertions(+), 20 deletions(-)
 
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 9fac12538a..b5461494e8 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1422,12 +1422,6 @@
+ 	accessing root.u.def of symbols.  Also check root.u.def.section
+ 	is non-NULL.  Reverse tests so as to make the logic positive.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* elf32-tic6x.c (elf32_tic6x_merge_attributes): Don't transfer
+-	Tag_ABI_PIC or Tag_ABI_PID from dynamic objects to the output.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	PR 25882
 diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
+index b8b916bfd3..91bb6a10b1 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)
+@@ -3748,9 +3748,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
  
  	case Tag_ABI_PIC:
  	case Tag_ABI_PID:
@@ -28,20 +43,36 @@ index 5754f3cb860..3ad1d612749 100644
  	  if (out_attr[i].i > in_attr[i].i)
  	    out_attr[i].i = in_attr[i].i;
  	  break;
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index 4eec7d2977..b93452f70c 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1319,12 +1319,6 @@
+ 	* testsuite/ld-aarch64/farcall-group.d: New test driver.
+ 	* testsuite/ld-aarch64/aarch64-elf.exp: Run the new test.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* ldlang.c (lang_check): Call bfd_merge_private_bfd_data for
+-	shared libraries.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	* po/BLD-POTFILES.in: Regenerate.
 diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
+index 9977195074..173d8ec349 100644
 --- a/ld/ldlang.c
 +++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
+@@ -6972,12 +6972,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 ((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
@@ -51,5 +82,5 @@ index 37b64c89ee1..f13beaef9d9 100644
  
  	  /* If we aren't supposed to warn about mismatched input
 -- 
-2.33.0
+2.29.2
 

cross/binutils-armhf/APKBUILD

@@ -2,35 +2,22 @@
 # Generator: pmbootstrap aportgen binutils-armhf
 # Based on: main/binutils
 
-
-CTARGET_ARCH=armhf
-CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
-
 pkgname=binutils-armhf
-pkgver=2.39
-pkgrel=2
+pkgver=2.35.1
+pkgrel=1
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
-makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
-makedepends="$makedepends_build $makedepends_host"
+makedepends="gettext libtool autoconf automake bison texinfo"
 arch="x86_64"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-subpackages="binutils-dev binutils-doc"
 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
-	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages="$subpackages binutils-gold"
-fi
-
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -38,12 +25,6 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.39-r2:
-#     - CVE-2022-38533
-#   2.39-r0:
-#     - CVE-2022-38126
-#   2.35.2-r1:
-#     - CVE-2021-3487
 #   2.32-r0:
 #     - CVE-2018-19931
 #     - CVE-2018-19932
@@ -53,103 +34,34 @@ fi
 #     - CVE-2017-7614
 
 build() {
-	local _sysroot=/
-	local _cross_configure="--enable-install-libiberty --enable-shared"
-	local _arch_configure=""
-	local _gold_configure="--disable-gold"
-	local _plugin_configure="--enable-plugins"
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		_sysroot="$CBUILDROOT"
-		_cross_configure="--disable-install-libiberty"
-		_plugin_configure="--disable-plugins"
-	fi
-
-	if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-		_gold_configure="--enable-gold"
-	fi
-
-	if [ "$CTARGET_ARCH" = "x86_64" ]; then
-		_arch_configure="--enable-targets=x86_64-pep"
-	fi
-
-	if [ "$CTARGET_ARCH" = "riscv64" ]; then
-		_gold_configure="--disable-gold"
-	fi
-
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--with-build-sysroot="$CBUILDROOT" \
-		--with-sysroot=$_sysroot \
+	_target="$(arch_to_hostspec armhf)"
+	"$builddir"/configure \
+		--build="$CBUILD" \
+		--target=$_target \
+		--with-lib-path=/usr/lib \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-multilib \
-		--disable-gprofng \
+		--with-sysroot=/usr/$_target \
 		--enable-ld=default \
-		$_gold_configure \
-		--enable-64-bit-bfd \
-		$_plugin_configure \
-		--enable-relro \
+		--enable-gold=yes \
+		--enable-plugins \
 		--enable-deterministic-archives \
-		--enable-default-execstack=no \
-		$_cross_configure \
-		$_arch_configure \
-		$_hash_style_configure \
-		--with-pic \
+		--disable-multilib \
 		--disable-werror \
-		--disable-nls \
-		--with-mmap \
-		--with-system-zlib
+		--disable-nls
 	make
 }
 
 package() {
 	make install DESTDIR="$pkgdir"
-	if [ -d "$pkgdir"/usr/lib64 ]; then
-		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
-		rmdir "$pkgdir"/usr/lib64
-	fi
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# creating cross tools: remove any files that would conflict
-		# with the native tools, or other cross tools
-		rm -r "${pkgdir:?}"/usr/share
-		rm -f "$pkgdir"/usr/lib/libiberty.a
-		rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
-	fi
+
+	# remove man, info folders
+	rm -rf "$pkgdir"/usr/share
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
 
-gold() {
-	pkgdesc="GNU binutils - gold linker"
-
-	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
-	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
-}
-
-sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+sha512sums="94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb  binutils-2.35.1.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
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
-"
+642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch"

cross/binutils-armhf/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

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

@@ -1,14 +0,0 @@
-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/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch

@@ -1,24 +1,39 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
+From b1faf99f3e546df2cd302bb1ad36a2078224fe8b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
+Date: Fri, 30 Oct 2020 16:59:48 -0600
 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(-)
+ bfd/ChangeLog     | 6 ------
+ bfd/elf32-tic6x.c | 3 ---
+ ld/ChangeLog      | 6 ------
+ ld/ldlang.c       | 9 ++++-----
+ 4 files changed, 4 insertions(+), 20 deletions(-)
 
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 9fac12538a..b5461494e8 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1422,12 +1422,6 @@
+ 	accessing root.u.def of symbols.  Also check root.u.def.section
+ 	is non-NULL.  Reverse tests so as to make the logic positive.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* elf32-tic6x.c (elf32_tic6x_merge_attributes): Don't transfer
+-	Tag_ABI_PIC or Tag_ABI_PID from dynamic objects to the output.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	PR 25882
 diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
+index b8b916bfd3..91bb6a10b1 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)
+@@ -3748,9 +3748,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
  
  	case Tag_ABI_PIC:
  	case Tag_ABI_PID:
@@ -28,20 +43,36 @@ index 5754f3cb860..3ad1d612749 100644
  	  if (out_attr[i].i > in_attr[i].i)
  	    out_attr[i].i = in_attr[i].i;
  	  break;
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index 4eec7d2977..b93452f70c 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1319,12 +1319,6 @@
+ 	* testsuite/ld-aarch64/farcall-group.d: New test driver.
+ 	* testsuite/ld-aarch64/aarch64-elf.exp: Run the new test.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* ldlang.c (lang_check): Call bfd_merge_private_bfd_data for
+-	shared libraries.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	* po/BLD-POTFILES.in: Regenerate.
 diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
+index 9977195074..173d8ec349 100644
 --- a/ld/ldlang.c
 +++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
+@@ -6972,12 +6972,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 ((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
@@ -51,5 +82,5 @@ index 37b64c89ee1..f13beaef9d9 100644
  
  	  /* If we aren't supposed to warn about mismatched input
 -- 
-2.33.0
+2.29.2
 

cross/binutils-armv7/APKBUILD

@@ -2,35 +2,22 @@
 # Generator: pmbootstrap aportgen binutils-armv7
 # Based on: main/binutils
 
-
-CTARGET_ARCH=armv7
-CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
-
 pkgname=binutils-armv7
-pkgver=2.39
-pkgrel=2
+pkgver=2.35.1
+pkgrel=1
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
-makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
-makedepends="$makedepends_build $makedepends_host"
+makedepends="gettext libtool autoconf automake bison texinfo"
 arch="x86_64"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-subpackages="binutils-dev binutils-doc"
 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
-	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages="$subpackages binutils-gold"
-fi
-
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -38,12 +25,6 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.39-r2:
-#     - CVE-2022-38533
-#   2.39-r0:
-#     - CVE-2022-38126
-#   2.35.2-r1:
-#     - CVE-2021-3487
 #   2.32-r0:
 #     - CVE-2018-19931
 #     - CVE-2018-19932
@@ -53,103 +34,34 @@ fi
 #     - CVE-2017-7614
 
 build() {
-	local _sysroot=/
-	local _cross_configure="--enable-install-libiberty --enable-shared"
-	local _arch_configure=""
-	local _gold_configure="--disable-gold"
-	local _plugin_configure="--enable-plugins"
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		_sysroot="$CBUILDROOT"
-		_cross_configure="--disable-install-libiberty"
-		_plugin_configure="--disable-plugins"
-	fi
-
-	if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-		_gold_configure="--enable-gold"
-	fi
-
-	if [ "$CTARGET_ARCH" = "x86_64" ]; then
-		_arch_configure="--enable-targets=x86_64-pep"
-	fi
-
-	if [ "$CTARGET_ARCH" = "riscv64" ]; then
-		_gold_configure="--disable-gold"
-	fi
-
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--with-build-sysroot="$CBUILDROOT" \
-		--with-sysroot=$_sysroot \
+	_target="$(arch_to_hostspec armv7)"
+	"$builddir"/configure \
+		--build="$CBUILD" \
+		--target=$_target \
+		--with-lib-path=/usr/lib \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-multilib \
-		--disable-gprofng \
+		--with-sysroot=/usr/$_target \
 		--enable-ld=default \
-		$_gold_configure \
-		--enable-64-bit-bfd \
-		$_plugin_configure \
-		--enable-relro \
+		--enable-gold=yes \
+		--enable-plugins \
 		--enable-deterministic-archives \
-		--enable-default-execstack=no \
-		$_cross_configure \
-		$_arch_configure \
-		$_hash_style_configure \
-		--with-pic \
+		--disable-multilib \
 		--disable-werror \
-		--disable-nls \
-		--with-mmap \
-		--with-system-zlib
+		--disable-nls
 	make
 }
 
 package() {
 	make install DESTDIR="$pkgdir"
-	if [ -d "$pkgdir"/usr/lib64 ]; then
-		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
-		rmdir "$pkgdir"/usr/lib64
-	fi
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# creating cross tools: remove any files that would conflict
-		# with the native tools, or other cross tools
-		rm -r "${pkgdir:?}"/usr/share
-		rm -f "$pkgdir"/usr/lib/libiberty.a
-		rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
-	fi
+
+	# remove man, info folders
+	rm -rf "$pkgdir"/usr/share
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
 
-gold() {
-	pkgdesc="GNU binutils - gold linker"
-
-	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
-	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
-}
-
-sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+sha512sums="94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb  binutils-2.35.1.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
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
-"
+642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch"

cross/binutils-armv7/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

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

@@ -1,14 +0,0 @@
-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-riscv64/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch

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

@@ -1,155 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen binutils-riscv64
-# Based on: main/binutils
-
-
-CTARGET_ARCH=riscv64
-CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
-
-pkgname=binutils-riscv64
-pkgver=2.39
-pkgrel=2
-pkgdesc="Tools necessary to build programs for riscv64 targets"
-url="https://www.gnu.org/software/binutils/"
-makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
-makedepends="$makedepends_build $makedepends_host"
-arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-subpackages="binutils-dev binutils-doc"
-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
-	CVE-2022-38533.patch
-	"
-builddir="$srcdir/binutils-$pkgver"
-
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages="$subpackages binutils-gold"
-fi
-
-if [ "$CHOST" != "$CTARGET" ]; then
-	pkgname="binutils-$CTARGET_ARCH"
-	subpackages=""
-	sonameprefix="binutils:"
-fi
-
-# secfixes:
-#   2.39-r2:
-#     - CVE-2022-38533
-#   2.39-r0:
-#     - CVE-2022-38126
-#   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() {
-	local _sysroot=/
-	local _cross_configure="--enable-install-libiberty --enable-shared"
-	local _arch_configure=""
-	local _gold_configure="--disable-gold"
-	local _plugin_configure="--enable-plugins"
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		_sysroot="$CBUILDROOT"
-		_cross_configure="--disable-install-libiberty"
-		_plugin_configure="--disable-plugins"
-	fi
-
-	if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-		_gold_configure="--enable-gold"
-	fi
-
-	if [ "$CTARGET_ARCH" = "x86_64" ]; then
-		_arch_configure="--enable-targets=x86_64-pep"
-	fi
-
-	if [ "$CTARGET_ARCH" = "riscv64" ]; then
-		_gold_configure="--disable-gold"
-	fi
-
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--with-build-sysroot="$CBUILDROOT" \
-		--with-sysroot=$_sysroot \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-multilib \
-		--disable-gprofng \
-		--enable-ld=default \
-		$_gold_configure \
-		--enable-64-bit-bfd \
-		$_plugin_configure \
-		--enable-relro \
-		--enable-deterministic-archives \
-		--enable-default-execstack=no \
-		$_cross_configure \
-		$_arch_configure \
-		$_hash_style_configure \
-		--with-pic \
-		--disable-werror \
-		--disable-nls \
-		--with-mmap \
-		--with-system-zlib
-	make
-}
-
-package() {
-	make install DESTDIR="$pkgdir"
-	if [ -d "$pkgdir"/usr/lib64 ]; then
-		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
-		rmdir "$pkgdir"/usr/lib64
-	fi
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# creating cross tools: remove any files that would conflict
-		# with the native tools, or other cross tools
-		rm -r "${pkgdir:?}"/usr/share
-		rm -f "$pkgdir"/usr/lib/libiberty.a
-		rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
-	fi
-}
-
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
-gold() {
-	pkgdesc="GNU binutils - gold linker"
-
-	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
-	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
-}
-
-sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.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
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
-"

cross/binutils-riscv64/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

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

@@ -1,46 +0,0 @@
-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-riscv64/binutils-mips-disable-assert.patch

@@ -1,14 +0,0 @@
-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-riscv64/gold-mips.patch

@@ -1,39 +0,0 @@
-# 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-riscv64/ld-bfd-mips.patch

@@ -1,19 +0,0 @@
---- ./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,11 +7,11 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-aarch64
-pkgver=1.35.0
-pkgrel=27
+pkgver=1.32.0
+pkgrel=8
 
 _arch="aarch64"
-_mirror="http://dl-4.alpinelinux.org/alpine/"
+_mirror="http://dl-2.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
@@ -31,6 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="
-1df3f1400461a3b9c951be9bf4ade500af9b83b4a11025bb244224cee197753d95471a8373a2f5f45d343599f632629c005dc7eba2c3d558dfbcfa56063ed110  busybox-static-1.35.0-r27-aarch64-edge.apk
-"
+sha512sums="9e6078f585cee2f3bea8cc355a7f53d2efbebb47029f20f4c90f84acfbae7ade49bfff97c5b6e7eff0e4128d3f67c3f4d02e574cfa8d5483cba0a2dda2f679d5  busybox-static-1.32.0-r8-aarch64-edge.apk"

cross/busybox-static-armhf/APKBUILD

@@ -7,11 +7,11 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armhf
-pkgver=1.35.0
-pkgrel=27
+pkgver=1.32.0
+pkgrel=8
 
 _arch="armhf"
-_mirror="http://dl-4.alpinelinux.org/alpine/"
+_mirror="http://dl-2.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
@@ -31,6 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="
-cdc8cfb4e013ad0761d2417fba91f75221d97074705bcd4f8ae7a64d0badadff2340595b5d03ff0e5ca608f543ce85f4ba82820a4fd501ecb758d77432afcf90  busybox-static-1.35.0-r27-armhf-edge.apk
-"
+sha512sums="57cd3ab0e504a6a6ee27fb2aee902a4426136d1e0d3ae3a55003e5f3a4f7df03cce6c201244287f4315f4f8ba162f19fee18f3159f11a07015b7c37fe607d701  busybox-static-1.32.0-r8-armhf-edge.apk"

cross/busybox-static-armv7/APKBUILD

@@ -7,11 +7,11 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armv7
-pkgver=1.35.0
-pkgrel=27
+pkgver=1.32.0
+pkgrel=8
 
 _arch="armv7"
-_mirror="http://dl-4.alpinelinux.org/alpine/"
+_mirror="http://dl-2.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
@@ -31,6 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="
-65678aa673f8fb11d0a68b7d22203ab9ce2795fb6b3d47c117f8cbecf61305316bb0b0de12812df5d7fe2febe0630fd6ca3961434ffe8051da6a0e194c133cb4  busybox-static-1.35.0-r27-armv7-edge.apk
-"
+sha512sums="2e11a7a2b7474ddf0705f066e211bb89f2d17b81ef008080168b1cbbf6330810737e60cd44cd7ab5d0379841d78916ca9f4386e76ccf0e731dc9d69296454f8e  busybox-static-1.32.0-r8-armv7-edge.apk"

cross/gcc-aarch64/0001-posix_memalign.patch

@@ -1,4 +1,4 @@
-From 74c7b0df9971b6bc75d7d172c2819ffd21d51050 Mon Sep 17 00:00:00 2001
+From 61621c64caffb54ea82c5b573e55d16dcb732dea Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
 Subject: [PATCH] posix_memalign
@@ -8,7 +8,7 @@ Subject: [PATCH] posix_memalign
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 3b2e4f47915..20f790904a2 100644
+index 87344d9383f..ece428df487 100644
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
 @@ -27,12 +27,13 @@
@@ -37,3 +37,6 @@ index 3b2e4f47915..20f790904a2 100644
      return __ptr;
    else
      return NULL;
+-- 
+2.29.2
+

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

@@ -1,4 +1,4 @@
-From dd1e75ff4ecda96957465b34681f245e818928bd Mon Sep 17 00:00:00 2001
+From b6af6fd400def85c7f6933a991c888df16f12533 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] gcc: poison-system-directories
@@ -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 8a0dafc522d..0357868e22c 100644
+index dfed6ec76ba..8bb65e0e1af 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -710,6 +710,10 @@ Wreturn-local-addr
+@@ -682,6 +682,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 8a0dafc522d..0357868e22c 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 64c27c9cfac..f0fbf123aa8 100644
+index 364eba47737..9551c0dfdf9 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -230,6 +230,12 @@
+@@ -224,6 +224,12 @@
  #endif
  
  
@@ -58,18 +58,18 @@ index 64c27c9cfac..f0fbf123aa8 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 5ce0557719a..e9060112384 100755
+index b4088d8fd1e..793530e21cf 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -1023,6 +1023,7 @@ enable_maintainer_mode
+@@ -1010,6 +1010,7 @@ with_system_zlib
+ enable_maintainer_mode
  enable_link_mutex
- enable_link_serialization
  enable_version_specific_runtime_libs
 +enable_poison_system_directories
  enable_plugin
  enable_host_shared
  enable_libquadmath_support
-@@ -1785,6 +1786,8 @@ Optional Features:
+@@ -1766,6 +1767,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 5ce0557719a..e9060112384 100755
    --enable-plugin         enable plugin support
    --enable-host-shared    build host code as shared libraries
    --disable-libquadmath-support
-@@ -31982,6 +31985,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -30271,6 +30274,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
  fi
  
  
@@ -99,10 +99,10 @@ index 5ce0557719a..e9060112384 100755
  
  
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 23bee7010a3..75a7048045c 100644
+index 070b9c6c497..0fd438e39e5 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7421,6 +7421,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -6605,6 +6605,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
                  [specify that runtime libraries should be
                   installed in a compiler-specific directory])])
  
@@ -120,10 +120,10 @@ index 23bee7010a3..75a7048045c 100644
  AC_SUBST(subdirs)
  AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 07b440190c3..b2de464798a 100644
+index 7775bcc72eb..034d3066c2b 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -379,6 +379,7 @@ Objective-C and Objective-C++ Dialects}.
+@@ -348,6 +348,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
@@ -131,7 +131,7 @@ index 07b440190c3..b2de464798a 100644
  -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
  -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
  -Wno-scalar-storage-order  -Wsequence-point @gol
-@@ -8029,6 +8030,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -6926,6 +6927,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.
  
@@ -146,11 +146,11 @@ index 07b440190c3..b2de464798a 100644
  @item -Wfloat-equal
  @opindex Wfloat-equal
  @opindex Wno-float-equal
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index bb07cc244e3..47fb5802194 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1159,6 +1159,8 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 9f790db0daf..b2200c5185a 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -1041,6 +1041,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}}} \
@@ -159,10 +159,10 @@ index bb07cc244e3..47fb5802194 100644
      %{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 bd2a97938eb..c80f100f476 100644
---- a/gcc/incpath.cc
-+++ b/gcc/incpath.cc
+diff --git a/gcc/incpath.c b/gcc/incpath.c
+index 8a2bda00f80..9098ab044ab 100644
+--- a/gcc/incpath.c
++++ b/gcc/incpath.c
 @@ -26,6 +26,7 @@
  #include "intl.h"
  #include "incpath.h"
@@ -171,7 +171,7 @@ index bd2a97938eb..c80f100f476 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)
+@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
  	}
        fprintf (stderr, _("End of search list.\n"));
      }
@@ -198,3 +198,6 @@ index bd2a97938eb..c80f100f476 100644
  }
  
  /* Use given -I paths for #include "..." but not #include <...>, and
+-- 
+2.29.2
+

cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch

@@ -0,0 +1,39 @@
+From 8e8955cbd60155d131d3ac66cb2a1e7e41835278 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:45:49 +0000
+Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
+
+---
+ gcc/doc/invoke.texi | 3 +++
+ gcc/gcc.c           | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 034d3066c2b..4885efe3247 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -14663,6 +14663,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,relro,now} is used.  To disable, use @option{-Wl,-z,norelro}.
++
+ @item -u @var{symbol}
+ @opindex u
+ Pretend the symbol @var{symbol} is undefined, to force linking of
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index b2200c5185a..625c9ab7902 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -1039,6 +1039,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 \
++   "-z relro -z now " \
+    "%X %{o*} %{e*} %{N} %{n} %{r}\
+     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
+     %{Wno-poison-system-directories:--no-poison-system-directories} \
+-- 
+2.29.2
+

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

@@ -1,41 +0,0 @@
-From 40e45739e7d3787acd13b5b9a4c27d843de0ffe2 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:45:49 +0000
-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.
-
-Binutils does not appear to have a similar option for enabling -z
-now by default.
----
- gcc/doc/invoke.texi | 3 +++
- gcc/gcc.cc          | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index b2de464798a..83bd1bde433 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -16872,6 +16872,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}.
-+
- @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 47fb5802194..d18b5d7b59a 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1157,6 +1157,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 \
-+   "-z now " \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
-     %{Wno-poison-system-directories:--no-poison-system-directories} \

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

@@ -1,19 +1,19 @@
-From 666d0aeb808ac9c10d065ae7b196695c81a25a20 Mon Sep 17 00:00:00 2001
+From c5924988157b27b60c28d20d971179bbacbd2ae3 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
 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 4672ae8486a..573c021e1e8 100644
---- a/gcc/c-family/c-cppbuiltin.cc
-+++ b/gcc/c-family/c-cppbuiltin.cc
-@@ -1510,6 +1510,10 @@ c_cpp_builtins (cpp_reader *pfile)
+diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
+index db91a36794a..ed976c71404 100644
+--- a/gcc/c-family/c-cppbuiltin.c
++++ b/gcc/c-family/c-cppbuiltin.c
+@@ -1385,6 +1385,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 4672ae8486a..573c021e1e8 100644
    if (flag_gnu89_inline)
      cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 83bd1bde433..dda299a9987 100644
+index 4885efe3247..a3e5e002fa5 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -10896,6 +10896,12 @@ also turns on the following optimization flags:
+@@ -9230,6 +9230,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.
  
@@ -41,3 +41,6 @@ index 83bd1bde433..dda299a9987 100644
  @item -O3
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
+-- 
+2.29.2
+

cross/gcc-aarch64/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch

@@ -1,4 +1,4 @@
-From 75d1a35180cf0967f062765314bf091a64032062 Mon Sep 17 00:00:00 2001
+From 5b8de466aa959a6c929cee2c78e4159a0209b4f8 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
 Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
@@ -18,11 +18,11 @@ Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
  gcc/config/rs6000/sysv4.h          |  2 +-
  gcc/config/s390/linux.h            |  2 +-
  gcc/config/sparc/linux.h           |  2 +-
- gcc/gcc.cc                         | 28 ++++++++++++++++++++--------
+ gcc/gcc.c                          | 28 ++++++++++++++++++++--------
  14 files changed, 36 insertions(+), 19 deletions(-)
 
 diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 5e4553d79f5..b516f3ef97f 100644
+index e587e2e9ad6..1d1017aa523 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -35,6 +35,7 @@
@@ -34,7 +34,7 @@ index 5e4553d79f5..b516f3ef97f 100644
     %{shared:-shared}				\
     %{symbolic:-Bsymbolic}			\
 diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index 17f16a55910..9ec667e9a5e 100644
+index e25fcac3c59..22b2f7b0d14 100644
 --- a/gcc/config/alpha/linux-elf.h
 +++ b/gcc/config/alpha/linux-elf.h
 @@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -47,7 +47,7 @@ index 17f16a55910..9ec667e9a5e 100644
    %{shared:-shared}						\
    %{!shared:							\
 diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index df3da67c4f0..7532bc29f9b 100644
+index 0ec3aa53189..f8bda84de2a 100644
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
 @@ -70,6 +70,7 @@
@@ -59,19 +59,16 @@ index df3da67c4f0..7532bc29f9b 100644
     SUBTARGET_EXTRA_LINK_SPEC
  
 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 857c0e077bf..8433e56c3e1 100644
+index ff2e880b1fa..7f30c363e4a 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
-@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -136,17 +136,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
    "%{static-libasan:%{!shared:" \
    LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
 -  LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
 +  LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBHWASAN_EARLY_SPEC
- #define LIBHWASAN_EARLY_SPEC "%{static-libhwasan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -lhwasan --no-whole-archive " \
-@@ -145,12 +145,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ #undef LIBTSAN_EARLY_SPEC
  #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
    "%{static-libtsan:%{!shared:" \
    LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
@@ -87,10 +84,10 @@ index 857c0e077bf..8433e56c3e1 100644
  
  #undef TARGET_F951_OPTIONS
 diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index 0102b2a6f3b..994414c1845 100644
+index ae4aa844f02..54b91c0492a 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
-@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -74,7 +74,7 @@ along with GCC; see the file COPYING3.  If not see
    { "link_emulation", GNU_USER_LINK_EMULATION },\
    { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
  
@@ -100,7 +97,7 @@ index 0102b2a6f3b..994414c1845 100644
      %{!static: \
        %{!static-pie: \
 diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index abc8cf624ca..fe656aeae27 100644
+index 785c68220b8..21dd66b412a 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
 @@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -112,7 +109,7 @@ index abc8cf624ca..fe656aeae27 100644
    %{!shared: \
      %{!static: \
 diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
-index 93510098ccc..3813e536423 100644
+index ee38e218aec..0325971d818 100644
 --- a/gcc/config/ia64/linux.h
 +++ b/gcc/config/ia64/linux.h
 @@ -58,7 +58,7 @@ do {						\
@@ -125,7 +122,7 @@ index 93510098ccc..3813e536423 100644
    %{!shared: \
      %{!static: \
 diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 6aad7192e69..e1256a55add 100644
+index 5d0782100bb..4be5fbb2191 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
 @@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -137,7 +134,7 @@ index 6aad7192e69..e1256a55add 100644
      %{!static: \
        %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 38803723ba9..3067ed6eac8 100644
+index 4afef7c228c..ba1a6e60e05 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
 @@ -58,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -145,14 +142,14 @@ index 38803723ba9..3067ed6eac8 100644
  
  #define LINK_SPEC "\
 +-as-needed \
- -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
+ -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
  %{mno-relax:--no-relax} \
- %{mbig-endian:-EB} \
+ %{shared} \
 diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index b2a7afabc73..34ceb4e4fce 100644
+index 2ded3301282..a1e44ddcc0d 100644
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
-@@ -377,13 +377,13 @@ extern int dot_symbols;
+@@ -457,13 +457,13 @@ extern int dot_symbols;
  					   " -m elf64ppc")
  #endif
  
@@ -169,10 +166,10 @@ index b2a7afabc73..34ceb4e4fce 100644
      %{rdynamic:-export-dynamic} \
      -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index 7e2519de5d4..61215a7a1b3 100644
+index 9ade72114e9..9490b84a153 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -788,7 +788,7 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
  #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
  #endif
  
@@ -182,7 +179,7 @@ index 7e2519de5d4..61215a7a1b3 100644
    -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
  
 diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index d7b7e7a7b02..d2287f14f2e 100644
+index 6919b468f06..56d52d41b31 100644
 --- a/gcc/config/s390/linux.h
 +++ b/gcc/config/s390/linux.h
 @@ -82,7 +82,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -195,7 +192,7 @@ index d7b7e7a7b02..d2287f14f2e 100644
     %{!shared: \
        %{static:-static} \
 diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 6a809e9092d..93bfb92d3ff 100644
+index 63853e60c03..de6d8675456 100644
 --- a/gcc/config/sparc/linux.h
 +++ b/gcc/config/sparc/linux.h
 @@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
@@ -207,11 +204,11 @@ index 6a809e9092d..93bfb92d3ff 100644
    %{!mno-relax:%{!r:-relax}} \
    %{!shared: \
      %{!static: \
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index d18b5d7b59a..3b76311b544 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -744,8 +744,11 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 625c9ab7902..7aec9d3a016 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -695,8 +695,11 @@ proper position among the other output files.  */
  #ifdef LIBASAN_EARLY_SPEC
  #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
  #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -225,7 +222,7 @@ index d18b5d7b59a..3b76311b544 100644
  		     STATIC_LIBASAN_LIBS
  #else
  #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -780,8 +783,11 @@ proper position among the other output files.  */
+@@ -713,8 +716,11 @@ proper position among the other output files.  */
  #ifdef LIBTSAN_EARLY_SPEC
  #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
  #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -239,7 +236,7 @@ index d18b5d7b59a..3b76311b544 100644
  		     STATIC_LIBTSAN_LIBS
  #else
  #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -798,8 +804,11 @@ proper position among the other output files.  */
+@@ -731,8 +737,11 @@ proper position among the other output files.  */
  #ifdef LIBLSAN_EARLY_SPEC
  #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
  #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -253,7 +250,7 @@ index d18b5d7b59a..3b76311b544 100644
  		     STATIC_LIBLSAN_LIBS
  #else
  #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -814,8 +823,11 @@ proper position among the other output files.  */
+@@ -747,8 +756,11 @@ proper position among the other output files.  */
  #define STATIC_LIBUBSAN_LIBS \
    " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
  #ifdef HAVE_LD_STATIC_DYNAMIC
@@ -267,3 +264,6 @@ index d18b5d7b59a..3b76311b544 100644
  		     STATIC_LIBUBSAN_LIBS
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+-- 
+2.29.2
+

cross/gcc-aarch64/0006-Enable-Wformat-and-Wformat-security-by-default.patch

@@ -1,4 +1,4 @@
-From c664283dd30949c5299d1c45bd5740bcfe993d22 Mon Sep 17 00:00:00 2001
+From 7c79655102e756622211ca40384e8562be334973 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
 Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index 07da40ef43b..8683f706426 100644
+index c49da99d395..93f25319005 100644
 --- a/gcc/c-family/c.opt
 +++ b/gcc/c-family/c.opt
-@@ -692,7 +692,7 @@ Warn about function calls with format strings that write past the end
+@@ -599,7 +599,7 @@ Warn about function calls with format strings that write past the end
  of the destination region.  Same as -Wformat-overflow=1.
  
  Wformat-security
@@ -20,7 +20,7 @@ index 07da40ef43b..8683f706426 100644
  Warn about possible security problems with format functions.
  
  Wformat-signedness
-@@ -713,7 +713,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
+@@ -620,7 +620,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
  Warn about zero-length formats.
  
  Wformat=
@@ -29,3 +29,6 @@ index 07da40ef43b..8683f706426 100644
  Warn about printf/scanf/strftime/strfmon format string anomalies.
  
  Wformat-overflow=
+-- 
+2.29.2
+

cross/gcc-aarch64/0007-Enable-Wtrampolines-by-default.patch

@@ -1,4 +1,4 @@
-From e4d0ec43e772b6dc7c3708aed5309897df26a125 Mon Sep 17 00:00:00 2001
+From 25eb9009f180c799647cfc81d27d8b67ba3f3b72 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:48:24 +0000
 Subject: [PATCH] Enable -Wtrampolines by default.
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wtrampolines by default.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gcc/common.opt b/gcc/common.opt
-index 0357868e22c..6d5e5eebe60 100644
+index 8bb65e0e1af..ace932b300d 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -802,7 +802,7 @@ Common Var(warn_system_headers) Warning
+@@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning
  Do not suppress warnings from system headers.
  
  Wtrampolines
@@ -19,4 +19,7 @@ index 0357868e22c..6d5e5eebe60 100644
 +Common Var(warn_trampolines) Init(1) Warning
  Warn whenever a trampoline is generated.
  
- Wtrivial-auto-var-init
+ Wtype-limits
+-- 
+2.29.2
+

cross/gcc-aarch64/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch

@@ -1,19 +1,19 @@
-From 27e5d5bd3fed9006a2958d2b09750d15ad07383b Mon Sep 17 00:00:00 2001
+From cfa0c7a3154415fe0e0ab6bd373a8f2164024ff5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:49:40 +0000
 Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
  Change the buffer size.
 
 ---
- gcc/gcc.cc     | 8 +++++++-
+ gcc/gcc.c      | 8 +++++++-
  gcc/params.opt | 2 +-
  2 files changed, 8 insertions(+), 2 deletions(-)
 
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 3b76311b544..cc99d0b7aa1 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -996,6 +996,12 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 7aec9d3a016..daeb4d0c8ea 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -886,6 +886,12 @@ proper position among the other output files.  */
  #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
  #endif
  
@@ -26,20 +26,20 @@ index 3b76311b544..cc99d0b7aa1 100644
  #ifndef LINK_SSP_SPEC
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1295,7 +1301,7 @@ static const char *cc1_options =
+@@ -1170,7 +1176,7 @@ static const char *cc1_options =
   %{-version:--version}\
   %{-help=*:--help=%*}\
-  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
+  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
 - %{fsyntax-only:-o %j} %{-param*}\
 + %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
   %{coverage:-fprofile-arcs -ftest-coverage}\
   %{fprofile-arcs|fprofile-generate*|coverage:\
     %{!fprofile-update=single:\
 diff --git a/gcc/params.opt b/gcc/params.opt
-index b88e1372005..82a7e25dd2f 100644
+index 4aec480798b..eaecfab37ad 100644
 --- a/gcc/params.opt
 +++ b/gcc/params.opt
-@@ -1012,7 +1012,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
+@@ -853,7 +853,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
  The maximum number of SSA_NAME assignments to follow in determining a value.
  
  -param=ssp-buffer-size=
@@ -48,3 +48,6 @@ index b88e1372005..82a7e25dd2f 100644
  The lower bound for a buffer to be considered for stack smashing protection.
  
  -param=stack-clash-protection-guard-size=
+-- 
+2.29.2
+

cross/gcc-aarch64/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch

@@ -1,4 +1,4 @@
-From 83bf2a316222e2fe0b72968cadf4e334d41173f6 Mon Sep 17 00:00:00 2001
+From 4733bb8115411c50028f7a583783ac10c63e8536 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
 Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc
@@ -26,7 +26,7 @@ https://bugs.gentoo.org/295480
  2 files changed, 2 insertions(+)
 
 diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
-index 8f51544989e..5329804d136 100644
+index a9391d8d167..f7eee24dc8c 100644
 --- a/libstdc++-v3/po/Makefile.am
 +++ b/libstdc++-v3/po/Makefile.am
 @@ -38,6 +38,7 @@ MSGFMT = msgfmt
@@ -38,10 +38,10 @@ index 8f51544989e..5329804d136 100644
  
  all-local: all-local-$(USE_NLS)
 diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
-index 243f3db7b72..822210781fa 100644
+index a0f84b0cfa0..ab24a47a2fd 100644
 --- a/libstdc++-v3/po/Makefile.in
 +++ b/libstdc++-v3/po/Makefile.in
-@@ -561,6 +561,7 @@ uninstall-am:
+@@ -548,6 +548,7 @@ uninstall-am:
  
  
  .po.mo:
@@ -49,3 +49,6 @@ index 243f3db7b72..822210781fa 100644
  	$(MSGFMT) -o $@ $<
  
  all-local: all-local-$(USE_NLS)
+-- 
+2.29.2
+

cross/gcc-aarch64/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch

@@ -1,4 +1,4 @@
-From 190064993cd8ddbd48015c1fc1916e4110a97733 Mon Sep 17 00:00:00 2001
+From 7d4ee7a90b87edd33a7f628ff89ce1b1e0576b4d Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
 Subject: [PATCH] Don't declare asprintf if defined as a macro.
@@ -8,10 +8,10 @@ Subject: [PATCH] Don't declare asprintf if defined as a macro.
  1 file changed, 3 insertions(+)
 
 diff --git a/include/libiberty.h b/include/libiberty.h
-index a65ced9c820..eb20ab0f95f 100644
+index 141cb886a85..fa0e78eb62f 100644
 --- a/include/libiberty.h
 +++ b/include/libiberty.h
-@@ -652,8 +652,11 @@ extern void *bsearch_r (const void *, const void *,
+@@ -645,8 +645,11 @@ extern int pwait (int, int *, int);
  /* Like sprintf but provides a pointer to malloc'd storage, which must
     be freed by the caller.  */
  
@@ -23,3 +23,6 @@ index a65ced9c820..eb20ab0f95f 100644
  
  /* Like asprintf but allocates memory without fail. This works like
     xmalloc.  */
+-- 
+2.29.2
+

cross/gcc-aarch64/0011-libiberty-copy-PIC-objects-during-build-process.patch

@@ -1,4 +1,4 @@
-From 838e1daa955d9013c462be3471497cb39641e951 Mon Sep 17 00:00:00 2001
+From 84b959624e1371f1d02630b6e067f00f46dbe516 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
 Subject: [PATCH] libiberty: copy PIC objects during build process
@@ -8,10 +8,10 @@ Subject: [PATCH] libiberty: copy PIC objects during build process
  1 file changed, 1 insertion(+)
 
 diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index 1b17c2e3a47..8db1176df2e 100644
+index d6b302e02fd..fd39928546f 100644
 --- a/libiberty/Makefile.in
 +++ b/libiberty/Makefile.in
-@@ -265,6 +265,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
+@@ -263,6 +263,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
  	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
  	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
  	  $(RANLIB) $(TARGETLIB); \
@@ -19,3 +19,6 @@ index 1b17c2e3a47..8db1176df2e 100644
  	  cd ..; \
  	else true; fi
  
+-- 
+2.29.2
+

cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch

@@ -1,4 +1,4 @@
-From 717346fbbd6642ba6b0c3af2deb3771794346507 Mon Sep 17 00:00:00 2001
+From 8ffd575380bc28aaf3c210ad838b205ce2403124 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:36 +0000
 Subject: [PATCH] libitm: disable FORTIFY
@@ -8,10 +8,10 @@ Subject: [PATCH] libitm: disable FORTIFY
  1 file changed, 10 insertions(+)
 
 diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index 06e90973ef3..669e64236c3 100644
+index 04109160e91..107b957ece3 100644
 --- a/libitm/configure.tgt
 +++ b/libitm/configure.tgt
-@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
+@@ -46,6 +46,16 @@ if test "$gcc_cv_have_tls" = yes ; then
    esac
  fi
  
@@ -28,3 +28,6 @@ index 06e90973ef3..669e64236c3 100644
  # Map the target cpu to an ARCH sub-directory.  At the same time,
  # work out any special compilation flags as necessary.
  case "${target_cpu}" in
+-- 
+2.29.2
+

cross/gcc-aarch64/0013-libgcc_s.patch

@@ -1,37 +1,37 @@
-From 048c394eb709bfd216e307c1b92ac7f8a7e7758b Mon Sep 17 00:00:00 2001
+From 0d83ea67b2e16658a88068ebce0e25cce22fe75e Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
 Subject: [PATCH] libgcc_s
 
 ---
- gcc/config/i386/i386-expand.cc | 4 ++--
- libgcc/config/i386/cpuinfo.c   | 6 +++---
- libgcc/config/i386/t-linux     | 2 +-
+ gcc/config/i386/i386-expand.c | 4 ++--
+ libgcc/config/i386/cpuinfo.c  | 6 +++---
+ libgcc/config/i386/t-linux    | 2 +-
  3 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
-index 31780b6daf7..d89898846e1 100644
---- a/gcc/config/i386/i386-expand.cc
-+++ b/gcc/config/i386/i386-expand.cc
-@@ -12338,10 +12338,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
+index c6033688f51..a60e5162995 100644
+--- a/gcc/config/i386/i386-expand.c
++++ b/gcc/config/i386/i386-expand.c
+@@ -10966,10 +10966,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
      {
      case IX86_BUILTIN_CPU_INIT:
        {
--	/* Make it call __cpu_indicator_init in libgcc.  */
-+	/* Make it call __cpu_indicator_init in libgcc.a.  */
+-	/* Make it call __cpu_indicator_init in libgcc. */
++	/* Make it call __cpu_indicator_init_local in libgcc.a. */
  	tree call_expr, fndecl, type;
- 	type = build_function_type_list (integer_type_node, NULL_TREE);
+         type = build_function_type_list (integer_type_node, NULL_TREE); 
 -	fndecl = build_fn_decl ("__cpu_indicator_init", type);
 +	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
- 	call_expr = build_call_expr (fndecl, 0);
+ 	call_expr = build_call_expr (fndecl, 0); 
  	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
        }
 diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index dab1d98060f..cf824b4114a 100644
+index cf5f0884bb4..ed0381e7744 100644
 --- a/libgcc/config/i386/cpuinfo.c
 +++ b/libgcc/config/i386/cpuinfo.c
-@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
- 			     __cpu_features2);
+@@ -510,7 +510,7 @@ __cpu_indicator_init (void)
+   return 0;
  }
  
 -#if defined SHARED && defined USE_ELF_SYMVER
@@ -52,3 +52,6 @@ index 8506a635790..564296f788e 100644
 -HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
  CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
+-- 
+2.29.2
+

cross/gcc-aarch64/0014-nopie.patch

@@ -1,4 +1,4 @@
-From db28b1e0f3b06325026ec5b5e7cdca4e9992e05c Mon Sep 17 00:00:00 2001
+From 99ccc2d68049c56519d49e21b6f13cf8d98ea163 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
 Subject: [PATCH] nopie
@@ -9,10 +9,10 @@ Subject: [PATCH] nopie
  2 files changed, 40 insertions(+)
 
 diff --git a/gcc/configure b/gcc/configure
-index e9060112384..2f6b3265a6c 100755
+index 793530e21cf..2d874d3defe 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -32497,6 +32497,33 @@ fi
+@@ -30779,6 +30779,33 @@ fi
  $as_echo "$gcc_cv_no_pie" >&6; }
  if test "$gcc_cv_no_pie" = "yes"; then
    NO_PIE_FLAG="-no-pie"
@@ -47,10 +47,10 @@ index e9060112384..2f6b3265a6c 100755
  
  
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 75a7048045c..e683d3a7a5f 100644
+index 0fd438e39e5..0b257e687ee 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7681,6 +7681,19 @@ AC_CACHE_CHECK([for -no-pie option],
+@@ -6863,6 +6863,19 @@ AC_CACHE_CHECK([for -no-pie option],
     LDFLAGS="$saved_LDFLAGS"])
  if test "$gcc_cv_no_pie" = "yes"; then
    NO_PIE_FLAG="-no-pie"
@@ -70,3 +70,6 @@ index 75a7048045c..e683d3a7a5f 100644
  fi
  AC_SUBST([NO_PIE_FLAG])
  
+-- 
+2.29.2
+

cross/gcc-aarch64/0015-dlang-use-libucontext-on-mips64.patch

@@ -1,21 +0,0 @@
-From 686e85d8a05f9f9e6c983afb13f937bd88fe84dd Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:18:32 +0000
-Subject: [PATCH] dlang: use libucontext on mips64
-
----
- libphobos/configure.tgt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 0063dd23249..c5e782a1238 100644
---- a/libphobos/configure.tgt
-+++ b/libphobos/configure.tgt
-@@ -38,6 +38,7 @@ case "${target}" in
- 	;;
-   mips*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
-+	LIBDRUNTIME_NEEDS_UCONTEXT=yes
- 	;;
-   power*-*-freebsd*)
- 	LIBPHOBOS_SUPPORTED=yes

cross/gcc-aarch64/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch

@@ -0,0 +1,25 @@
+From a5a7decc1944cf6831eebc10d71a52ef8496bff5 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:57:09 +0000
+Subject: [PATCH] libffi: use __linux__ instead of __gnu_linux__ for musl
+
+---
+ libffi/src/closures.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libffi/src/closures.c b/libffi/src/closures.c
+index 721ff00ea43..22a699c6340 100644
+--- a/libffi/src/closures.c
++++ b/libffi/src/closures.c
+@@ -34,7 +34,7 @@
+ #include <ffi_common.h>
+ 
+ #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
+-# if __gnu_linux__ && !defined(__ANDROID__)
++# if __linux__ && !defined(__ANDROID__)
+ /* This macro indicates it may be forbidden to map anonymous memory
+    with both write and execute permission.  Code compiled when this
+    option is defined will attempt to map such pages once, but if it
+-- 
+2.29.2
+

cross/gcc-aarch64/0016-ada-fix-shared-linking.patch

@@ -1,39 +0,0 @@
-From fd642f8cd61849a9dc169588be5562ceda96a889 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:59:16 +0000
-Subject: [PATCH] ada: fix shared linking
-
----
- gcc/ada/link.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gcc/ada/link.c b/gcc/ada/link.c
-index a7574efb472..0ad0d66463c 100644
---- a/gcc/ada/link.c
-+++ b/gcc/ada/link.c
-@@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
-    || defined (__NetBSD__) || defined (__OpenBSD__) \
-    || defined (__QNX__)
- const char *__gnat_object_file_option = "-Wl,@";
--const char *__gnat_run_path_option = "-Wl,-rpath,";
--char __gnat_shared_libgnat_default = STATIC;
--char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";
-@@ -129,9 +129,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
- 
- #elif defined (__linux__) || defined (__GLIBC__)
- const char *__gnat_object_file_option = "-Wl,@";
--const char *__gnat_run_path_option = "-Wl,-rpath,";
--char __gnat_shared_libgnat_default = STATIC;
--char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";

cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch

@@ -0,0 +1,425 @@
+From 3554a4b751acce2a4f432d1bb24d9fc69a916889 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:57:51 +0000
+Subject: [PATCH] dlang: update zlib binding
+
+---
+ libphobos/src/std/zlib.d | 266 ++++++++++++++++++++++++++++-----------
+ 1 file changed, 196 insertions(+), 70 deletions(-)
+
+diff --git a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
+index e6cce240fd5..bd2fe37ebec 100644
+--- a/libphobos/src/std/zlib.d
++++ b/libphobos/src/std/zlib.d
+@@ -1,7 +1,7 @@
+ // Written in the D programming language.
+ 
+ /**
+- * Compress/decompress data using the $(HTTP www._zlib.net, _zlib library).
++ * Compress/decompress data using the $(HTTP www.zlib.net, zlib library).
+  *
+  * Examples:
+  *
+@@ -43,12 +43,12 @@
+  * References:
+  *  $(HTTP en.wikipedia.org/wiki/Zlib, Wikipedia)
+  *
+- * Copyright: Copyright Digital Mars 2000 - 2011.
++ * Copyright: Copyright The D Language Foundation 2000 - 2011.
+  * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+  * Authors:   $(HTTP digitalmars.com, Walter Bright)
+- * Source:    $(PHOBOSSRC std/_zlib.d)
++ * Source:    $(PHOBOSSRC std/zlib.d)
+  */
+-/*          Copyright Digital Mars 2000 - 2011.
++/*          Copyright The D Language Foundation 2000 - 2011.
+  * Distributed under the Boost Software License, Version 1.0.
+  *    (See accompanying file LICENSE_1_0.txt or copy at
+  *          http://www.boost.org/LICENSE_1_0.txt)
+@@ -75,9 +75,9 @@ enum
+ 
+ class ZlibException : Exception
+ {
+-    this(int errnum)
+-    {   string msg;
+-
++    private static string getmsg(int errnum) nothrow @nogc pure @safe
++    {
++        string msg;
+         switch (errnum)
+         {
+             case Z_STREAM_END:      msg = "stream end"; break;
+@@ -90,7 +90,12 @@ class ZlibException : Exception
+             case Z_VERSION_ERROR:   msg = "version error"; break;
+             default:                msg = "unknown error";  break;
+         }
+-        super(msg);
++        return msg;
++    }
++
++    this(int errnum)
++    {
++        super(getmsg(errnum));
+     }
+ }
+ 
+@@ -104,7 +109,7 @@ class ZlibException : Exception
+  *     buf = buffer containing input data
+  *
+  * Returns:
+- *     A $(D uint) checksum for the provided input data and starting checksum
++ *     A `uint` checksum for the provided input data and starting checksum
+  *
+  * See_Also:
+  *     $(LINK http://en.wikipedia.org/wiki/Adler-32)
+@@ -147,7 +152,7 @@ uint adler32(uint adler, const(void)[] buf)
+  *     buf = buffer containing input data
+  *
+  * Returns:
+- *     A $(D uint) checksum for the provided input data and starting checksum
++ *     A `uint` checksum for the provided input data and starting checksum
+  *
+  * See_Also:
+  *     $(LINK http://en.wikipedia.org/wiki/Cyclic_redundancy_check)
+@@ -191,13 +196,14 @@ uint crc32(uint crc, const(void)[] buf)
+ ubyte[] compress(const(void)[] srcbuf, int level)
+ in
+ {
+-    assert(-1 <= level && level <= 9);
++    assert(-1 <= level && level <= 9, "Compression level needs to be within [-1, 9].");
+ }
+-body
++do
+ {
+     import core.memory : GC;
++    import std.array : uninitializedArray;
+     auto destlen = srcbuf.length + ((srcbuf.length + 1023) / 1024) + 12;
+-    auto destbuf = new ubyte[destlen];
++    auto destbuf = uninitializedArray!(ubyte[])(destlen);
+     auto err = etc.c.zlib.compress2(destbuf.ptr, &destlen, cast(ubyte *) srcbuf.ptr, srcbuf.length, level);
+     if (err)
+     {
+@@ -276,7 +282,7 @@ void[] uncompress(const(void)[] srcbuf, size_t destlen = 0u, int winbits = 15)
+                 throw new ZlibException(err);
+         }
+     }
+-    assert(0);
++    assert(0, "Unreachable code");
+ }
+ 
+ @system unittest
+@@ -370,9 +376,9 @@ class Compress
+     this(int level, HeaderFormat header = HeaderFormat.deflate)
+     in
+     {
+-        assert(1 <= level && level <= 9);
++        assert(1 <= level && level <= 9, "Legal compression level are in [1, 9].");
+     }
+-    body
++    do
+     {
+         this.level = level;
+         this.gzip = header == HeaderFormat.gzip;
+@@ -406,6 +412,7 @@ class Compress
+     const(void)[] compress(const(void)[] buf)
+     {
+         import core.memory : GC;
++        import std.array : uninitializedArray;
+         int err;
+         ubyte[] destbuf;
+ 
+@@ -420,7 +427,7 @@ class Compress
+             inited = 1;
+         }
+ 
+-        destbuf = new ubyte[zs.avail_in + buf.length];
++        destbuf = uninitializedArray!(ubyte[])(zs.avail_in + buf.length);
+         zs.next_out = destbuf.ptr;
+         zs.avail_out = to!uint(destbuf.length);
+ 
+@@ -461,9 +468,10 @@ class Compress
+     void[] flush(int mode = Z_FINISH)
+     in
+     {
+-        assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH);
++        assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH,
++                "Mode must be either Z_FINISH, Z_SYNC_FLUSH or Z_FULL_FLUSH.");
+     }
+-    body
++    do
+     {
+         import core.memory : GC;
+         ubyte[] destbuf;
+@@ -523,6 +531,7 @@ class UnCompress
+     z_stream zs;
+     int inited;
+     int done;
++    bool inputEnded;
+     size_t destbufsize;
+ 
+     HeaderFormat format;
+@@ -571,16 +580,16 @@ class UnCompress
+     const(void)[] uncompress(const(void)[] buf)
+     in
+     {
+-        assert(!done);
++        assert(!done, "Buffer has been flushed.");
+     }
+-    body
++    do
+     {
++        if (inputEnded || !buf.length)
++            return null;
++
+         import core.memory : GC;
++        import std.array : uninitializedArray;
+         int err;
+-        ubyte[] destbuf;
+-
+-        if (buf.length == 0)
+-            return null;
+ 
+         if (!inited)
+         {
+@@ -598,26 +607,152 @@ class UnCompress
+ 
+         if (!destbufsize)
+             destbufsize = to!uint(buf.length) * 2;
+-        destbuf = new ubyte[zs.avail_in * 2 + destbufsize];
+-        zs.next_out = destbuf.ptr;
+-        zs.avail_out = to!uint(destbuf.length);
+-
+-        if (zs.avail_in)
+-            buf = zs.next_in[0 .. zs.avail_in] ~ cast(ubyte[]) buf;
++        auto destbuf = uninitializedArray!(ubyte[])(destbufsize);
++        size_t destFill;
+ 
+         zs.next_in = cast(ubyte*) buf.ptr;
+         zs.avail_in = to!uint(buf.length);
+ 
+-        err = inflate(&zs, Z_NO_FLUSH);
+-        if (err != Z_STREAM_END && err != Z_OK)
++        while (true)
+         {
+-            GC.free(destbuf.ptr);
+-            error(err);
++            auto oldAvailIn = zs.avail_in;
++
++            zs.next_out = destbuf[destFill .. $].ptr;
++            zs.avail_out = to!uint(destbuf.length - destFill);
++
++            err = inflate(&zs, Z_NO_FLUSH);
++            if (err == Z_STREAM_END)
++            {
++                inputEnded = true;
++                break;
++            }
++            else if (err != Z_OK)
++            {
++                GC.free(destbuf.ptr);
++                error(err);
++            }
++            else if (!zs.avail_in)
++                break;
++
++            /*
++                According to the zlib manual inflate() stops when either there's
++                no more data to uncompress or the output buffer is full
++                So at this point, the output buffer is too full
++            */
++
++            destFill = destbuf.length;
++
++            if (destbuf.capacity)
++            {
++                if (destbuf.length < destbuf.capacity)
++                    destbuf.length = destbuf.capacity;
++                else
++                {
++                    auto newLength = GC.extend(destbuf.ptr, destbufsize, destbufsize);
++
++                    if (newLength && destbuf.length < destbuf.capacity)
++                        destbuf.length = destbuf.capacity;
++                    else
++                        destbuf.length += destbufsize;
++                }
++            }
++            else
++                destbuf.length += destbufsize;
+         }
++
+         destbuf.length = destbuf.length - zs.avail_out;
+         return destbuf;
+     }
+ 
++    // Test for issues 3191 and 9505
++    @system unittest
++    {
++        import std.algorithm.comparison;
++        import std.array;
++        import std.file;
++        import std.zlib;
++
++        // Data that can be easily compressed
++        ubyte[1024] originalData;
++
++        // This should yield a compression ratio of at least 1/2
++        auto compressedData = compress(originalData, 9);
++        assert(compressedData.length < originalData.length / 2,
++                "The compression ratio is too low to accurately test this situation");
++
++        auto chunkSize = compressedData.length / 4;
++        assert(chunkSize < compressedData.length,
++                "The length of the compressed data is too small to accurately test this situation");
++
++        auto decompressor = new UnCompress();
++        ubyte[originalData.length] uncompressedData;
++        ubyte[] reusedBuf;
++        int progress;
++
++        reusedBuf.length = chunkSize;
++
++        for (int i = 0; i < compressedData.length; i += chunkSize)
++        {
++            auto len = min(chunkSize, compressedData.length - i);
++            // simulate reading from a stream in small chunks
++            reusedBuf[0 .. len] = compressedData[i .. i + len];
++
++            // decompress using same input buffer
++            auto chunk = decompressor.uncompress(reusedBuf);
++            assert(progress + chunk.length <= originalData.length,
++                    "The uncompressed result is bigger than the original data");
++
++            uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[];
++            progress += chunk.length;
++        }
++
++        auto chunk = decompressor.flush();
++        assert(progress + chunk.length <= originalData.length,
++                "The uncompressed result is bigger than the original data");
++
++        uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[];
++        progress += chunk.length;
++
++        assert(progress == originalData.length,
++                "The uncompressed and the original data sizes differ");
++        assert(originalData[] == uncompressedData[],
++                "The uncompressed and the original data differ");
++    }
++
++    @system unittest
++    {
++        ubyte[1024] invalidData;
++        auto decompressor = new UnCompress();
++
++        try
++        {
++            auto uncompressedData = decompressor.uncompress(invalidData);
++        }
++        catch (ZlibException e)
++        {
++            assert(e.msg == "data error");
++            return;
++        }
++
++        assert(false, "Corrupted data didn't result in an error");
++    }
++
++    @system unittest
++    {
++        ubyte[2014] originalData = void;
++        auto compressedData = compress(originalData, 9);
++
++        auto decompressor = new UnCompress();
++        auto uncompressedData = decompressor.uncompress(compressedData ~ cast(ubyte[]) "whatever");
++
++        assert(originalData.length == uncompressedData.length,
++                "The uncompressed and the original data sizes differ");
++        assert(originalData[] == uncompressedData[],
++                "The uncompressed and the original data differ");
++        assert(!decompressor.uncompress("whatever").length,
++                "Compression continued after the end");
++    }
++
+     /**
+      * Decompress and return any remaining data.
+      * The returned data should be appended to that returned by uncompress().
+@@ -626,49 +761,40 @@ class UnCompress
+     void[] flush()
+     in
+     {
+-        assert(!done);
++        assert(!done, "Buffer has been flushed before.");
+     }
+     out
+     {
+-        assert(done);
++        assert(done, "Flushing failed.");
+     }
+-    body
++    do
+     {
+-        import core.memory : GC;
+-        ubyte[] extra;
+-        ubyte[] destbuf;
+-        int err;
+-
+         done = 1;
+-        if (!inited)
+-            return null;
++        return null;
++    }
+ 
+-      L1:
+-        destbuf = new ubyte[zs.avail_in * 2 + 100];
+-        zs.next_out = destbuf.ptr;
+-        zs.avail_out = to!uint(destbuf.length);
++    /// Returns true if all input data has been decompressed and no further data
++    /// can be decompressed (inflate() returned Z_STREAM_END)
++    @property bool empty() const
++    {
++        return inputEnded;
++    }
+ 
+-        err = etc.c.zlib.inflate(&zs, Z_NO_FLUSH);
+-        if (err == Z_OK && zs.avail_out == 0)
+-        {
+-            extra ~= destbuf;
+-            goto L1;
+-        }
+-        if (err != Z_STREAM_END)
+-        {
+-            GC.free(destbuf.ptr);
+-            if (err == Z_OK)
+-                err = Z_BUF_ERROR;
+-            error(err);
+-        }
+-        destbuf = destbuf.ptr[0 .. zs.next_out - destbuf.ptr];
+-        err = etc.c.zlib.inflateEnd(&zs);
+-        inited = 0;
+-        if (err)
+-            error(err);
+-        if (extra.length)
+-            destbuf = extra ~ destbuf;
+-        return destbuf;
++    ///
++    @system unittest
++    {
++        // some random data
++        ubyte[1024] originalData = void;
++
++        // append garbage data (or don't, this works in both cases)
++        auto compressedData = cast(ubyte[]) compress(originalData) ~ cast(ubyte[]) "whatever";
++
++        auto decompressor = new UnCompress();
++        auto uncompressedData = decompressor.uncompress(compressedData);
++
++        assert(uncompressedData[] == originalData[],
++                "The uncompressed and the original data differ");
++        assert(decompressor.empty, "The UnCompressor reports not being done");
+     }
+ }
+ 
+-- 
+2.29.2
+

cross/gcc-aarch64/0017-build-fix-CXXFLAGS_FOR_BUILD-passing.patch

@@ -1,21 +0,0 @@
-From a547632f5c7caec4a164e8d5e5b568fb7a461365 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:59:43 +0000
-Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
-
----
- Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..b96f60e33e2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -176,6 +176,7 @@ BUILD_EXPORTS = \
- # built for the build system to override those in BASE_FLAGS_TO_PASS.
- EXTRA_BUILD_FLAGS = \
- 	CFLAGS="$(CFLAGS_FOR_BUILD)" \
-+	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
- 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
- 
- # This is the list of directories to built for the host system.

cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch

@@ -0,0 +1,51 @@
+From abf18c3f7d908f8f4a365bd4d8f9a4743f1d8f0c Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:58:22 +0000
+Subject: [PATCH] dlang: fix fcntl on mips, add libucontext dep
+
+---
+ libphobos/configure.tgt                      |  1 +
+ libphobos/libdruntime/core/sys/posix/fcntl.d | 15 +++++++++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
+index 94e42bf5509..73f2e4b7f01 100644
+--- a/libphobos/configure.tgt
++++ b/libphobos/configure.tgt
+@@ -35,6 +35,7 @@ case "${target}" in
+ 	;;
+   mips*-*-linux*)
+ 	LIBPHOBOS_SUPPORTED=yes
++	LIBDRUNTIME_NEEDS_UCONTEXT=yes
+ 	;;
+   power*-*-linux*)
+ 	LIBPHOBOS_SUPPORTED=yes
+diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
+index 9febcff849b..cb34e2108bd 100644
+--- a/libphobos/libdruntime/core/sys/posix/fcntl.d
++++ b/libphobos/libdruntime/core/sys/posix/fcntl.d
+@@ -870,6 +870,21 @@ else version (CRuntime_Musl)
+             F_SETLKW       = 7,
+         }
+     }
++    else version (MIPS_Any)
++    {
++        enum 
++        {
++            O_DIRECTORY     = 0x010000, // octal   0200000
++            O_NOFOLLOW      = 0x020000, // octal   0400000
++            O_DIRECT        = 0x008000, // octal   0100000
++            O_LARGEFILE     = 0x002000, // octal   0020000
++            O_TMPFILE       = 0x410000, // octal 020200000
++
++            F_GETLK        = 33,
++            F_SETLK        = 34,
++            F_SETLKW       = 35,
++        }
++    }
+     else
+         static assert(0, "Platform not supported");
+ 
+-- 
+2.29.2
+

cross/gcc-aarch64/0018-ada-fix-shared-linking.patch

@@ -0,0 +1,42 @@
+From 277c3317929f41e514632d29ff00354c511deb0e Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:59:16 +0000
+Subject: [PATCH] ada: fix shared linking
+
+---
+ gcc/ada/link.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gcc/ada/link.c b/gcc/ada/link.c
+index 02c413a412f..f0e52a87d6e 100644
+--- a/gcc/ada/link.c
++++ b/gcc/ada/link.c
+@@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
+    || defined (__NetBSD__) || defined (__OpenBSD__) \
+    || defined (__QNX__)
+ const char *__gnat_object_file_option = "-Wl,@";
+-const char *__gnat_run_path_option = "-Wl,-rpath,";
+-char __gnat_shared_libgnat_default = STATIC;
+-char __gnat_shared_libgcc_default = STATIC;
++const char *__gnat_run_path_option = "";
++char __gnat_shared_libgnat_default = SHARED;
++char __gnat_shared_libgcc_default = SHARED;
+ int __gnat_link_max = 8192;
+ unsigned char __gnat_objlist_file_supported = 1;
+ const char *__gnat_object_library_extension = ".a";
+@@ -129,9 +129,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
+ 
+ #elif defined (__linux__) || defined (__GLIBC__)
+ const char *__gnat_object_file_option = "-Wl,@";
+-const char *__gnat_run_path_option = "-Wl,-rpath,";
+-char __gnat_shared_libgnat_default = STATIC;
+-char __gnat_shared_libgcc_default = STATIC;
++const char *__gnat_run_path_option = "";
++char __gnat_shared_libgnat_default = SHARED;
++char __gnat_shared_libgcc_default = SHARED;
+ int __gnat_link_max = 8192;
+ unsigned char __gnat_objlist_file_supported = 1;
+ const char *__gnat_object_library_extension = ".a";
+-- 
+2.29.2
+

cross/gcc-aarch64/0018-add-fortify-headers-paths.patch

@@ -1,22 +0,0 @@
-From 5bd37f8ee93a0fe1a3f841f48ed6626e7e0aa19d Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:01:06 +0000
-Subject: [PATCH] add fortify-headers paths
-
----
- gcc/config/linux.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index 74f70793d90..61b07f319f6 100644
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -172,6 +172,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 
- #ifdef NATIVE_SYSTEM_HEADER_DIR
- #define INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 2 },	\
-+    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 0 },	\
-     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
-     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
- #else

cross/gcc-aarch64/0019-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch

@@ -1,28 +0,0 @@
-From d2577dc78a1f159e5c41fd0b53e73fa0e264cb52 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 21 Aug 2020 07:03:00 +0000
-Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
- it unconditionally, as otherwise we get link failures if some objects are
- -fstack-protector built and final link happens with -fno-stack-protector.
- This seems to be the common case when bootstrapping gcc, the piepatches do
- not seem to fully fix the crosstoolchain and  bootstrap sequence wrt.
- stack-protector flag usage.
-
----
- gcc/gcc.cc | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index cc99d0b7aa1..c60a75371f8 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1004,8 +1004,7 @@ proper position among the other output files.  */
- 
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
--#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
--		       "|fstack-protector-strong|fstack-protector-explicit:}"
-+#define LINK_SSP_SPEC "-lssp_nonshared"
- #else
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- 		       "|fstack-protector-strong|fstack-protector-explicit" \

cross/gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch

@@ -0,0 +1,24 @@
+From b1e3ea43462684675cc4f75c2ca4e984a6d511fb Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:59:43 +0000
+Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
+
+---
+ Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 36e369df6e7..63627db68cf 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -170,6 +170,7 @@ BUILD_EXPORTS = \
+ # built for the build system to override those in BASE_FLAGS_TO_PASS.
+ EXTRA_BUILD_FLAGS = \
+ 	CFLAGS="$(CFLAGS_FOR_BUILD)" \
++	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
+ 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+ 
+ # This is the list of directories to built for the host system.
+-- 
+2.29.2
+

cross/gcc-aarch64/0020-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch

@@ -1,66 +0,0 @@
-From bbd5c529ef878c2d6096fd4949616714eb82683a Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:03:42 +0000
-Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
- linking libtsan.
-
----
- gcc/gcc.cc | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index c60a75371f8..735b2b1bba1 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -745,10 +745,10 @@ proper position among the other output files.  */
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libasan:--push-state --no-as-needed}" \
- 		     " -lasan " \
- 		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libasan:--pop-state}" \
- 		     STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -784,10 +784,10 @@ proper position among the other output files.  */
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libtsan:--push-state --no-as-needed}" \
- 		     " -ltsan " \
- 		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libtsan:--pop-state}" \
- 		     STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -805,10 +805,10 @@ proper position among the other output files.  */
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-liblsan:--push-state --no-as-needed}" \
- 		     " -llsan " \
- 		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-liblsan:--pop-state}" \
- 		     STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -824,10 +824,10 @@ proper position among the other output files.  */
-   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
- #ifdef HAVE_LD_STATIC_DYNAMIC
- #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libubsan:--push-state --no-as-needed}" \
- 		     " -lubsan " \
- 		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libubsan:--pop-state}" \
- 		     STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS

cross/gcc-aarch64/0020-add-fortify-headers-paths.patch

@@ -0,0 +1,25 @@
+From ea75db47e243b59e7cf793623a87295c0d2aada2 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:01:06 +0000
+Subject: [PATCH] add fortify-headers paths
+
+---
+ gcc/config/linux.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gcc/config/linux.h b/gcc/config/linux.h
+index 95654bcdb5a..d88df8f154a 100644
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -167,6 +167,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ 
+ #ifdef NATIVE_SYSTEM_HEADER_DIR
+ #define INCLUDE_DEFAULTS_MUSL_NATIVE			\
++    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 2 },	\
++    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 0 },	\
+     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
+     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
+ #else
+-- 
+2.29.2
+