package nanopb with protocol definitions for generator (#804 )

WIP: package android-rild + dependencies
liblog and libcutils compile so far. broken stuff: * nanopb is not packaged properly (we'll need to package the whole generator folder and run make in it first or something) * liblog has some external structs, that are not defined, so linking an executable against it will not work yet * libcutils doesn't link right against liblog - when installed, ldd can't find the liblog it linked against * rild needs a lot more work, the libraries don't get generated as shared libraries amongst other errors
2018-09-18 18:44:40 +02:00 · 2018-09-18 18:44:40 +02:00
5583 changed files with 263913 additions and 1344228 deletions
@@ -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)
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-# Convenience wrapper for short arch-specific build jobs in .gitlab-ci.yml
-
-export PYTHONUNBUFFERED=1
-JOB_ARCH="${CI_JOB_NAME#build-}"
-
-set -x
-su pmos -c ".ci/build_changed_aports.py $JOB_ARCH"
@@ -1,83 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-import sys
-
-# Same dir
-import common
-
-# pmbootstrap
-import testcases.add_pmbootstrap_to_import_path
-import pmb.parse
-import pmb.parse._apkbuild
-import pmb.helpers.pmaports
-
-
-def build_strict(packages, arch):
-    common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
-                            "--strict", "--force",
-                            "--arch", arch, ] + list(packages))
-
-
-def verify_checksums(packages, arch):
-    # Only do this with one build-{arch} job
-    arch_verify = "x86_64"
-    if arch != arch_verify:
-        print(f"NOTE: doing checksum verification in build-{arch_verify} job,"
-              " not here.")
-        return
-
-    if len(packages) == 0:
-        print("no packages changed, not doing any checksums verification")
-        return
-
-    common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["--details-to-stdout", "checksum", "--verify"] +
-                           list(packages))
-
-
-if __name__ == "__main__":
-    # Architecture to build for (as in build-{arch})
-    if len(sys.argv) != 2:
-        print("usage: build_changed_aports.py ARCH")
-        sys.exit(1)
-    arch = sys.argv[1]
-
-    # Get and print modified packages
-    common.add_upstream_git_remote()
-    packages = common.get_changed_packages()
-
-    # Package count sanity check
-    common.get_changed_packages_sanity_check(len(packages))
-
-    # [ci:skip-build]: verify checksums and stop
-    verify_only = common.commit_message_has_string("[ci:skip-build]")
-    if verify_only:
-        print("WARNING: not building changed packages ([ci:skip-build])!")
-        print("verifying checksums: " + ", ".join(packages))
-        verify_checksums(packages, arch)
-        sys.exit(0)
-
-    # Prepare "args" to use pmbootstrap code
-    sys.argv = ["pmbootstrap", "chroot"]
-    args = pmb.parse.arguments()
-
-    # Filter out packages that can't be built for given arch
-    # (Iterate over copy of packages, because we modify it in this loop)
-    for package in packages.copy():
-        apkbuild_path = pmb.helpers.pmaports.find(args, package)
-        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")
-
-        if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
-            print(f"{package}: not enabled for {arch}, skipping")
-            packages.remove(package)
-
-    # No packages: skip build
-    if len(packages) == 0:
-        print(f"no packages changed, which can be built for {arch}")
-        sys.exit(0)
-
-    # Build packages
-    print(f"building in strict mode for {arch}: {', '.join(packages)}")
-    build_strict(packages, arch)
@@ -1,156 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import tempfile
-import sys
-import subprocess
-
-# Same dir
-import common
-
-# pmbootstrap
-import testcases.add_pmbootstrap_to_import_path  # noqa
-import pmb.parse
-import pmb.parse.version
-import pmb.helpers.logging
-
-
-def get_package_version(args, package, revision, check=True):
-    # Redirect stderr to /dev/null, so git doesn't complain about files not
-    # existing in upstream branch for new packages
-    stderr = None
-    if not check:
-        stderr = subprocess.DEVNULL
-
-    # Run something like "git show upstream/master:main/hello-world/APKBUILD"
-    pmaports_dir = common.get_pmaports_dir()
-    pattern = pmaports_dir + "/**/" + package + "/APKBUILD"
-    path = glob.glob(pattern, recursive=True)[0][len(pmaports_dir + "/"):]
-    apkbuild_content = common.run_git(["show", revision + ":" + path], check,
-                                      stderr)
-    if not apkbuild_content:
-        return None
-
-    # Save APKBUILD to a temporary path and parse it from there. (Not the best
-    # way to do things, but good enough for this CI script.)
-    with tempfile.TemporaryDirectory() as tempdir:
-        with open(tempdir + "/APKBUILD", "w", encoding="utf-8") as handle:
-            handle.write(apkbuild_content)
-        parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)
-
-    return parsed["pkgver"] + "-r" + parsed["pkgrel"]
-
-
-def version_compare_operator(result):
-    """ :param result: return value from pmb.parse.version.compare() """
-    if result == -1:
-        return "<"
-    elif result == 0:
-        return "=="
-    elif result == 1:
-        return ">"
-
-    raise RuntimeError("Unexpected version_compare_operator input: " + result)
-
-
-def exit_with_error_message():
-    branch = common.get_upstream_branch()
-    print()
-    print("ERROR: Modified package(s) don't have an increased version or a")
-    print("new package has a nonzero pkgrel!")
-    print()
-    print("This can happen if you added a new package with a nonzero")
-    print("pkgrel, or if you did not change the pkgver/pkgrel")
-    print("variables in the APKBUILDs. Or you did change them, but the")
-    print(f"packages have been updated in the official '{branch}' branch, and")
-    print("now your versions are not higher anymore.")
-    print()
-    print("Your options:")
-    print("a) If you made changes to the packages, and did not increase the")
-    print("   pkgrel/pkgver: increase them now, and force push your branch.")
-    print("   => https://postmarketos.org/howto-bump-pkgrel-pkgver")
-    print("b) If you had already increased the package versions, rebase on")
-    print(f"   '{branch}', increase the versions again and then force push:")
-    print("   => https://postmarketos.org/rebase")
-    print("c) If you made a change, that does not require rebuilding the")
-    print("   packages, such as only changing the arch=... line: you can")
-    print("   disable this check by adding '[ci:skip-vercheck]' to the")
-    print("   latest commit message, then force push.")
-    print()
-    print("Thank you and sorry for the inconvenience.")
-    exit(1)
-
-
-def check_versions(args, packages):
-    error = False
-
-    # Get relevant commits: compare HEAD against upstream branch or HEAD~1
-    # (the latter if this CI check is running on upstream branch). Note that
-    # for the common.get_changed_files() code, we don't check against
-    # upstream branch HEAD, but against the latest common ancestor. This is not
-    # desired here, since we already know what packages changed, and really
-    # want to check if the version was increased towards *current* upstream
-    # branch HEAD.
-    commit = f"upstream/{common.get_upstream_branch()}"
-    if common.run_git(["rev-parse", "HEAD"]) == common.run_git(["rev-parse",
-                                                                commit]):
-        print(f"NOTE: {commit} is on same commit as HEAD, comparing"
-              " HEAD against HEAD~1.")
-        commit = "HEAD~1"
-
-    for package in packages:
-        # Get versions, skip new packages
-        head = get_package_version(args, package, "HEAD")
-        upstream = get_package_version(args, package, commit, False)
-        if not upstream:
-            if head.rpartition('r')[2] != "0":
-                print(f"- {package}: {head} (HEAD) (new package) [ERROR]")
-                error = True
-            else:
-                print(f"- {package}: {head} (HEAD) (new package)")
-            continue
-
-        # Compare head and upstream versions
-        result = pmb.parse.version.compare(head, upstream)
-        if result != 1:
-            error = True
-
-        # Print result line ("- hello-world: 1-r2 (HEAD) > 1-r1 (HEAD~1)")
-        formatstr = "- {}: {} (HEAD) {} {} ({})"
-        if result != 1:
-            formatstr += " [ERROR]"
-        operator = version_compare_operator(result)
-        print(formatstr.format(package, head, operator, upstream, commit))
-
-    if error:
-        exit_with_error_message()
-
-
-if __name__ == "__main__":
-    # Get and print modified packages
-    common.add_upstream_git_remote()
-    packages = common.get_changed_packages()
-    print(f"Changed packages: {packages}")
-
-    # Verify modified package count
-    common.get_changed_packages_sanity_check(len(packages))
-    if len(packages) == 0:
-        print("no aports changed in this branch")
-        exit(0)
-
-    # Potentially skip this check
-    if common.commit_message_has_string("[ci:skip-vercheck]"):
-        print("WARNING: not checking for changed package versions"
-              " ([ci:skip-vercheck])!")
-        exit(0)
-
-    # Initialize args (so we can use pmbootstrap's APKBUILD parsing)
-    sys.argv = ["pmbootstrap.py", "chroot"]
-    args = pmb.parse.arguments()
-    pmb.helpers.logging.init(args)
-
-    # Verify package versions
-    print("checking changed package versions...")
-    check_versions(args, packages)
@@ -1,192 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 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. .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
@@ -1,53 +0,0 @@
-#!/bin/sh -e
-# Copyright 2021 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/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/*.sh
-	./main/ttyescape/*.post-install
-	./main/unl0kr/unlock.sh
-	./main/msm-firmware-loader/*.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
@@ -1,41 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import shutil
-import sys
-import os
-import importlib
-import importlib.util
-from distutils.sysconfig import get_python_lib
-
-
-def path_pmbootstrap():
-    """ Find the pmbootstrap installation folder, so we can import the Python
-        code from there.
-        returns: pmbootstrap installation folder
-    """
-    # Find 'pmbootstrap' executable
-    bin = shutil.which("pmbootstrap")
-    if not bin:
-        print("ERROR: 'pmbootstrap' not found in $PATH")
-        sys.exit(1)
-
-    # Resolve the symlink and verify the folder
-    dir = os.path.dirname(os.path.realpath(bin))
-    if os.path.exists(dir + "/pmb/__init__.py"):
-        return dir
-
-    dir = get_python_lib()
-    if os.path.exists(dir + "/pmb/__init__.py"):
-        return dir
-
-    # Symlink not set up properly
-    print("ERROR: 'pmbootstrap' is not a symlink to pmbootstrap.py")
-    sys.exit(1)
-
-
-# Check if pmb module can be imported
-if importlib.util.find_spec("pmb") is None:
-    # Add pmbootstrap dir to import path
-    sys.path.append(os.path.realpath(path_pmbootstrap()))
@@ -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
@@ -1,136 +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). """
-
-    # 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_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-"):
-                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"
@@ -1,69 +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 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]
-
-        f = open(folder[len(args.aports):][1:] + "/deviceinfo")
-        lines = f.read().split("\n")
-        f.close()
-
-        try:
-            # variable can not be empty
-            for line in lines:
-                if '=""' in line:
-                    raise RuntimeError("Please remove the empty variable: " + 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
@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-# SPDX-License-Identifier: GPL-3.0-or-later
-import glob
-import os
-import stat
-
-expected_directories = [
-    "cross",
-    "device/community",
-    "device/main",
-    "device/testing",
-    "device/unmaintained",
-    "main",
-    "modem",
-    "non-free",
-    "sxmo",
-    "temp",
-]
-
-
-# pmbootstrap allows placing APKBUILDs in arbitrarily nested directories.
-# This test makes sure all of them are in one of the expected locations.
-def test_directories():
-    apkbuilds = set(glob.iglob("**/APKBUILD", recursive=True))
-    expected = set(f for d in expected_directories for f in glob.iglob(d + "/*/APKBUILD"))
-    assert apkbuilds == expected, "Found APKBUILD in unexpected directory. " \
-        "Note that we moved firmware/* to device/{main,community,testing}/*."
-
-
-# Ensure no file in pmaports are executable.
-# see https://gitlab.com/postmarketOS/pmaports/-/issues/593.
-def test_executable_files():
-    for file in glob.iglob("**/*", recursive=True):
-        if os.path.isdir(file) or os.path.islink(file):
-            continue
-            # still check other less common inode types
-        permissions = os.stat(file).st_mode
-        executable_bits = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
-        if permissions & executable_bits != 0:
-            raise RuntimeError(f"\"{file}\" is executable. Files in pmaports" +
-                               " should not be executables. post-* files" +
-                               " don't need to be executable and executables" +
-                               " should be installed using `install -D" +
-                               "m0755` or a variation thereof.")
-
-
-# Make sure files are either:
-#  - in root directory (README.md)
-#  - hidden (.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
-    # This allows matching files in subdirectories to the package directory.
-    package_dir = None
-    for dirpath, dirs, files in os.walk("."):
-        # Skip "hidden" directories
-        dirs[:] = [d for d in dirs if not d.startswith(".")]
-        # Ignore files in root directory
-        if dirpath == '.':
-            continue
-
-        # Switched to another directory?
-        if package_dir and not dirpath.startswith(package_dir + os.sep):
-            package_dir = None
-
-        if 'APKBUILD' in files:
-            assert not package_dir, f"Nested packages: {package_dir} and {dirpath} " \
-                "both contain an APKBUILD"
-            package_dir = dirpath
-
-        assert not files or package_dir, "Found files that do not belong to any package: " \
-            f"{dirpath}/{files}"
@@ -1,46 +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-oneplus-sdm845",  # 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-shift-sdm845",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-xiaomi-beryllium",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "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.")
@@ -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!")
@@ -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.")
-
-        # nftables support in kernels used by main and community devices
-        for dir in ["main", "device/main", "device/community"]:
-            if path.startswith(f"{args.aports}/{dir}"):
-                assert pmb.parse.kconfig.check(args,
-                                               aport_name.replace("linux-", ""),
-                                               force_nftables_check=True)
@@ -1,40 +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
-    """
-    for arch in pmb.config.build_device_architectures:
-        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}'")
@@ -1,97 +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
-import pmb.parse.apkindex
-import pmb.helpers.repo
-
-
-def parse_source_from_checksums(args, apkbuild_path):
-    """
-    Read the APKBUILD file and parse source files from the checksums at the
-    bottom. This has always the same format, even if $source is built with hard
-    to parse shell code (like in postmarketos-base).
-
-    :param apkbuild_path: full path to the APKBUILD
-    :returns: list of parsed "source" files, e.g.:
-              ["first.patch", "second.patch"]
-    """
-    start = 'sha512sums="'
-    in_block = False
-    ret = []
-
-    with open(apkbuild_path, encoding="utf-8") as handle:
-        for line in handle.readlines():
-            # Find start
-            if not in_block:
-                if line.startswith(start):
-                    in_block = True
-                else:
-                    continue
-
-            # sha512sums may have lines without checksums:
-            # https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/73
-            if "  " not in line:
-                continue
-
-            try:
-                _, filename = line.rstrip().split("  ", 2)
-            except ValueError:
-                raise ValueError("Failed to parse checksums. Try to delete the"
-                                 " checksums and generate them again with"
-                                 f" 'pmbootstrap checksum': {apkbuild_path}")
-
-            # Find end
-            if filename.endswith('"'):
-                ret += [filename[:-1]]
-                break
-
-            ret += [filename]
-    return ret
-
-
-def test_aports_unreferenced_files(args):
-    """
-    Raise an error if an unreferenced file is found
-    """
-    for apkbuild_path in glob.iglob(args.aports + "/**/APKBUILD", recursive=True):
-        apkbuild = pmb.parse.apkbuild(apkbuild_path)
-        sources_chk = parse_source_from_checksums(args, apkbuild_path)
-
-        # Collect install files from subpackages
-        subpackage_installs = []
-        if apkbuild["subpackages"]:
-            for subpackage in apkbuild["subpackages"].values():
-                if not subpackage:
-                    continue
-                try:
-                    subpackage_installs += subpackage["install"]
-                except KeyError:
-                    continue
-
-        # Collect trigger files
-        trigger_sources = []
-        if apkbuild["triggers"]:
-            for trigger in apkbuild["triggers"]:
-                trigger_sources.append(trigger.split("=")[0])
-
-        dirname = os.path.dirname(apkbuild_path)
-        for file in glob.iglob(dirname + "/**", recursive=True):
-            rel_file_path = os.path.relpath(file, dirname)
-            # Skip APKBUILDs and directories
-            if rel_file_path == "APKBUILD" or os.path.isdir(file):
-                continue
-
-            if os.path.basename(rel_file_path) not in sources_chk \
-                    and rel_file_path not in apkbuild["install"] \
-                    and rel_file_path not in subpackage_installs \
-                    and rel_file_path not in trigger_sources:
-                raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")
@@ -1,9 +0,0 @@
---
-# C and C++ code
-Language: Cpp
-BasedOnStyle: WebKit
-DerivePointerAlignment: false
-PointerAlignment: Right
-TabWidth: 4
-UseTab: Always
-...
@@ -1,14 +0,0 @@
-; This file is for unifying the coding style for different editors and IDEs.
-; Plugins are available for notepad++, emacs, vim, gedit,
-; textmate, visual studio, and more.
-;
-; See http://editorconfig.org for details.
-
-# Top-most EditorConfig file.
-root = true
-
-[**/APKBUILD]
-indent_style = tab
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
@@ -113,9 +113,3 @@ ENV/

 # JetBrains IDEs (PyCharm, etc)
 .idea
-
-# Sources as unpacked and built by abuild
-**/src/
-
-# Allow having untracked packages in aports using a custom-something directory
-/custom-*/
@@ -1,76 +1,39 @@
 ---

 # global settings
-image: alpine:latest
+image: alpine:3.8
 after_script:
-  - .ci/move_logs.sh $CI_PROJECT_DIR
+  - .gitlab-ci/move_logs.sh $CI_PROJECT_DIR
 stages:
-  - lint
-  - build
-
-# defaults for "only"
-# We need to run the CI jobs in a "merge request specific context", if CI is
-# running in a merge request. Otherwise the environment variable that holds the
-# merge request ID is not available. This means, we must set the "only"
-# variable accordingly - and if we only do it for one job, all other jobs will
-# not get executed. So have the defaults here, and use them in all jobs that
-# should run on both the master branch, and in merge requests.
-# https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
-.only-default: &only-default
-  only:
-    - master
-    - merge_requests
-    - tags
+  - first
+  - second

 # device documentation
 wiki:
-  stage: lint
-  <<: *only-default
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - device/*/device-*/*
+  stage: first
  before_script:
    - apk -q add python3
  script:
-    - .ci/check_devices_in_wiki.py --booting
+    - .gitlab-ci/check_devices_in_wiki.py --booting

-# testcases linting
-testcases-linting:
-  stage: lint
-  <<: *only-default
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - .ci/*
-      - .ci/*/*
+# static code analysis (shellcheck is not in Alpine, so we use Debian)
+py-sh-static:
+  stage: first
+  image: python:3.6-slim-stretch
  before_script:
-    - apk -q add py-flake8
+    - apt -q update >/dev/null
+    - apt -y install flake8 shellcheck >/dev/null
  script:
-    - flake8 --ignore E501,F401,E722,W504,W605
-
-# shellcheck
-shellcheck:
-  stage: lint
-  <<: *only-default
-  image: alpine:edge
-  before_script:
-    - apk -q add shellcheck
-  script:
-    - .ci/shellcheck.sh
+    - .gitlab-ci/static_code_analysis.sh

 # aports checks (generic)
 aports-static:
-  stage: lint
-  <<: *only-default
+  stage: first
  before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh pytest
+    - .gitlab-ci/install_pmbootstrap.sh pytest
  script:
-    - su pmos -c ".ci/run_testcases.sh"
-    - su pmos -c ".ci/check_changed_aports_versions.py"
+    - su pmos -c ".gitlab-ci/run_testcases.sh
+        -m 'not pmaports_upstream_compat'"
  artifacts:
    when: on_failure
    paths:
@@ -79,90 +42,28 @@ aports-static:
      - pmbootstrap.cfg
    expire_in: 1 week

-distfile-check:
-  stage: lint
-  <<: *only-default
+# aports checks (upstream compatibility)
+aports-static-upstream:
+  stage: second
  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
+    - .gitlab-ci/install_pmbootstrap.sh pytest
  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:
-    - su pmos -c ".ci/apkbuild-linting.py"
+    - su pmos -c ".gitlab-ci/run_testcases.sh
+        -m 'pmaports_upstream_compat'"
+  artifacts:
+    when: on_failure
+    paths:
+      - log.txt
+      - log_testsuite_pmaports.txt
+      - pmbootstrap.cfg
+    expire_in: 1 week
  only:
-    - merge_requests
-  allow_failure: true
-
-# kernel kconfig check
-kernel-kconfig:
-  stage: lint
-  only:
-    refs:
-      - master
-      - merge_requests
-    changes:
-      - device/*/linux-*/config-*
-      - main/linux-*/config-*
-  before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh pytest
-  script:
-    - su pmos -c "pmbootstrap kconfig check"
-
-# MR settings
-# (Checks for "Allow commits from members who can merge to the target branch")
-mr-settings:
-  stage: lint
-  only:
-    - merge_requests
-  before_script:
-    - apk -q add python3
-  script:
-    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
-    - python3 ./check_mr_settings.py
+    - master

 # build changed aports
-.build:
-  stage: build
-  <<: *only-default
+aports-build:
+  stage: second
  before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh
+    - .gitlab-ci/install_pmbootstrap.sh git
  script:
-    - .ci/build.sh
-    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - packages/
-
-build-x86_64:
-  extends: .build
-
-build-x86:
-  extends: .build
-
-build-aarch64:
-  tags:
-    - aarch64
-  extends: .build
-
-build-armv7:
-  tags:
-    - aarch64
-  extends: .build
-
-build-armhf:
-  tags:
-    - aarch64
-  extends: .build
+    - su pmos -c ".gitlab-ci/build_changed_aports.py"
@@ -0,0 +1,91 @@
+#!/usr/bin/env python3
+# Copyright 2018 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import os
+import subprocess
+import sys
+
+
+def get_pmaports_dir():
+    return os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
+
+
+def run_git(parameters):
+    """ Run git in the pmaports folder and return the output """
+    cmd = ["git", "-C", get_pmaports_dir()] + parameters
+    return subprocess.check_output(cmd).decode()
+
+
+def run_pmbootstrap(parameters):
+    """ Run pmbootstrap with the pmaports folder as --aports """
+    cmd = ["pmbootstrap", "--aports", get_pmaports_dir()] + parameters
+    process = subprocess.Popen(cmd)
+    process.communicate()
+    if process.returncode != 0:
+        print("** Building failed")
+        exit(1)
+
+
+def get_changed_files():
+    """ Get all changed files and print them, as well as the branch and the
+        commit that was used for the diff.
+        :returns: list of changed files
+    """
+    # Current branch
+    branch = run_git(["rev-parse", "--abbrev-ref", "HEAD"])[:-1]
+    print("branch: " + branch)
+
+    # Commit to diff against
+    commit = "HEAD~1"
+    if branch != "master":
+        commit = run_git(["merge-base", "master", "HEAD"])[:-1]
+    print("comparing HEAD with: " + commit)
+
+    # Changed files
+    ret = run_git(["diff", "--name-only", commit, "HEAD"]).splitlines()
+    print("changed file(s):")
+    for file in ret:
+        print("  " + file)
+    return ret
+
+
+def get_changed_packages():
+    files = get_changed_files()
+    ret = set()
+    for file in files:
+        # Skip files in the root folder of pmaports as well as folders
+        # beginning with a dot (.gitlab-ci/)
+        if "/" not in file or file.startswith("."):
+            continue
+
+        # Add to the ret set (removes duplicated automatically)
+        ret.add(file.split("/")[1])
+
+    if len(ret) > 10:
+        print("ERROR: Too many packages have changed!")
+        print("This is a sanity check, so we don't end up building packages"
+              " that have not been modified. CI won't run for more than one"
+              " hour anyway.")
+        print("If you see this message on your personal fork of the"
+              " pmbootstrap repository, try to update your fork's master"
+              " branch to the upstream master branch.")
+        sys.exit(1)
+    return ret
+
+
+def check_build(packages):
+    # Initialize build environment with less logging
+    run_pmbootstrap(["build_init"])
+    run_pmbootstrap(["--details-to-stdout", "build", "--strict"] +
+                    list(packages))
+
+
+if __name__ == "__main__":
+    packages = get_changed_packages()
+
+    if len(packages) == 0:
+        print("no aports changed in this branch")
+    else:
+        print("building in strict mode: " + ", ".join(packages))
+        check_build(packages)
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2018 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

 import argparse
@@ -14,16 +14,8 @@ def get_devices():
    ret = []
    pmaports = (os.path.realpath(os.path.join(os.path.dirname(__file__) +
                "/..")))
-    for path in glob.glob(pmaports + "/device/*/device-*/"):
+    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)

@@ -45,7 +37,7 @@ def get_wiki_devices_html(path):
        content = urllib.request.urlopen(url).read().decode("utf-8")

    # Split into booting and not booting
-    split = content.split("<span class=\"mw-headline\" id=\"Non-booting_devices\">")
+    split = content.split("<span class=\"mw-headline\" id=\"Not_booting\">")

    if len(split) != 2:
        print("*** Failed to parse wiki page")
@@ -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):
@@ -111,7 +92,8 @@ def main():
        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("2) Set 'booting = yes' in the infobox of your device page.")
+        print("2) Add your device to the overview matrix:")
+        print("   <https://wiki.postmarketos.org/wiki/Devices>")
        print("3) Run these tests again with an empty commit in your MR:")
        print("   $ git commit --allow-empty -m 'run tests again'")
        print("")
@@ -119,7 +101,7 @@ def main():
        print("precious porting efforts visible for others, and allow them")
        print("not only to use what you have created, but also to build upon")
        print("it more easily. Many times one person did a port with basic")
-        print("functionality, and then someone else jumped in and")
+        print("functionallity, and then someone else jumped in and")
        print("contributed major new features.")
        return 1
    else:
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+# Copyright 2018 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+# usage: install_pmbootstrap.sh [ADDITIONAL_PACKAGE, ...]
+
+# Config: pmbootstrap tag (or branch)
+tag="master"
+
+# Get download URL and pmaports path
+url="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/$tag/pmbootstrap-$tag.tar.bz2"
+pmaports="$(cd $(dirname $0)/..; pwd -P)"
+
+# Set up depends and binfmt_misc
+depends="coreutils openssl python3 sudo $@"
+echo "Installing dependencies: $depends"
+apk -q add $depends
+mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
+
+# Create pmos user
+echo "Creating pmos user"
+adduser -D pmos
+chown -R pmos:pmos .
+echo 'pmos ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
+
+# Download pmbootstrap (to /tmp/pmbootstrap)
+echo "Downloading pmbootstrap ($tag): $url"
+cd /tmp
+wget -q -O "pmb.tar.bz2" "$url"
+tar -xf "pmb.tar.bz2"
+mv pmbootstrap-* pmbootstrap
+
+# Install to $PATH and init
+ln -s /tmp/pmbootstrap/pmbootstrap.py /usr/local/bin/pmbootstrap
+echo "Initializing pmbootstrap"
+su pmos -c "yes '' | pmbootstrap -q --aports '$pmaports' init"
+echo ""
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2021 Oliver Smith
+# Copyright 2018 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

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

 # Require pmbootstrap
@@ -22,8 +22,8 @@ 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
+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?"
@@ -32,4 +32,4 @@ if ! [ -e $deviceinfo ]; then
 fi

 # Run testcases
-pytest -vv -x --tb=native "$pmaports/.ci/testcases" "$@"
+pytest -vv -x --tb=native "$pmaports/.gitlab-ci/testcases" "$@"
@@ -0,0 +1,58 @@
+#!/bin/sh -e
+# Copyright 2018 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!)' device; then
+	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
+	grep --color=always -r '(CHANGEME!)' device
+	exit 1
+fi
+
+# Shell: shellcheck
+sh_files="
+	./main/postmarketos-base/firmwareload.sh
+	./main/postmarketos-mkinitfs/init.sh.in
+	./main/postmarketos-mkinitfs/init_functions.sh
+	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
+	./main/postmarketos-update-kernel/update-kernel.sh
+	./main/postmarketos-android-recovery-installer/build_zip.sh
+	./main/postmarketos-android-recovery-installer/pmos_chroot
+	./main/postmarketos-android-recovery-installer/pmos_install
+	./main/postmarketos-android-recovery-installer/pmos_install_functions
+	./main/postmarketos-android-recovery-installer/pmos_setpw
+	./main/postmarketos-android-recovery-installer/update-binary
+	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
+	./main/postmarketos-ui-hildon/postmarketos-ui-hildon.post-install
+	$(find . -path './main/postmarketos-ui-hildon/*.sh')
+	$(find . -name '*.trigger')
+	$(find . -path './main/devicepkg-dev/*.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
+
+# Python: flake8
+# E501: max line length
+# F401: imported, but not used (false positive: add_pmbootstrap_to_import_path)
+# E722: do not use bare except
+cd "$DIR/.."
+
+echo "Test with flake8: testcases"
+# shellcheck disable=SC2086
+flake8 --ignore E501,F401,E722,W504,W605 $(find . -path "./.gitlab-ci/testcases/*.py")
+
+echo "Test with flake8: all other Python files"
+# shellcheck disable=SC2086
+flake8 --ignore E501,E722,W504,W605 $(find . -not -path './.gitlab-ci/testcases/*' -a -name '*.py')
+
+# Done
+echo "Success!"
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+# Copyright 2018 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import shutil
+import sys
+import os
+
+
+def path_pmbootstrap():
+    """ Find the pmbootstrap installation folder, so we can import the Python
+        code from there.
+        returns: pmbootstrap installation folder
+    """
+    # Find 'pmbootstrap' executable
+    bin = shutil.which("pmbootstrap")
+    if not bin:
+        print("ERROR: 'pmbootstrap' not found in $PATH")
+        sys.exit(1)
+
+    # Resolve the symlink and verify the folder
+    dir = os.path.dirname(os.path.realpath(bin))
+    if os.path.exists(dir + "/pmb/__init__.py"):
+        return dir
+
+    # Symlink not set up properly
+    print("ERROR: 'pmbootstrap' is not a symlink to pmbootstrap.py")
+    sys.exit(1)
+
+
+# Add pmbootstrap dir to import path
+sys.path.append(os.path.realpath(path_pmbootstrap()))
@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+# Copyright 2018 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import filecmp
+import pytest
+import sys
+import os
+
+import add_pmbootstrap_to_import_path
+import pmb.aportgen
+import pmb.config
+import pmb.helpers.logging
+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 test_aportgen(args, tmpdir):
+    # Fake aports folder in tmpdir
+    aports_real = args.aports
+    args.aports = str(tmpdir)
+    pmb.helpers.run.user(args, ["mkdir", "-p", str(tmpdir) + "/cross"])
+
+    # Create aportgen folder -> code path where it still exists
+    pmb.helpers.run.user(args, ["mkdir", "-p", args.work + "/aportgen"])
+
+    # Generate all valid packages (gcc twice -> different code path)
+    pkgnames = ["binutils-armhf", "musl-armhf", "busybox-static-armhf",
+                "gcc-armhf", "gcc-armhf"]
+    for pkgname in pkgnames:
+        pmb.aportgen.generate(args, pkgname)
+        path_new = args.aports + "/cross/" + pkgname + "/APKBUILD"
+        path_old = aports_real + "/cross/" + pkgname + "/APKBUILD"
+        assert os.path.exists(path_new)
+        assert filecmp.cmp(path_new, path_old, False)
+
+
+def test_aportgen_invalid_generator(args):
+    with pytest.raises(ValueError) as e:
+        pmb.aportgen.generate(args, "pkgname-with-no-generator")
+    assert "No generator available" in str(e.value)
+
+
+def test_aportgen_get_upstream_aport(args, monkeypatch):
+
+    # Fake pmb.parse.apkbuild()
+    def fake_apkbuild(*args, **kwargs):
+        return apkbuild
+    monkeypatch.setattr(pmb.parse, "apkbuild", fake_apkbuild)
+
+    # Fake pmb.parse.apkindex.package()
+    def fake_package(*args, **kwargs):
+        return package
+    monkeypatch.setattr(pmb.parse.apkindex, "package", fake_package)
+
+    # Equal version
+    func = pmb.aportgen.core.get_upstream_aport
+    upstream = "main/gcc"
+    upstream_full = args.work + "/cache_git/aports_upstream/" + upstream
+    apkbuild = {"pkgver": "2.0", "pkgrel": "0"}
+    package = {"version": "2.0-r0"}
+    assert func(args, upstream) == upstream_full
+
+    # APKBUILD < binary
+    apkbuild = {"pkgver": "1.0", "pkgrel": "0"}
+    package = {"version": "2.0-r0"}
+    with pytest.raises(RuntimeError) as e:
+        func(args, upstream)
+    assert str(e.value).startswith("You can update your local checkout with")
+
+    # APKBUILD > binary
+    apkbuild = {"pkgver": "3.0", "pkgrel": "0"}
+    package = {"version": "2.0-r0"}
+    with pytest.raises(RuntimeError) as e:
+        func(args, upstream)
+    assert str(e.value).startswith("You can force an update of your binary")
@@ -0,0 +1,138 @@
+#!/usr/bin/env python3
+# Copyright 2018 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
+
+
+@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 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:
+            # Check for successful deviceinfo parsing
+            info = pmb.parse.deviceinfo(args, device)
+
+            # 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 test_aports_device(args):
+    """
+    Various tests performed on the /device/device-* aports.
+    """
+    for path in glob.glob(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"]:
+            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>.")
+
+
+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
+    * Validate kernel subpackage names
+    """
+    # Generate list of valid subpackages
+    valid_subpackages = ["downstream", "rpi", "rpi2"]
+    for path in glob.glob(args.aports + "/main/linux-postmarketos-*"):
+        suffix = os.path.basename(path)[len("linux-postmarketos-"):]
+        valid_subpackages.append(suffix)
+
+    # 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)
+
+        # Verify subpackages
+        if kernels_subpackages:
+            for subpackage in kernels_subpackages:
+                if subpackage not in valid_subpackages:
+                    raise RuntimeError("Invalid kernel subpackage name '" +
+                                       subpackage + "', valid: " +
+                                       str(valid_subpackages))
@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+# Copyright 2018 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.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_kde_packages(args):
+    """
+    Parse all aports in the kde folder, and categorize them.
+
+    :returns: {"plasma": {"kwin": "5.13.3", ...},
+               "kde": {"kcrash": "5.48.0", ...},
+               "other": {"konsole": "1234", ...}}
+    """
+    ret = {"plasma": {}, "kde": {}, "other": {}}
+
+    for path in glob.glob(args.aports + "/kde/*/APKBUILD"):
+        # Parse APKBUILD
+        apkbuild = pmb.parse.apkbuild(args, path)
+        url = apkbuild["url"]
+        pkgname = apkbuild["pkgname"]
+        pkgver = apkbuild["pkgver"]
+
+        # 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"
+
+        # Save result
+        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_kde_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("KDE package category: " + category)
+                logging.info("Packages (" + str(len(packages)) + "): " +
+                             ", ".join(sorted(packages.keys())))
+                reference = {"pkgname": pkgname, "pkgver": pkgver}
+
+                # Category "other": done after printing the summary, no need to
+                # compare the package versions
+                if category == "other":
+                    break
+
+                # Print the reference and skip checking it against itself
+                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_kde_versions(args):
+    """
+    Make sure that KDE packages of the same framework have the same version.
+    """
+    categories = get_categorized_kde_packages(args)
+    if not check_categories(categories):
+        raise RuntimeError("KDE version check failed!")
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+# Copyright 2018 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+"""
+This file uses pmb.helper.pkgrel_bump to check if the aports need a pkgrel bump
+for any package, caused by a soname bump. Example: A new libressl/openssl
+version was released, which increased the soname version, and now all packages
+that link against it, need to be rebuilt.
+"""
+
+import os
+import pytest
+import sys
+
+import add_pmbootstrap_to_import_path
+import pmb.helpers.pkgrel_bump
+import pmb.helpers.logging
+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
+
+
+@pytest.mark.pmaports_upstream_compat
+def test_soname_bump(args):
+    if pmb.helpers.pkgrel_bump.auto(args, True):
+        raise RuntimeError("One or more packages need to be rebuilt, because"
+                           " a library they link against had an incompatible"
+                           " upgrade (soname bump). Run 'pmbootstrap"
+                           " pkgrel_bump --auto' to automatically increase the"
+                           " pkgrel in order to trigger a rebuild. If this"
+                           " test case failed during a pull request, the issue"
+                           " needs to be fixed on the 'master' branch first,"
+                           " then rebase your PR on 'master' afterwards.")
@@ -0,0 +1,107 @@
+#!/usr/bin/env python3
+# Copyright 2018 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import os
+import sys
+import glob
+import pytest
+
+import add_pmbootstrap_to_import_path
+import pmb.helpers.logging
+import pmb.parse.apkindex
+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
+
+
+@pytest.mark.pmaports_upstream_compat
+def test_qt_versions(args):
+    """
+    Verify, that all postmarketOS qt5- package versions match with Alpine's
+    qt5-qtbase version.
+    """
+    # Upstream version
+    index = pmb.helpers.repo.alpine_apkindex_path(args, "community", "x86_64")
+    index_data = pmb.parse.apkindex.package(args, "qt5-qtbase",
+                                            indexes=[index])
+    pkgver_upstream = index_data["version"].split("-r")[0]
+
+    # Iterate over our packages
+    failed = []
+    for path in glob.glob(args.aports + "/*/qt5-*/APKBUILD"):
+        # Read the pkgver
+        apkbuild = pmb.parse.apkbuild(args, path)
+        pkgname = apkbuild["pkgname"]
+        pkgver = apkbuild["pkgver"]
+
+        # When we temporarily override packages from Alpine, we set the pkgver
+        # to 9999 and _pkgver contains the real version (see #994).
+        if pkgver == "9999":
+            pkgver = apkbuild["_pkgver"]
+
+        # Compare
+        if pkgver == pkgver_upstream:
+            continue
+        failed.append(pkgname + ": " + pkgver + " != " +
+                      pkgver_upstream)
+
+    assert [] == failed
+
+
+@pytest.mark.pmaports_upstream_compat
+def test_aportgen_versions(args):
+    """
+    Verify that the packages generated by 'pmbootstrap aportgen' have
+    the same version (pkgver *and* pkgrel!) as the upstream packages
+    they are based on.
+    """
+    # Get Alpine's "main" repository APKINDEX path
+    index = pmb.helpers.repo.alpine_apkindex_path(args, "main", "x86_64")
+
+    # Alpine packages and patterns for our derivatives
+    map = {"binutils": "binutils-*",
+           "busybox": "busybox-static-*",
+           "gcc": "gcc-*",
+           "musl": "musl-*"}
+
+    # Iterate over Alpine packages
+    failed = []
+    generated = "# Automatically generated aport, do not edit!"
+    for pkgname, pattern in map.items():
+        # Upstream version
+        index_data = pmb.parse.apkindex.package(args, pkgname,
+                                                indexes=[index])
+        version_upstream = index_data["version"]
+
+        # Iterate over our packages
+        for path in glob.glob(args.aports + "/*/" + pattern + "/APKBUILD"):
+            # Skip non-aportgen APKBUILDs
+            with open(path) as handle:
+                if generated not in handle.read():
+                    continue
+
+            # Compare the version
+            print("Checking " + path)
+            apkbuild = pmb.parse.apkbuild(args, path)
+            version = apkbuild["pkgver"] + "-r" + apkbuild["pkgrel"]
+            if version != version_upstream:
+                failed.append(apkbuild["pkgname"] + ": " + version +
+                              " != " + version_upstream +
+                              " (from " + pkgname + ")")
+                continue
+
+    assert [] == failed
@@ -1,19 +0,0 @@
-{
-    "subject_format": {
-        "pass": [
-            "^[a-z]+/[a-z-0-9*{}]+: new aport(s|)( \\(MR \\d+\\)|)$",
-            "^[a-z]+/[a-z-0-9*{}]+: pkgrel bump( \\(MR \\d+\\)|)$",
-            "^[a-z-0-9*{}]+: new device \\([^\\)]+\\)( \\(MR \\d+\\)|)",
-            "^[a-z]+/[a-z-0-9*{}]+: upgrade to [0-9\\.a-z\\-_]+( \\(MR \\d+\\)|)$",
-            "^[a-z]+/[a-z-0-9*{}]+: remove( \\(MR \\d+\\)|)$",
-            "^[a-z]+/[a-z-0-9*{}]+: remove, upstreamed( \\(MR \\d+\\)|)$",
-            "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
-            "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
-            "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
-        ],
-        "unknown": [
-            "^[a-z-0-9_.*{}\\/]+: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
-        ]
-    }
-}
-
@@ -1,10 +0,0 @@
-# https://docs.gitlab.com/ee/user/project/code_owners.html
-
-device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
-device/*/*-purism-librem5/          @craftyguy @bshah
-main/osk-sdl/                       @craftyguy
-main/mesa-pvr-dri-classic/          @xc-racer99
-main/postmarketos-ui-plasma-mobile/ @bshah
-temp/u-boot-librem5/                @craftyguy @bshah
-
-# vim: ts=4 sw=4 et
@@ -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)
@@ -0,0 +1,39 @@
+pkgname=android-libcutils
+pkgver=7.0.0_r34
+pkgrel=0
+pkgdesc="Android low-level utility library"
+url="https://github.com/android/platform_system_core"
+arch="all"
+license="APACHE2"
+depends=""
+makedepends="bsd-compat-headers android-liblog android-liblog-dev"
+options="!check"
+source="
+	android_platform_system_core-$pkgver.tar.gz::https://github.com/android/platform_system_core/archive/android-${pkgver}.tar.gz
+	Makefile"
+_lib="cutils"
+subpackages="$pkgname-dev"
+builddir="$srcdir"/platform_system_core-android-$pkgver/lib${_lib}
+
+prepare() {
+	cp "$srcdir"/Makefile "$builddir"
+}
+
+build() {
+	cd "$builddir"
+	make
+}
+
+package() {
+	# Library
+	install -Dm644 "${builddir}/lib${_lib}.so" \
+		"${pkgdir}/usr/lib/android/lib${_lib}.so"
+
+	# Header files
+	mkdir -p "${pkgdir}/usr/include/android/"
+	cp -r "${srcdir}/platform_system_core-android-${pkgver}/include/${_lib}" \
+		"${pkgdir}/usr/include/android/"
+}
+
+sha512sums="f84d31db61f86c73b8aecbaf788d43b0a2cc984121fd7244a2f7ca2a2a751437b8708acdd27cb86a260162e866c40f6015f14d52beb3a85e9ae2efd6f44b73f3  android_platform_system_core-7.0.0_r34.tar.gz
+2aeab8d7267508a7c570a57f771796a9ed8cd7747d3dd33a84535c66331a7f6cf147919e8859f74de27a13d760af7de9f7e69aa688515451a21320603c4c4f4b  Makefile"
@@ -0,0 +1,62 @@
+LD := gcc
+LDFLAGS := -L/usr/lib/android/ -shared
+LIBS := -l:liblog.so
+CXX := g++
+CXXFLAGS := -std=c++14 -Wall -I../include -fPIC
+CC := gcc
+
+# char16_t workaround: https://stackoverflow.com/a/22369822
+CFLAGS := -Wall -I../include -Dchar16_t=uint16_t -fPIC
+
+# From Android.mk: libcutils_common_sources, libcutils_nonwindows_sources
+SRC_C := \
+        atomic.c \
+        config_utils.c \
+        fs_config.c \
+        canned_fs_config.c \
+        hashmap.c \
+        iosched_policy.c \
+        load_file.c \
+        native_handle.c \
+        open_memstream.c \
+        process_name.c \
+        record_stream.c \
+        sched_policy.c \
+        strdup16to8.c \
+        strdup8to16.c \
+        strlcpy.c \
+        threads.c \
+        fs.c \
+        multiuser.c \
+        socket_inaddr_any_server_unix.c \
+        socket_local_client_unix.c \
+        socket_local_server_unix.c \
+        socket_loopback_client_unix.c \
+        socket_loopback_server_unix.c \
+        socket_network_client_unix.c \
+        str_parms.c
+
+SRC_CPP := \
+        sockets_unix.cpp \
+        sockets.cpp
+
+OBJECTS := $(SRC_C:%.c=%.c.o) $(SRC_CPP:%.cpp=%.cpp.o)
+
+all: libcutils.so
+
+%.c.o: %.c
+	$(info CC $<)
+	@$(CC) -c -o $@ $< $(CFLAGS)
+
+%.cpp.o: %.cpp
+	$(info CC $<)
+	@$(CXX) -c -o $@ $< $(CXXFLAGS)
+
+libcutils.so: $(OBJECTS)
+	$(info LD $@)
+	@$(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
+
+.PHONY: clean
+
+clean:
+	rm -v libcutils.so *.o
@@ -0,0 +1,39 @@
+pkgname=android-liblog
+pkgver=7.0.0_r34
+pkgrel=0
+pkgdesc="Android low-level logging library"
+url="https://github.com/android/platform_system_core"
+arch="all"
+license="APACHE2"
+depends=""
+makedepends="bsd-compat-headers"
+options="!check"
+source="
+	android_platform_system_core-$pkgver.tar.gz::https://github.com/android/platform_system_core/archive/android-${pkgver}.tar.gz
+	Makefile"
+_lib="log"
+subpackages="$pkgname-dev"
+builddir="$srcdir"/platform_system_core-android-$pkgver/lib${_lib}
+
+prepare() {
+	cp "$srcdir"/Makefile "$builddir"
+}
+
+build() {
+	cd "$builddir"
+	make
+}
+
+package() {
+	# Library
+	install -Dm644 "${builddir}/lib${_lib}.so" \
+		"${pkgdir}/usr/lib/android/lib${_lib}.so"
+
+	# Header files
+	mkdir -p "${pkgdir}/usr/include/android/"
+	cp -r "${srcdir}/platform_system_core-android-${pkgver}/include/${_lib}" \
+		"${pkgdir}/usr/include/android/"
+}
+
+sha512sums="f84d31db61f86c73b8aecbaf788d43b0a2cc984121fd7244a2f7ca2a2a751437b8708acdd27cb86a260162e866c40f6015f14d52beb3a85e9ae2efd6f44b73f3  android_platform_system_core-7.0.0_r34.tar.gz
+967055ff34e1aa66cb76de0374be24810fab8a11b56a11c33fac0a7914def39884b1b6428b4deda5aa13a9f323d556479f25fa351220f2909c9fbfd72ca31a4b  Makefile"
@@ -0,0 +1,31 @@
+# From Android.mk: liblog_sources, liblog_host_sources, LOCAL_SRC_FILES_linux
+SRC_C := \
+	config_write.c \
+	event_tag_map.c \
+	fake_log_device.c \
+	fake_writer.c \
+	log_event_list.c \
+	log_event_write.c \
+	logger_lock.c \
+	logger_name.c \
+	logger_write.c
+OBJECTS := $(SRC_C:%.c=%.o)
+CC := gcc
+LD := gcc
+LDFLAGS := -shared
+CFLAGS := -Wall -I../include -fPIC
+
+all: liblog.so
+
+%.o: %.c
+	$(info CC $<)
+	@$(CC) -c -o $@ $< $(CFLAGS)
+
+liblog.so: $(OBJECTS)
+	$(info LD $@)
+	@$(LD) -o $@ $^ $(LDFLAGS)
+
+.PHONY: clean
+
+clean:
+	rm -v *.o liblog.so
@@ -0,0 +1,24 @@
+diff --git a/include/hardware_legacy/power.h b/include/hardware_legacy/power.h
+new file mode 100644
+index 0000000..5aeb933
+--- /dev/null
+++ b/include/hardware_legacy/power.h
+@@ -0,0 +1,18 @@
+#pragma once
+// This is a stub for wake locks, so we don't need to compile
+// android_hardware_libhardware_legacy for now.
+
+#include <stdint.h>
+
+enum {
+	PARTIAL_WAKE_LOCK = 1,
+	FULL_WAKE_LOCK = 2
+};
+
+int acquire_wake_lock(int lock, const char* id) {
+	// STUB
+};
+
+int release_wake_lock(const char* id) {
+	// STUB
+};
@@ -0,0 +1,54 @@
+# NOTE: 8.x has a more complicated build process:
+# https://source.android.com/devices/architecture/hidl-cpp
+
+pkgname=android-ril
+pkgver=7.0.0_r34
+pkgrel=0
+pkgdesc="Radio Interface Layer Daemon"
+url="https://github.com/android/platform_hardware_ril"
+arch="all"
+license="APACHE2"
+depends=""
+makedepends="nanopb nanopb-dev android-libcutils-dev"
+options="!check"
+# subpackages="librilutils libril"
+source="
+	$pkgname-$pkgver.tar.gz::https://github.com/android/platform_hardware_ril/archive/android-${pkgver}.tar.gz
+	rild.initd
+	Makefile.libril
+	Makefile.librilutils
+	Makefile.rild
+	01_wake_lock_stub.patch
+"
+builddir="$srcdir"/platform_hardware_ril-android-$pkgver
+
+prepare() {
+	default_prepare
+	for i in librilutils libril rild; do
+		cp "$srcdir"/Makefile.$i "$builddir"/$i/Makefile
+	done
+}
+
+build() {
+	for i in librilutils libril rild; do
+		msg "Building $i"
+		cd "$builddir/$i"
+		make
+	done
+}
+
+package() {
+	cd "$builddir"
+
+	# OpenRC service
+	install -Dm755 "$srcdir/rild.initd" "$pkgdir/etc/init.d/rild"
+}
+
+
+
+sha512sums="7685958bbe628c761f568e0bd85f50ec6f7524945142c870aa1ad9ee5afc7e9db526b6aaa41fad71b584a7a048e1947c73ee8d61d588b0e5da5c8b56a30cc961  android-ril-7.0.0_r34.tar.gz
+f6b01eaf37412bfb5748a184f84b619a254d4a0bffc51613f74aef058fcea3f55d2e504ddacdf22463e2fca0ce71edc89be4e7de42fcc3761e2de8fc3a7316d5  rild.initd
+e85d424293b2bedc7b144cb29e8a0131b6ee385ec1c688a80b40d6836a93c4886b184c46880d74266f9c0b554be2b3da6c3836f3a6d05703f34c356ef284e970  Makefile.libril
+7a8b8da2aec6d91459c1641cf75f7a710b661814a4d447c58a361d67832d5237bbc6945be9a375a286b3137ef6bcd942689c1e0cc8c270b9fff91c2ca0ad1da7  Makefile.librilutils
+cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e  Makefile.rild
+5d0d7e79fc0454bf627917a8c9acd801760145c320a082933619f3eeb3f30bd832db7cab7d68f86e3b4217373ee6919365449af78675aea5005c53bb80594c6a  01_wake_lock_stub.patch"
@@ -0,0 +1,21 @@
+CXX        := g++
+CXXFLAGS   := -std=c++14 -Wall -g -I../include -I/usr/include/android
+LIBS       :=
+
+SOURCES	:= ${wildcard *.cpp}
+OBJECTS	:= $(SOURCES:%.cpp=%.o)
+
+all: libril.so
+
+%.o: %.cpp
+	@echo CC $<
+	@$(CXX) -c -o $@ $< $(CXXFLAGS)
+
+libril.so: $(OBJECTS)
+	@echo LD $@
+	@$(CXX) -o $@ $^ $(CXXFLAGS) $(LIBS)
+
+.PHONY: clean
+
+clean:
+	-rm -fv *.o libril.so
@@ -0,0 +1,26 @@
+CC := gcc
+CFLAGS := -Wall -I../include/ -I. -fPIC
+
+PBSRC := ${wildcard proto/*.proto}
+SRC := ${wildcard *.c} $(PBSRC:%.proto=%.pb-c.c)
+OBJ := $(SRC:%.c=%.o)
+
+all: librilutils.so.1
+
+%.pb-c.c: %.proto
+	$(info PROTO $<)
+	@protoc --nanopb_out=. $<
+
+%.o: %.c
+	$(info CC $<)
+	@$(CC) -c -o $@ $< $(CFLAGS)
+
+librilutils.so.1: $(OBJ) $(PBOBJ)
+	$(info LD $@)
+	@$(CC) -shared -Wl,-soname,$@.so.1 -o $@.so.1 $^ $(CFLAGS)
+
+.PHONY: clean
+
+clean:
+	-rm -v *.o *.so proto/*.pb-c.*
+
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Purpose License v2
+
+depend() {
+}
+
+start() {
+   ebegin "Starting Radio Interface Layer"
+   start-stop-daemon --start --quiet --exec /usr/sbin/rild
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping Radio Interface Layer"
+   start-stop-daemon --stop --quiet --exec /usr/sbin/rild
+   eend $?
+}
@@ -0,0 +1,46 @@
+pkgname=nanopb
+pkgver=0.3.9
+pkgrel=1
+pkgdesc="Protocol Buffers with small code size"
+url="https://jpa.kapsi.fi/nanopb"
+arch="all"
+license="MIT"
+depends="py2-protobuf"
+makedepends="cmake python2 protobuf"
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/nanopb/nanopb/archive/${pkgver}.tar.gz"
+options="!check"
+
+builddir="$srcdir"/$pkgname-$pkgver
+build() {
+	cd "$builddir"
+	cmake -DCMAKE_BUILD_TYPE=Release
+	make
+}
+
+package() {
+	cd "$builddir"
+
+	# Statically linked library
+	install -Dm644 libprotobuf-nanopb.a "$pkgdir"/usr/lib/libprotobuf-nanopb.a
+
+	# Header files
+	for i in *.h; do
+		install -Dm644 "$i" "$pkgdir/usr/include/$i"
+	done
+
+	# Protobuf plugin
+	for i in nanopb_generator.py protoc-gen-nanopb; do
+		install -Dm755 "generator/$i" "$pkgdir/usr/bin/$i"
+	done
+
+	# Protocol definitions for generator
+	make -C generator/proto
+	for i in __init__.py nanopb_pb2.py plugin_pb2.py; do
+		echo "installing $i"
+		install -Dm755 "generator/proto/$i" "$pkgdir/usr/lib/python2.7/proto/$i"
+	done
+
+}
+
+sha512sums="1fa18d69ebfba2a58214beebd31fbbdd1edd71a19978754288adc09be6d5782feeb7bab2916448add2ab5bf7072d377101c7441b3e74619339dc545df3a73275  nanopb-0.3.9.tar.gz"
@@ -1,33 +0,0 @@
-# Reference: https://postmarketos.org/channels.cfg
-[channels.cfg]
-recommended=edge
-
-[edge]
-description=Rolling release / Most devices / Occasional breakage: https://postmarketos.org/edge
-branch_pmaports=master
-branch_aports=master
-mirrordir_alpine=edge
-
-[v21.12]
-description=Latest release / Recommended for best stability
-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)
-branch_pmaports=v20.05
-branch_aports=3.12-stable
-mirrordir_alpine=v3.12
@@ -6,17 +6,17 @@
 # that).

 pkgname=arch-bin-masquerade
-pkgver=2
+pkgver=1
 pkgrel=0
 pkgdesc="Wrappers for ccache + distcc (native and foreign chroots)"
 url="https://postmarketOS.org"
 arch="all"
 license="MIT"
-options="!check !tracedeps pmb:cross-native"
+options="!check !tracedeps"

 package() {
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64"
+	_archs="x86_64 armhf aarch64"
 	_bins="c++ cc cpp g++ gcc"

 	# Iterate over architectures
@@ -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
-
@@ -2,28 +2,25 @@
 # Generator: pmbootstrap aportgen binutils-aarch64
 # Based on: main/binutils

-pkgname=binutils-aarch64
-pkgver=2.38
-pkgrel=1
+
+pkgname="binutils-aarch64"
+pkgver=2.31.1
+pkgrel=0
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
-makedepends="gettext libtool autoconf automake bison texinfo"
-arch="x86_64"
+depends=""
+makedepends_build=""
+makedepends_host=""
+makedepends="gettext libtool autoconf automake bison"
+arch="armhf x86_64 x86"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
+subpackages=""
+source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
 	binutils-ld-fix-static-linking.patch
 	gold-mips.patch
-	ld-bfd-mips.patch
-	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	binutils-ppc-fix-machine-options.patch
 	"
 builddir="$srcdir/binutils-$pkgver"

-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages=""
-fi
-
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -31,52 +28,38 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi

 # secfixes:
-#   2.35.2-r1:
-#     - CVE-2021-3487
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
 #   2.28-r1:
-#     - CVE-2017-7614
+#   - CVE-2017-7614

 build() {
-	_target="$(arch_to_hostspec aarch64)"
-	"$builddir"/configure \
-		--build="$CBUILD" \
-		--target=$_target \
-		--with-lib-path=/usr/lib \
-		--prefix=/usr \
-		--with-sysroot=/usr/$_target \
-		--enable-ld=default \
-		--enable-gold=yes \
-		--enable-plugins \
-		--enable-deterministic-archives \
-		--disable-multilib \
-		--disable-werror \
-		--disable-nls
-	make
+        _target="$(arch_to_hostspec aarch64)"
+        cd "$builddir"
+        "$builddir"/configure \
+            --build="$CBUILD" \
+            --target=$_target \
+            --with-lib-path=/usr/lib \
+            --prefix=/usr \
+            --with-sysroot=/usr/$_target \
+            --enable-ld=default \
+            --enable-gold=yes \
+            --enable-plugins \
+            --enable-deterministic-archives \
+            --disable-multilib \
+            --disable-werror \
+            --disable-nls
+        make
 }

 package() {
-	make install DESTDIR="$pkgdir"
+        cd "$builddir"
+        make install DESTDIR="$pkgdir"

-	# remove man, info folders
-	rm -rf "$pkgdir"/usr/share
-
-	# remove files that conflict with non-cross binutils
-	rm -rf "$pkgdir"/usr/lib/bfd-plugins
+        # remove man, info folders
+        rm -rf "$pkgdir"/usr/share
 }



-sha512sums="
-8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
+sha512sums="b42954e6f49a0adcd2676bdd77dfb59bfc25cec8184b007521d1e2b1d5d0593b58639e3d9448d5a40fe024c3cea386a37743627d6bb16d502f52a4a32b9573bd  binutils-2.31.1.tar.bz2
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-"
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.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;
@@ -1,41 +0,0 @@
-Fix for DARN opcode error during ppc64le compilation of rng-tools which
-occurs with binutils 2.38 but not with binutils 2.37..
-
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
-
-
-diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
--- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@
- 	     options do not count as a new machine, instead they add
- 	     to currently selected opcodes.  */
- 	  ppc_cpu_t machine_sticky = 0;
-	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+	  /* Unfortunately, some versions of gcc emit a .machine
-+	     directive very near the start of the compiler's assembly
-+	     output file.  This is bad because it overrides user -Wa
-+	     cpu selection.  Worse, there are versions of gcc that
-+	     emit the *wrong* cpu, not even respecting the -mcpu given
-+	     to gcc.  See gcc pr101393.  And to compound the problem,
-+	     as of 20220222 gcc doesn't pass the correct cpu option to
-+	     gas on the command line.  See gcc pr59828.  Hack around
-+	     this by keeping sticky options for an early .machine.  */
-+	  asection *sec;
-+	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+	    {
-+	      segment_info_type *info = seg_info (sec);
-+	      /* Are the frags for this section perturbed from their
-+	         initial state?  Even .align will count here.  */
-+	      if (info != NULL
-+	          && (info->frchainP->frch_root != info->frchainP->frch_last
-+	              || info->frchainP->frch_root->fr_type != rs_fill
-+	              || info->frchainP->frch_root->fr_fix != 0))
-+	        break;
-+	    }
-+	  new_cpu = ppc_parse_cpu (ppc_cpu,
-+	                           sec == NULL ? &sticky : &machine_sticky,
-+	                           cpu_string);
- 	  if (new_cpu != 0)
- 	    ppc_cpu = new_cpu;
- 	  else
@@ -0,0 +1,93 @@
+From d66deb71f1537e2e30dccdfda22eed5d46ec47eb Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Wed, 14 Mar 2018 22:09:33 +1030
+Subject: [PATCH] PowerPC64 debian bug 886264, out-of-line save/restore
+ functions
+
+This calculation in relocate_section
+
+	      if (stub_entry->stub_type == ppc_stub_save_res)
+		relocation += (stub_sec->output_offset
+			       + stub_sec->output_section->vma
+			       + stub_sec->size - htab->sfpr->size
+			       - htab->sfpr->output_offset
+			       - htab->sfpr->output_section->vma);
+
+to adjust from the original out-of-line save/restore function address
+in sfpr to a copy at the end of stub_sec goes wrong when stub_sec is
+padded, because the copy is no longer at the end of stub_sec.  The
+solution is to pad before copying sfpr, so the copy is always at the
+end of stub_sec.
+
+	* elf64-ppc.c (sfpr_define): Adjust for stub_sec size having
+	sfpr size added before defining alias symbols.
+	(ppc64_elf_build_stubs): Add stub section padding before
+	copying sfpr contents and defining save/restore alias symbols.
+
+(cherry picked from commit 7dda8d3cf3b089bb7e03c4cdbec827fc6a188c88)
+---
+ bfd/ChangeLog   |  9 +++++++++
+ bfd/elf64-ppc.c | 33 ++++++++++++++++++---------------
+ 2 files changed, 27 insertions(+), 15 deletions(-)
+
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index 6fcdff0..039294f 100644
+--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
+@@ -6645,7 +6645,7 @@ sfpr_define (struct bfd_link_info *info,
+ 		{
+ 		  s->root.type = bfd_link_hash_defined;
+ 		  s->root.u.def.section = stub_sec;
+-		  s->root.u.def.value = (stub_sec->size
+		  s->root.u.def.value = (stub_sec->size - htab->sfpr->size
+ 					 + h->elf.root.u.def.value);
+ 		  s->ref_regular = 1;
+ 		  s->def_regular = 1;
+@@ -13232,20 +13232,7 @@ ppc64_elf_build_stubs (struct bfd_link_info *info,
+ 
+   for (group = htab->group; group != NULL; group = group->next)
+     if (group->needs_save_res)
+-      {
+-	stub_sec = group->stub_sec;
+-	memcpy (stub_sec->contents + stub_sec->size, htab->sfpr->contents,
+-		htab->sfpr->size);
+-	if (htab->params->emit_stub_syms)
+-	  {
+-	    unsigned int i;
+-
+-	    for (i = 0; i < ARRAY_SIZE (save_res_funcs); i++)
+-	      if (!sfpr_define (info, &save_res_funcs[i], stub_sec))
+-		return FALSE;
+-	  }
+-	stub_sec->size += htab->sfpr->size;
+-      }
+      group->stub_sec->size += htab->sfpr->size;
+ 
+   if (htab->relbrlt != NULL)
+     htab->relbrlt->reloc_count = 0;
+@@ -13259,6 +13246,22 @@ ppc64_elf_build_stubs (struct bfd_link_info *info,
+ 	}
+ 
+   for (group = htab->group; group != NULL; group = group->next)
+    if (group->needs_save_res)
+      {
+	stub_sec = group->stub_sec;
+	memcpy (stub_sec->contents + stub_sec->size - htab->sfpr->size,
+		htab->sfpr->contents, htab->sfpr->size);
+	if (htab->params->emit_stub_syms)
+	  {
+	    unsigned int i;
+
+	    for (i = 0; i < ARRAY_SIZE (save_res_funcs); i++)
+	      if (!sfpr_define (info, &save_res_funcs[i], stub_sec))
+		return FALSE;
+	  }
+      }
+
+  for (group = htab->group; group != NULL; group = group->next)
+     if ((stub_sec = group->stub_sec) != NULL)
+       {
+ 	stub_sec_count += 1;
+-- 
+2.9.3
+
@@ -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
@@ -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
-
@@ -2,28 +2,25 @@
 # Generator: pmbootstrap aportgen binutils-armhf
 # Based on: main/binutils

-pkgname=binutils-armhf
-pkgver=2.38
-pkgrel=1
+
+pkgname="binutils-armhf"
+pkgver=2.31.1
+pkgrel=0
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
-makedepends="gettext libtool autoconf automake bison texinfo"
-arch="x86_64"
+depends=""
+makedepends_build=""
+makedepends_host=""
+makedepends="gettext libtool autoconf automake bison"
+arch="aarch64 x86_64 x86"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
+subpackages=""
+source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
 	binutils-ld-fix-static-linking.patch
 	gold-mips.patch
-	ld-bfd-mips.patch
-	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	binutils-ppc-fix-machine-options.patch
 	"
 builddir="$srcdir/binutils-$pkgver"

-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages=""
-fi
-
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -31,52 +28,38 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi

 # secfixes:
-#   2.35.2-r1:
-#     - CVE-2021-3487
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
 #   2.28-r1:
-#     - CVE-2017-7614
+#   - CVE-2017-7614

 build() {
-	_target="$(arch_to_hostspec armhf)"
-	"$builddir"/configure \
-		--build="$CBUILD" \
-		--target=$_target \
-		--with-lib-path=/usr/lib \
-		--prefix=/usr \
-		--with-sysroot=/usr/$_target \
-		--enable-ld=default \
-		--enable-gold=yes \
-		--enable-plugins \
-		--enable-deterministic-archives \
-		--disable-multilib \
-		--disable-werror \
-		--disable-nls
-	make
+        _target="$(arch_to_hostspec armhf)"
+        cd "$builddir"
+        "$builddir"/configure \
+            --build="$CBUILD" \
+            --target=$_target \
+            --with-lib-path=/usr/lib \
+            --prefix=/usr \
+            --with-sysroot=/usr/$_target \
+            --enable-ld=default \
+            --enable-gold=yes \
+            --enable-plugins \
+            --enable-deterministic-archives \
+            --disable-multilib \
+            --disable-werror \
+            --disable-nls
+        make
 }

 package() {
-	make install DESTDIR="$pkgdir"
+        cd "$builddir"
+        make install DESTDIR="$pkgdir"

-	# remove man, info folders
-	rm -rf "$pkgdir"/usr/share
-
-	# remove files that conflict with non-cross binutils
-	rm -rf "$pkgdir"/usr/lib/bfd-plugins
+        # remove man, info folders
+        rm -rf "$pkgdir"/usr/share
 }



-sha512sums="
-8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
+sha512sums="b42954e6f49a0adcd2676bdd77dfb59bfc25cec8184b007521d1e2b1d5d0593b58639e3d9448d5a40fe024c3cea386a37743627d6bb16d502f52a4a32b9573bd  binutils-2.31.1.tar.bz2
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-"
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.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;
@@ -1,41 +0,0 @@
-Fix for DARN opcode error during ppc64le compilation of rng-tools which
-occurs with binutils 2.38 but not with binutils 2.37..
-
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
-
-
-diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
--- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@
- 	     options do not count as a new machine, instead they add
- 	     to currently selected opcodes.  */
- 	  ppc_cpu_t machine_sticky = 0;
-	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+	  /* Unfortunately, some versions of gcc emit a .machine
-+	     directive very near the start of the compiler's assembly
-+	     output file.  This is bad because it overrides user -Wa
-+	     cpu selection.  Worse, there are versions of gcc that
-+	     emit the *wrong* cpu, not even respecting the -mcpu given
-+	     to gcc.  See gcc pr101393.  And to compound the problem,
-+	     as of 20220222 gcc doesn't pass the correct cpu option to
-+	     gas on the command line.  See gcc pr59828.  Hack around
-+	     this by keeping sticky options for an early .machine.  */
-+	  asection *sec;
-+	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+	    {
-+	      segment_info_type *info = seg_info (sec);
-+	      /* Are the frags for this section perturbed from their
-+	         initial state?  Even .align will count here.  */
-+	      if (info != NULL
-+	          && (info->frchainP->frch_root != info->frchainP->frch_last
-+	              || info->frchainP->frch_root->fr_type != rs_fill
-+	              || info->frchainP->frch_root->fr_fix != 0))
-+	        break;
-+	    }
-+	  new_cpu = ppc_parse_cpu (ppc_cpu,
-+	                           sec == NULL ? &sticky : &machine_sticky,
-+	                           cpu_string);
- 	  if (new_cpu != 0)
- 	    ppc_cpu = new_cpu;
- 	  else
@@ -0,0 +1,93 @@
+From d66deb71f1537e2e30dccdfda22eed5d46ec47eb Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Wed, 14 Mar 2018 22:09:33 +1030
+Subject: [PATCH] PowerPC64 debian bug 886264, out-of-line save/restore
+ functions
+
+This calculation in relocate_section
+
+	      if (stub_entry->stub_type == ppc_stub_save_res)
+		relocation += (stub_sec->output_offset
+			       + stub_sec->output_section->vma
+			       + stub_sec->size - htab->sfpr->size
+			       - htab->sfpr->output_offset
+			       - htab->sfpr->output_section->vma);
+
+to adjust from the original out-of-line save/restore function address
+in sfpr to a copy at the end of stub_sec goes wrong when stub_sec is
+padded, because the copy is no longer at the end of stub_sec.  The
+solution is to pad before copying sfpr, so the copy is always at the
+end of stub_sec.
+
+	* elf64-ppc.c (sfpr_define): Adjust for stub_sec size having
+	sfpr size added before defining alias symbols.
+	(ppc64_elf_build_stubs): Add stub section padding before
+	copying sfpr contents and defining save/restore alias symbols.
+
+(cherry picked from commit 7dda8d3cf3b089bb7e03c4cdbec827fc6a188c88)
+---
+ bfd/ChangeLog   |  9 +++++++++
+ bfd/elf64-ppc.c | 33 ++++++++++++++++++---------------
+ 2 files changed, 27 insertions(+), 15 deletions(-)
+
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index 6fcdff0..039294f 100644
+--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
+@@ -6645,7 +6645,7 @@ sfpr_define (struct bfd_link_info *info,
+ 		{
+ 		  s->root.type = bfd_link_hash_defined;
+ 		  s->root.u.def.section = stub_sec;
+-		  s->root.u.def.value = (stub_sec->size
+		  s->root.u.def.value = (stub_sec->size - htab->sfpr->size
+ 					 + h->elf.root.u.def.value);
+ 		  s->ref_regular = 1;
+ 		  s->def_regular = 1;
+@@ -13232,20 +13232,7 @@ ppc64_elf_build_stubs (struct bfd_link_info *info,
+ 
+   for (group = htab->group; group != NULL; group = group->next)
+     if (group->needs_save_res)
+-      {
+-	stub_sec = group->stub_sec;
+-	memcpy (stub_sec->contents + stub_sec->size, htab->sfpr->contents,
+-		htab->sfpr->size);
+-	if (htab->params->emit_stub_syms)
+-	  {
+-	    unsigned int i;
+-
+-	    for (i = 0; i < ARRAY_SIZE (save_res_funcs); i++)
+-	      if (!sfpr_define (info, &save_res_funcs[i], stub_sec))
+-		return FALSE;
+-	  }
+-	stub_sec->size += htab->sfpr->size;
+-      }
+      group->stub_sec->size += htab->sfpr->size;
+ 
+   if (htab->relbrlt != NULL)
+     htab->relbrlt->reloc_count = 0;
+@@ -13259,6 +13246,22 @@ ppc64_elf_build_stubs (struct bfd_link_info *info,
+ 	}
+ 
+   for (group = htab->group; group != NULL; group = group->next)
+    if (group->needs_save_res)
+      {
+	stub_sec = group->stub_sec;
+	memcpy (stub_sec->contents + stub_sec->size - htab->sfpr->size,
+		htab->sfpr->contents, htab->sfpr->size);
+	if (htab->params->emit_stub_syms)
+	  {
+	    unsigned int i;
+
+	    for (i = 0; i < ARRAY_SIZE (save_res_funcs); i++)
+	      if (!sfpr_define (info, &save_res_funcs[i], stub_sec))
+		return FALSE;
+	  }
+      }
+
+  for (group = htab->group; group != NULL; group = group->next)
+     if ((stub_sec = group->stub_sec) != NULL)
+       {
+ 	stub_sec_count += 1;
+-- 
+2.9.3
+
@@ -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
@@ -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
-
@@ -1,82 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen binutils-armv7
-# Based on: main/binutils
-
-pkgname=binutils-armv7
-pkgver=2.38
-pkgrel=1
-pkgdesc="Tools necessary to build programs for armv7 targets"
-url="https://www.gnu.org/software/binutils/"
-makedepends="gettext libtool autoconf automake bison texinfo"
-arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
-	binutils-ld-fix-static-linking.patch
-	gold-mips.patch
-	ld-bfd-mips.patch
-	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	binutils-ppc-fix-machine-options.patch
-	"
-builddir="$srcdir/binutils-$pkgver"
-
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages=""
-fi
-
-if [ "$CHOST" != "$CTARGET" ]; then
-	pkgname="binutils-$CTARGET_ARCH"
-	subpackages=""
-	sonameprefix="binutils:"
-fi
-
-# secfixes:
-#   2.35.2-r1:
-#     - CVE-2021-3487
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
-#   2.28-r1:
-#     - CVE-2017-7614
-
-build() {
-	_target="$(arch_to_hostspec armv7)"
-	"$builddir"/configure \
-		--build="$CBUILD" \
-		--target=$_target \
-		--with-lib-path=/usr/lib \
-		--prefix=/usr \
-		--with-sysroot=/usr/$_target \
-		--enable-ld=default \
-		--enable-gold=yes \
-		--enable-plugins \
-		--enable-deterministic-archives \
-		--disable-multilib \
-		--disable-werror \
-		--disable-nls
-	make
-}
-
-package() {
-	make install DESTDIR="$pkgdir"
-
-	# remove man, info folders
-	rm -rf "$pkgdir"/usr/share
-
-	# remove files that conflict with non-cross binutils
-	rm -rf "$pkgdir"/usr/lib/bfd-plugins
-}
-
-
-
-sha512sums="
-8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
-ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-"
@@ -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;
@@ -1,41 +0,0 @@
-Fix for DARN opcode error during ppc64le compilation of rng-tools which
-occurs with binutils 2.38 but not with binutils 2.37..
-
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
-
-
-diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
--- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@
- 	     options do not count as a new machine, instead they add
- 	     to currently selected opcodes.  */
- 	  ppc_cpu_t machine_sticky = 0;
-	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+	  /* Unfortunately, some versions of gcc emit a .machine
-+	     directive very near the start of the compiler's assembly
-+	     output file.  This is bad because it overrides user -Wa
-+	     cpu selection.  Worse, there are versions of gcc that
-+	     emit the *wrong* cpu, not even respecting the -mcpu given
-+	     to gcc.  See gcc pr101393.  And to compound the problem,
-+	     as of 20220222 gcc doesn't pass the correct cpu option to
-+	     gas on the command line.  See gcc pr59828.  Hack around
-+	     this by keeping sticky options for an early .machine.  */
-+	  asection *sec;
-+	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+	    {
-+	      segment_info_type *info = seg_info (sec);
-+	      /* Are the frags for this section perturbed from their
-+	         initial state?  Even .align will count here.  */
-+	      if (info != NULL
-+	          && (info->frchainP->frch_root != info->frchainP->frch_last
-+	              || info->frchainP->frch_root->fr_type != rs_fill
-+	              || info->frchainP->frch_root->fr_fix != 0))
-+	        break;
-+	    }
-+	  new_cpu = ppc_parse_cpu (ppc_cpu,
-+	                           sec == NULL ? &sticky : &machine_sticky,
-+	                           cpu_string);
- 	  if (new_cpu != 0)
- 	    ppc_cpu = new_cpu;
- 	  else
@@ -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
@@ -0,0 +1,65 @@
+# Automatically generated aport, do not edit!
+# Generator: pmbootstrap aportgen binutils-x86_64
+# Based on: main/binutils
+
+
+pkgname="binutils-x86_64"
+pkgver=2.31.1
+pkgrel=0
+pkgdesc="Tools necessary to build programs for x86_64 targets"
+url="https://www.gnu.org/software/binutils/"
+depends=""
+makedepends_build=""
+makedepends_host=""
+makedepends="gettext libtool autoconf automake bison"
+arch="armhf aarch64 x86"
+license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+subpackages=""
+source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
+	binutils-ld-fix-static-linking.patch
+	gold-mips.patch
+	"
+builddir="$srcdir/binutils-$pkgver"
+
+if [ "$CHOST" != "$CTARGET" ]; then
+	pkgname="binutils-$CTARGET_ARCH"
+	subpackages=""
+	sonameprefix="binutils:"
+fi
+
+# secfixes:
+#   2.28-r1:
+#   - CVE-2017-7614
+
+build() {
+        _target="$(arch_to_hostspec x86_64)"
+        cd "$builddir"
+        "$builddir"/configure \
+            --build="$CBUILD" \
+            --target=$_target \
+            --with-lib-path=/usr/lib \
+            --prefix=/usr \
+            --with-sysroot=/usr/$_target \
+            --enable-ld=default \
+            --enable-gold=yes \
+            --enable-plugins \
+            --enable-deterministic-archives \
+            --disable-multilib \
+            --disable-werror \
+            --disable-nls
+        make
+}
+
+package() {
+        cd "$builddir"
+        make install DESTDIR="$pkgdir"
+
+        # remove man, info folders
+        rm -rf "$pkgdir"/usr/share
+}
+
+
+
+sha512sums="b42954e6f49a0adcd2676bdd77dfb59bfc25cec8184b007521d1e2b1d5d0593b58639e3d9448d5a40fe024c3cea386a37743627d6bb16d502f52a4a32b9573bd  binutils-2.31.1.tar.bz2
+ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch"
@@ -0,0 +1,93 @@
+From d66deb71f1537e2e30dccdfda22eed5d46ec47eb Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Wed, 14 Mar 2018 22:09:33 +1030
+Subject: [PATCH] PowerPC64 debian bug 886264, out-of-line save/restore
+ functions
+
+This calculation in relocate_section
+
+	      if (stub_entry->stub_type == ppc_stub_save_res)
+		relocation += (stub_sec->output_offset
+			       + stub_sec->output_section->vma
+			       + stub_sec->size - htab->sfpr->size
+			       - htab->sfpr->output_offset
+			       - htab->sfpr->output_section->vma);
+
+to adjust from the original out-of-line save/restore function address
+in sfpr to a copy at the end of stub_sec goes wrong when stub_sec is
+padded, because the copy is no longer at the end of stub_sec.  The
+solution is to pad before copying sfpr, so the copy is always at the
+end of stub_sec.
+
+	* elf64-ppc.c (sfpr_define): Adjust for stub_sec size having
+	sfpr size added before defining alias symbols.
+	(ppc64_elf_build_stubs): Add stub section padding before
+	copying sfpr contents and defining save/restore alias symbols.
+
+(cherry picked from commit 7dda8d3cf3b089bb7e03c4cdbec827fc6a188c88)
+---
+ bfd/ChangeLog   |  9 +++++++++
+ bfd/elf64-ppc.c | 33 ++++++++++++++++++---------------
+ 2 files changed, 27 insertions(+), 15 deletions(-)
+
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index 6fcdff0..039294f 100644
+--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
+@@ -6645,7 +6645,7 @@ sfpr_define (struct bfd_link_info *info,
+ 		{
+ 		  s->root.type = bfd_link_hash_defined;
+ 		  s->root.u.def.section = stub_sec;
+-		  s->root.u.def.value = (stub_sec->size
+		  s->root.u.def.value = (stub_sec->size - htab->sfpr->size
+ 					 + h->elf.root.u.def.value);
+ 		  s->ref_regular = 1;
+ 		  s->def_regular = 1;
+@@ -13232,20 +13232,7 @@ ppc64_elf_build_stubs (struct bfd_link_info *info,
+ 
+   for (group = htab->group; group != NULL; group = group->next)
+     if (group->needs_save_res)
+-      {
+-	stub_sec = group->stub_sec;
+-	memcpy (stub_sec->contents + stub_sec->size, htab->sfpr->contents,
+-		htab->sfpr->size);
+-	if (htab->params->emit_stub_syms)
+-	  {
+-	    unsigned int i;
+-
+-	    for (i = 0; i < ARRAY_SIZE (save_res_funcs); i++)
+-	      if (!sfpr_define (info, &save_res_funcs[i], stub_sec))
+-		return FALSE;
+-	  }
+-	stub_sec->size += htab->sfpr->size;
+-      }
+      group->stub_sec->size += htab->sfpr->size;
+ 
+   if (htab->relbrlt != NULL)
+     htab->relbrlt->reloc_count = 0;
+@@ -13259,6 +13246,22 @@ ppc64_elf_build_stubs (struct bfd_link_info *info,
+ 	}
+ 
+   for (group = htab->group; group != NULL; group = group->next)
+    if (group->needs_save_res)
+      {
+	stub_sec = group->stub_sec;
+	memcpy (stub_sec->contents + stub_sec->size - htab->sfpr->size,
+		htab->sfpr->contents, htab->sfpr->size);
+	if (htab->params->emit_stub_syms)
+	  {
+	    unsigned int i;
+
+	    for (i = 0; i < ARRAY_SIZE (save_res_funcs); i++)
+	      if (!sfpr_define (info, &save_res_funcs[i], stub_sec))
+		return FALSE;
+	  }
+      }
+
+  for (group = htab->group; group != NULL; group = group->next)
+     if ((stub_sec = group->stub_sec) != NULL)
+       {
+ 	stub_sec_count += 1;
+-- 
+2.9.3
+
@@ -1,36 +1,29 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen busybox-static-aarch64

-# Stub for apkbuild-lint
-if [ -z "$(type -t arch_to_hostspec)" ]; then
-	arch_to_hostspec() { :; }
-fi
-
 pkgname=busybox-static-aarch64
-pkgver=1.35.0
-pkgrel=5
+pkgver=1.28.4
+pkgrel=2

 _arch="aarch64"
-_mirror="http://dl-4.alpinelinux.org/alpine/"
+_mirror="http://dl-cdn.alpinelinux.org/alpine/"

 url="http://busybox.net"
 license="GPL2"
-arch="x86_64"
+arch="all"
 options="!check !strip"
 pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"

 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+    busybox-static-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
 "

 package() {
-	mkdir -p "$pkgdir/usr/$_target"
-	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk
-	rm .PKGINFO .SIGN.*
+    mkdir -p "$pkgdir/usr/$_target"
+    cd "$pkgdir/usr/$_target"
+    tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch.apk
+    rm .PKGINFO .SIGN.*
 }

-sha512sums="
-5be7db2e4793b74ffa487153b1ca52027b6d1a4ca316c152163d1b3030ba3270e645d02522f9c8187b14fc193b5471ccedc7439b38463fabeac08b404f1b6fbb  busybox-static-1.35.0-r5-aarch64-edge.apk
-"
+sha512sums="363f13a3041a65ee96c984f75e46e3b0af985de3ca312b109ee2fbcfea957a69fe75655d3138ca922f8e196fa97c56c7c8a387440962150874a2cc619f07e8b6  busybox-static-1.28.4-r2-aarch64.apk"
@@ -1,36 +1,29 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen busybox-static-armhf

-# Stub for apkbuild-lint
-if [ -z "$(type -t arch_to_hostspec)" ]; then
-	arch_to_hostspec() { :; }
-fi
-
 pkgname=busybox-static-armhf
-pkgver=1.35.0
-pkgrel=5
+pkgver=1.28.4
+pkgrel=2

 _arch="armhf"
-_mirror="http://dl-4.alpinelinux.org/alpine/"
+_mirror="http://dl-cdn.alpinelinux.org/alpine/"

 url="http://busybox.net"
 license="GPL2"
-arch="x86_64"
+arch="all"
 options="!check !strip"
 pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"

 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+    busybox-static-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
 "

 package() {
-	mkdir -p "$pkgdir/usr/$_target"
-	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk
-	rm .PKGINFO .SIGN.*
+    mkdir -p "$pkgdir/usr/$_target"
+    cd "$pkgdir/usr/$_target"
+    tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch.apk
+    rm .PKGINFO .SIGN.*
 }

-sha512sums="
-dcfd4a8af7c0f2ae33cacdc933f38906c9173b9a6476b04624d0dce7bf03277328bc3422182cbf0cf784495ff663326779a39d4a259064d5a740f8bea4f5a3be  busybox-static-1.35.0-r5-armhf-edge.apk
-"
+sha512sums="e10a339969fee47103d567d4a24237371a13a8519c40c550e64c3129018ff0fbd3bea785391c921087631bf0857e4a2ac46862fd699052f6a0752fb6e5771024  busybox-static-1.28.4-r2-armhf.apk"
@@ -1,36 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen busybox-static-armv7
-
-# Stub for apkbuild-lint
-if [ -z "$(type -t arch_to_hostspec)" ]; then
-	arch_to_hostspec() { :; }
-fi
-
-pkgname=busybox-static-armv7
-pkgver=1.35.0
-pkgrel=5
-
-_arch="armv7"
-_mirror="http://dl-4.alpinelinux.org/alpine/"
-
-url="http://busybox.net"
-license="GPL2"
-arch="x86_64"
-options="!check !strip"
-pkgdesc="Statically linked Busybox for $_arch"
-_target="$(arch_to_hostspec $_arch)"
-
-source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
-"
-
-package() {
-	mkdir -p "$pkgdir/usr/$_target"
-	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk
-	rm .PKGINFO .SIGN.*
-}
-
-sha512sums="
-2b2ff67a0cf0ab1b1fc67458f328c7b2e91a24a6c57d4d7707c5c88a68b715af11b2ee29381aaa15946d6bccaf3d6f899f8a760ff87df2156a59bd12e67af71d  busybox-static-1.35.0-r5-armv7-edge.apk
-"
@@ -4,8 +4,8 @@
 # ccache, which can then cache the results.

 pkgname=ccache-cross-symlinks
-pkgver=3
-pkgrel=0
+pkgver=1
+pkgrel=4
 pkgdesc="Enable ccache for cross-compilers with symlinks"
 url="https://ccache.samba.org/"
 arch="noarch"
@@ -14,27 +14,14 @@ depends="ccache"
 options="!check"

 package() {
-	# Keep in sync with pmb.config.build_device_architectures
-	local _archs="armhf armv7 aarch64 x86_64 x86"
-
-	local _bins="c++ cc cpp g++ gcc clang clang++"
+	local _archs="armhf aarch64"
+	local _bins="c++ cc cpp g++ gcc"
 	mkdir -p "$pkgdir/usr/lib/ccache/bin"
 	cd "$pkgdir/usr/lib/ccache/bin"
 	for _arch in $_archs; do
-		if [ "$_arch" = "$CARCH" ]; then
-			continue
-		fi
 		_hostspec="$(arch_to_hostspec $_arch)"
 		for _bin in $_bins; do
-			# Relative symlink, so it works with crossdirect (pointing to
-			# /native/usr/bin/ccache)
-			ln -v -s ../../../bin/ccache ${_hostspec}-${_bin}
+			ln -v -s /usr/bin/ccache ${_hostspec}-${_bin}
 		done
-
-		ln -v -s ../../../bin/ccache gcc4-${_hostspec}-gcc
-		ln -v -s ../../../bin/ccache gcc6-${_hostspec}-gcc
 	done
-
-	ln -v -s ../../../bin/ccache gcc4-gcc
-	ln -v -s ../../../bin/ccache gcc6-gcc
 }
@@ -1,82 +0,0 @@
-# Wrapper for the "crossdirect" compilation method.
-# pmbootstrap mounts the native chroot in the foreign arch (e.g. armhf) chroot
-# as /native. This package gets installed into the native chroot, and creates
-# wrappers like:
-#
-# /native/usr/lib/crossdirect/armhf/gcc
-# -> /native/usr/bin/armv6-alpine-linux-muslgnueabihf-gcc
-# /native/usr/lib/crossdirect/armhf/rustc
-# -> /native/usr/bin/rustc --target=armv6-alpine-linux-musleabihf ...
-#
-# When building packages in the armhf chroot, PATH will get prepended with
-# "/native/usr/lib/crossdirect/armhf". The end game is of course invoking the
-# cross compiler from the native chroot, running at native speed, whenever
-# calling the compiler from the foreign arch chroot. See crossdirect.c for
-# implementation details of the C version (llvm, fakeroot, rpath). The rust
-# version is implemented as simple shell wrappers.
-
-pkgname=crossdirect
-pkgver=4
-pkgrel=3
-pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
-url="https://postmarketOS.org"
-arch="all"
-license="MIT"
-options="!check"
-source="crossdirect.c rustc.sh rust-qemu-linker.sh"
-
-build() {
-	cd "$srcdir"
-	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64"
-	for _arch in $_archs; do
-		[ "$_arch" == "$CARCH" ] && continue
-		_hostspec="$(arch_to_hostspec $_arch)"
-
-		# Build with -Werror, because we maintain this short program. (If
-		# upstream is elsewhere, having -Werror is usually not desired.)
-		$CC -o "crossdirect-$_arch" \
-			-static \
-			-Werror \
-			-DHOSTSPEC="\"$_hostspec\"" \
-			crossdirect.c
-
-		# rustc
-		sed "s/@ARCH@/$_arch/g" rustc.sh >rustc-"$_arch"
-	done
-}
-
-package() {
-	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64"
-	_bins="c++ cc cpp g++ gcc clang clang++"
-
-	# Rust: qemu-linker
-	install -Dm755 "$srcdir/rust-qemu-linker.sh" \
-		"$pkgdir/usr/lib/crossdirect/rust-qemu-linker"
-
-	# Iterate over architectures
-	for _arch in $_archs; do
-		[ "$_arch" == "$CARCH" ] && continue
-
-		# GCC: put arch-specific crossdirect wrapper in arch-specific
-		# bin folder
-		_bindir="$pkgdir/usr/lib/crossdirect/$_arch"
-		_hostspec="$(arch_to_hostspec $_arch)"
-		mkdir -p "$_bindir"
-		cd "$_bindir"
-		cp "$srcdir/crossdirect-$_arch" "./"
-
-		# GCC: create compiler symlinks
-		for _bin in $_bins; do
-			ln -s "crossdirect-$_arch" "$_bin"
-			ln -s "crossdirect-$_arch" "$_hostspec-$_bin"
-		done
-
-		# Rust: arch-specific rustc wrapper
-		install -Dm755 "$srcdir/rustc-$_arch" "$_bindir/rustc"
-	done
-}
-sha512sums="500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
-6be16ba88720e628a3ecc8fa53f8e7a21d2af268b0509745d989139874d6b94b640bfcff09575eaa19073810be6ef91169c1f83e94f5cf8e6819f2670d9408de  rustc.sh
-ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh"
@@ -1,136 +0,0 @@
-/* Copyright 2020 Zhuowei Zhang, Oliver Smith
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * This program gets built to a set of wrapper executables, which launch native
- * cross compilers inside foreign arch chroots. Speeds up cross compilation a
- * lot, compared to using just qemu user mode emulation or using the previous
- * distcc-based methods.
- *
- * How this program gets called:
- * - pmbootstrap creates one native arch chroot and one foreign arch chroot.
- * - The native chroot gets mounted as /native in the foreign chroot.
- * - When calling "abuild", pmbootstrap sets PATH to:
- *   /native/usr/lib/crossdirect/<ARCH>:$PATH
- * - That crossdirect directory contains a crossdirect-<ARCH> binary built with
- *   the matching HOSTSPEC (e.g. crossdirect-aarch64 binary with HOSTSPEC
- *   aarch64-alpine-linux-musl). This binary is symlinked to:
- *	- <HOSTSPEC>-c++
- *	- <HOSTSPEC>-cc
- *	- <HOSTSPEC>-clang
- *	- <HOSTSPEC>-clang++
- *	- <HOSTSPEC>-cpp
- *	- <HOSTSPEC>-g++
- *	- <HOSTSPEC>-gcc
- *	- c++
- *	- cc
- *	- clang
- *	- clang++
- *	- cpp
- *	- g++
- *	- gcc
- */
-
-#include <errno.h>
-#include <libgen.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define NATIVE_BIN_DIR "/native/usr/lib/ccache/bin"
-
-void exit_userfriendly()
-{
-	fprintf(stderr, "Please report this at: https://gitlab.com/postmarketOS/pmaports/issues\n");
-	fprintf(stderr, "As a workaround, you can compile without crossdirect.\n");
-	fprintf(stderr, "See 'pmbootstrap -h' for related options.\n");
-	exit(1);
-}
-
-bool argv_has_arg(int argc, char **argv, const char *arg)
-{
-	size_t arg_len = strlen(arg);
-
-	for (int i = 1; i < argc; i++) {
-		if (strlen(argv[i]) < arg_len)
-			continue;
-
-		if (!memcmp(argv[i], arg, arg_len))
-			return true;
-	}
-	return false;
-}
-
-int main(int argc, char **argv)
-{
-	// we have a max of four extra args ("-target", "HOSTSPEC", "--sysroot=/", "-Wl,-rpath-link=/lib:/usr/lib"), plus one ending null
-	char *newargv[argc + 5];
-	char *executableName = basename(argv[0]);
-	char newExecutable[PATH_MAX];
-	bool isClang = (strcmp(executableName, "clang") == 0 || strcmp(executableName, "clang++") == 0);
-	bool startsWithHostSpec = (strncmp(HOSTSPEC, executableName, sizeof(HOSTSPEC) - 1) == 0);
-
-	// linker is involved: just use qemu binary (to avoid broken cross-ld, pmaports#227)
-	if (!argv_has_arg(argc, argv, "-c")) {
-		snprintf(newExecutable, sizeof(newExecutable), "/usr/bin/%s", executableName);
-		if (execv(newExecutable, argv) == -1) {
-			fprintf(stderr, "ERROR: crossdirect: failed to execute %s: %s\n", newExecutable, strerror(errno));
-			fprintf(stderr, "NOTE: this is a foreign arch binary that would run with qemu (linker is involved).\n");
-			exit_userfriendly();
-		}
-	}
-
-	// Translate "cc" to "gcc": /usr/bin/cc is a symlink to /usr/bin/gcc,
-	// but there is no <HOSTSPEC>-cc symlink (pmaports#732)
-	if (strcmp(executableName, "cc") == 0)
-		executableName = "gcc";
-
-	// prepend the HOSTSPEC to GCC binaries
-	if (isClang || startsWithHostSpec) {
-		snprintf(newExecutable, sizeof(newExecutable), NATIVE_BIN_DIR "/%s", executableName);
-	} else {
-		snprintf(newExecutable, sizeof(newExecutable), NATIVE_BIN_DIR "/" HOSTSPEC "-%s", executableName);
-	}
-
-	// prepare new arguments for GCC / clang
-	char **newArgsPtr = newargv;
-	*newArgsPtr++ = newExecutable;
-	if (isClang) {
-		// clang does not use a HOSTSPEC prefix for the cross compiler
-		// binary, but instead have a -target argument
-		*newArgsPtr++ = "-target";
-		*newArgsPtr++ = HOSTSPEC;
-	}
-	*newArgsPtr++ = "--sysroot=/";
-
-	// add all arguments passed to this executable to GCC / clang and set
-	// the last arg in newargv to NULL to mark its end
-	memcpy(newArgsPtr, argv + 1, sizeof(char *) * (argc - 1));
-	newArgsPtr += (argc - 1);
-	*newArgsPtr = NULL;
-
-	// new arguments prepared; now setup environmental vars
-	char *env[] = { "LD_PRELOAD=",
-		"LD_LIBRARY_PATH=/native/lib:/native/usr/lib",
-		"CCACHE_PATH=/native/usr/bin",
-		NULL };
-	char *ldPreload = getenv("LD_PRELOAD");
-	if (ldPreload) {
-		if (strcmp(ldPreload, "/usr/lib/libfakeroot.so") == 0) {
-			env[0] = "LD_PRELOAD=/native/usr/lib/libfakeroot.so";
-		} else {
-			fprintf(stderr, "ERROR: crossdirect: can't handle LD_PRELOAD: %s\n", ldPreload);
-			exit_userfriendly();
-		}
-	}
-
-	// finally exec GCC / clang
-	if (execve(newExecutable, newargv, env) == -1) {
-		fprintf(stderr, "ERROR: crossdirect: failed to execute %s: %s\n", newExecutable, strerror(errno));
-		fprintf(stderr, "Maybe the target arch is missing in the ccache-cross-symlinks package?\n");
-		exit_userfriendly();
-	}
-	return 1;
-}
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-# This wrapper gets called from the native rustc, and runs the qemu gcc for
-# linking, with LD_LIBRARY_PATH reset so it does not point to /native anymore.
-# It isn't possible to use the native cross compiler's linker with crossdirect
-# currently (pmaports#233).
-
-LD_LIBRARY_PATH=/lib:/usr/lib \
-	gcc "$@"
@@ -1,48 +0,0 @@
-#!/bin/sh -e
-
-rust_triplet() {
-	# Find the triplets in Alpine's rust APKBUILD or with:
-	# pmbootstrap chroot -barmhf --add=rust -- ls /usr/lib/rustlib
-	case "$1" in
-		x86_64)
-			echo "x86_64-alpine-linux-musl"
-			;;
-		armhf)
-			echo "armv6-alpine-linux-musleabihf"
-			;;
-		armv7)
-			echo "armv7-alpine-linux-musleabihf"
-			;;
-		aarch64)
-			echo "aarch64-alpine-linux-musl"
-			;;
-		*)
-			echo "ERROR: don't know the rust triple for $1!" >&2
-			exit 1
-			;;
-	esac
-}
-
-arch="@ARCH@" # filled in by APKBUILD
-
-if ! LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
-	/native/usr/bin/rustc \
-		-Clinker=/native/usr/lib/crossdirect/rust-qemu-linker \
-		--target=$(rust_triplet "$arch") \
-		--sysroot=/usr \
-		"$@"; then
-	echo "---" >&2
-	echo "WARNING: crossdirect: cross compiling with rustc failed, trying"\
-		"again with rustc + qemu" >&2
-	echo "---" >&2
-	# Usually the crossdirect approach works; however, when passing
-	# --extern to rustc with a dynamic library (.so), it fails with an
-	# error like 'can't find crate for `serde_derive`' (although the crate
-	# does exist). I think it fails to parse the metadata of the so file
-	# for some reason. We probably need to adjust rustc's
-	# librustc_metadata/locator.rs or something (and upstream that
-	# change!), but I've spent enough time on this already. Let's simply
-	# fall back to compiling in qemu in the very few cases where this is
-	# necessary.
-	/usr/bin/rustc "$@"
-fi
@@ -1,42 +0,0 @@
-From feb04e50d907683385cc4dc0163cf1d82258073a Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH] posix_memalign
-
---
- gcc/config/i386/pmm_malloc.h | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 1b0bfe37852..d7b2b19bb3c 100644
--- a/gcc/config/i386/pmm_malloc.h
-+++ b/gcc/config/i386/pmm_malloc.h
-@@ -27,12 +27,13 @@
- #include <stdlib.h>
- 
- /* We can't depend on <stdlib.h> since the prototype of posix_memalign
-   may not be visible.  */
-+   may not be visible and we can't pollute the namespace either.  */
- #ifndef __cplusplus
-extern int posix_memalign (void **, size_t, size_t);
-+extern int _mm_posix_memalign (void **, size_t, size_t)
- #else
-extern "C" int posix_memalign (void **, size_t, size_t) throw ();
-+extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw ()
- #endif
-+__asm__("posix_memalign");
- 
- static __inline void *
- _mm_malloc (size_t __size, size_t __alignment)
-@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment)
-     return malloc (__size);
-   if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4))
-     __alignment = sizeof (void *);
-  if (posix_memalign (&__ptr, __alignment, __size) == 0)
-+  if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0)
-     return __ptr;
-   else
-     return NULL;
-- 
-2.35.1
-
@@ -1,203 +0,0 @@
-From d64825212f807435a4b2f8e068c0f65195c8e2e6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 Mar 2013 08:59:00 +0400
-Subject: [PATCH] gcc: poison-system-directories
-
-Add /sw/include and /opt/include based on the original
-zecke-no-host-includes.patch patch.  The original patch checked for
-/usr/include, /sw/include and /opt/include and then triggered a failure and
-aborted.
-
-Instead, we add the two missing items to the current scan.  If the user
-wants this to be a failure, they can add "-Werror=poison-system-directories".
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
---
- gcc/common.opt      |  4 ++++
- gcc/config.in       |  6 ++++++
- gcc/configure       | 16 ++++++++++++++++
- gcc/configure.ac    | 10 ++++++++++
- gcc/doc/invoke.texi |  9 +++++++++
- gcc/gcc.c           |  2 ++
- gcc/incpath.c       | 21 +++++++++++++++++++++
- 7 files changed, 68 insertions(+)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index a75b44ee47e..d15105a73f3 100644
--- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -683,6 +683,10 @@ Wreturn-local-addr
- Common Var(warn_return_local_addr) Init(1) Warning
- Warn about returning a pointer/reference to a local or temporary variable.
- 
-+Wpoison-system-directories
-+Common Var(flag_poison_system_directories) Init(1) Warning
-+Warn for -I and -L options using system directories if cross compiling
-+
- Wshadow
- 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 2de5a463315..059c818c895 100644
--- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -218,6 +218,12 @@
- #endif
- 
- 
-+/* Define to warn for use of native system header directories */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
-    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 708328e1670..4b977e313b5 100755
--- a/gcc/configure
-+++ b/gcc/configure
-@@ -1020,6 +1020,7 @@ 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
-@@ -1782,6 +1783,8 @@ Optional Features:
-   --enable-version-specific-runtime-libs
-                           specify that runtime libraries should be installed
-                           in a compiler-specific directory
-+  --enable-poison-system-directories
-+                          warn for use of native system header directories
-   --enable-plugin         enable plugin support
-   --enable-host-shared    build host code as shared libraries
-   --disable-libquadmath-support
-@@ -31790,6 +31793,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
-+
- # Substitute configuration variables
- 
- 
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index df1c9cc3200..5461bab88a9 100644
--- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -7311,6 +7311,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
-                 [specify that runtime libraries should be
-                  installed in a compiler-specific directory])])
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+             AS_HELP_STRING([--enable-poison-system-directories],
-+                            [warn for use of native system header directories]),,
-+             [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+           [1],
-+           [Define to warn for use of native system header directories])
-+fi
-+
- # Substitute configuration variables
- AC_SUBST(subdirs)
- AC_SUBST(srcdir)
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index cf536a15116..7d3f1ccddf3 100644
--- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}.
- -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded @gol
- -Wparentheses  -Wno-pedantic-ms-format @gol
- -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast @gol
-+-Wno-poison-system-directories @gol
- -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
- -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
- -Wno-scalar-storage-order  -Wsequence-point @gol
-@@ -7728,6 +7729,14 @@ made up of data only and thus requires no special treatment.  But, for
- most targets, it is made up of code and thus requires the stack to be
- made executable in order for the program to work properly.
- 
-+@item -Wno-poison-system-directories
-+@opindex Wno-poison-system-directories
-+Do not warn for @option{-I} or @option{-L} options using system
-+directories such as @file{/usr/include} when cross compiling.  This
-+option is intended for use in chroot environments when such
-+directories contain the correct headers and libraries for the target
-+system rather than the host.
-+
- @item -Wfloat-equal
- @opindex Wfloat-equal
- @opindex Wno-float-equal
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 8ba410c9e17..a83ba34ac4b 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -1152,6 +1152,8 @@ proper position among the other output files.  */
-    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
-+    %{Wno-poison-system-directories:--no-poison-system-directories} \
-+    %{Werror=poison-system-directories:--error-poison-system-directories} \
-     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
-     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
-     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
-diff --git a/gcc/incpath.c b/gcc/incpath.c
-index 446d280321d..fbfc0ce03b8 100644
--- a/gcc/incpath.c
-+++ b/gcc/incpath.c
-@@ -26,6 +26,7 @@
- #include "intl.h"
- #include "incpath.h"
- #include "cppdefault.h"
-+#include "diagnostic-core.h"
- 
- /* Microsoft Windows does not natively support inodes.
-    VMS has non-numeric inodes.  */
-@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
- 	}
-       fprintf (stderr, _("End of search list.\n"));
-     }
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (flag_poison_system_directories)
-+    {
-+       struct cpp_dir *p;
-+
-+       for (p = heads[INC_QUOTE]; p; p = p->next)
-+         {
-+          if ((!strncmp (p->name, "/usr/include", 12))
-+              || (!strncmp (p->name, "/usr/local/include", 18))
-+              || (!strncmp (p->name, "/usr/X11R6/include", 18))
-+              || (!strncmp (p->name, "/sw/include", 11))
-+              || (!strncmp (p->name, "/opt/include", 12)))
-+            warning (OPT_Wpoison_system_directories,
-+                     "include location \"%s\" is unsafe for "
-+                     "cross-compilation",
-+                     p->name);
-+         }
-+    }
-+#endif
- }
- 
- /* Use given -I paths for #include "..." but not #include <...>, and
-- 
-2.35.1
-
@@ -1,44 +0,0 @@
-From 9675297b3a46b65a54e9df97f26ea445d53c67c6 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH] 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.c           | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 7d3f1ccddf3..485d2d6b742 100644
--- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -15921,6 +15921,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
- linker.  When using the GNU linker, you can also get the same effect with
- @option{-Wl,-Map=output.map}.
- 
-+NOTE: In Alpine Linux, for LDFLAGS, the option
-+@option{-Wl,-z,now} is used.  To disable, use @option{-Wl,-z,nonow}.
-+
- @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 a83ba34ac4b..faf9ce76b3d 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -1150,6 +1150,7 @@ proper position among the other output files.  */
-    "%{flto|flto=*:%<fcompare-debug*} \
-     %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
-    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-+   "-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.35.1
-
@@ -1,46 +0,0 @@
-From 4eb1b3849325b77c4cb66b675119299de35125bb Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:46:22 +0000
-Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
- ObjC++, if the optimization level is > 0
-
---
- 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.c b/gcc/c-family/c-cppbuiltin.c
-index 11e015bdb87..de8b7bf246f 100644
--- a/gcc/c-family/c-cppbuiltin.c
-+++ b/gcc/c-family/c-cppbuiltin.c
-@@ -1427,6 +1427,10 @@ c_cpp_builtins (cpp_reader *pfile)
-   builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
-   builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
- 
-+  /* Fortify Source enabled by default for optimization levels > 0 */
-+  if (optimize)
-+    builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
-+
-   /* Misc.  */
-   if (flag_gnu89_inline)
-     cpp_define (pfile, "__GNUC_GNU_INLINE__");
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 485d2d6b742..164929f7583 100644
--- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -10225,6 +10225,12 @@ also turns on the following optimization flags:
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
- 
-+NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is
-+set by default, and is activated when @option{-O} is set to 2 or higher.
-+This enables additional compile-time and run-time checks for several libc
-+functions.  To disable, specify either @option{-U_FORTIFY_SOURCE} or
-+@option{-D_FORTIFY_SOURCE=0}.
-+
- @item -O3
- @opindex O3
- Optimize yet more.  @option{-O3} turns on all optimizations specified
-- 
-2.35.1
-
@@ -1,272 +0,0 @@
-From 8de5d46c530ceca9f4add46d5cae3cd52c38eba3 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,
- but always link the sanitizer libraries with --no-as-needed.
-
---
- gcc/config/aarch64/aarch64-linux.h |  1 +
- gcc/config/alpha/linux-elf.h       |  2 +-
- gcc/config/arm/linux-elf.h         |  1 +
- gcc/config/gnu-user.h              |  6 +++---
- gcc/config/i386/gnu-user.h         |  2 +-
- gcc/config/i386/gnu-user64.h       |  1 +
- gcc/config/ia64/linux.h            |  2 +-
- gcc/config/mips/gnu-user.h         |  1 +
- gcc/config/riscv/linux.h           |  1 +
- gcc/config/rs6000/linux64.h        |  4 ++--
- gcc/config/rs6000/sysv4.h          |  2 +-
- gcc/config/s390/linux.h            |  2 +-
- gcc/config/sparc/linux.h           |  2 +-
- 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 7f2529a2a1d..b097e1688aa 100644
--- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -35,6 +35,7 @@
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*}		\
-+   --as-needed					\
-    %{static:-Bstatic}				\
-    %{shared:-shared}				\
-    %{symbolic:-Bsymbolic}			\
-diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index c1dae8ca2cf..a87dc740171 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
- 
- #define ELF_DYNAMIC_LINKER	GNU_USER_DYNAMIC_LINKER
- 
-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax}		\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
-diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index 0c1c4e70b6b..8b581afacdd 100644
--- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -70,6 +70,7 @@
-      %{rdynamic:-export-dynamic} \
-      %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
-    -X \
-+   --as-needed \
-    %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
-    SUBTARGET_EXTRA_LINK_SPEC
- 
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 5ebbf42a13d..902378e1bad 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
- #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
- #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
-   "%{static-libtsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
-  LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
-   "%{static-liblsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
-  LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #endif
- 
- #undef TARGET_F951_OPTIONS
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index a23e7ab3eb7..12ac8cb93a9 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
-   { "link_emulation", GNU_USER_LINK_EMULATION },\
-   { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
- 
-#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{!static-pie: \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index f3e25b1412a..712b0f1c30e 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
-                   "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
-                    %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
-                    %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
-+  --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
-index ac40c3dfd3f..6e19e25c35a 100644
--- a/gcc/config/ia64/linux.h
-+++ b/gcc/config/ia64/linux.h
-@@ -58,7 +58,7 @@ do {						\
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
-#define LINK_SPEC "\
-+#define LINK_SPEC " --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index a390bcece83..be0ee289367 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
- #undef GNU_USER_TARGET_LINK_SPEC
- #define GNU_USER_TARGET_LINK_SPEC "\
-   %{G*} %{EB} %{EL} %{mips*} %{shared} \
-+ -as-needed \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index fce5b896e6e..ee29979dd34 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
-   "%{mabi=ilp32:_ilp32}"
- 
- #define LINK_SPEC "\
-+-as-needed \
- -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
- %{mno-relax:--no-relax} \
- %{mbig-endian:-EB} \
-diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index e3f2cd254f6..43499ed29cf 100644
--- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -374,13 +374,13 @@ extern int dot_symbols;
- 					   " -m elf64ppc")
- #endif
- 
-#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
-   %(link_os_extra_spec32)"
- 
-#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index 510abe169c5..3c1f3a8ec5d 100644
--- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
- #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
- #endif
- 
-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
- 
-diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index daa48fdfc2b..2fcfc5d770f 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
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
-  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
-diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 2550d7ee8f0..7596d0b2757 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);
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
-#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index faf9ce76b3d..1ad5da6d769 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -737,8 +737,11 @@ proper position among the other output files.  */
- #ifdef LIBASAN_EARLY_SPEC
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
-#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
-		     "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lasan " \
-+		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -773,8 +776,11 @@ proper position among the other output files.  */
- #ifdef LIBTSAN_EARLY_SPEC
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
-#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
-		     "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -ltsan " \
-+		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -791,8 +797,11 @@ proper position among the other output files.  */
- #ifdef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
-#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
-		     "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -llsan " \
-+		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -807,8 +816,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
-#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
-		     "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lubsan " \
-+		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
-- 
-2.35.1
-
@@ -1,34 +0,0 @@
-From 85e12e3d32a44c3fd10b5327edd542972a179eec 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.
-
---
- gcc/c-family/c.opt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index 2005b783c68..c5c6af427cc 100644
--- a/gcc/c-family/c.opt
-+++ b/gcc/c-family/c.opt
-@@ -637,7 +637,7 @@ Warn about function calls with format strings that write past the end
- of the destination region.  Same as -Wformat-overflow=1.
- 
- Wformat-security
-C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
- Warn about possible security problems with format functions.
- 
- Wformat-signedness
-@@ -658,7 +658,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
- Warn about zero-length formats.
- 
- Wformat=
-C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
-+C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
- Warn about printf/scanf/strftime/strfmon format string anomalies.
- 
- Wformat-overflow=
-- 
-2.35.1
-
@@ -1,25 +0,0 @@
-From f1e92f5f3576779776c9f3d6aeef76e1569e719a 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.
-
---
- gcc/common.opt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index d15105a73f3..29f9504cb68 100644
--- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -775,7 +775,7 @@ Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers.
- 
- Wtrampolines
-Common Var(warn_trampolines) Warning
-+Common Var(warn_trampolines) Init(1) Warning
- Warn whenever a trampoline is generated.
- 
- Wtype-limits
-- 
-2.35.1
-
@@ -1,53 +0,0 @@
-From 3503fd734a33b67ec6a9fdc2c52bb8310864b119 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.c      | 8 +++++++-
- gcc/params.opt | 2 +-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 1ad5da6d769..99314032ec2 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -989,6 +989,12 @@ proper position among the other output files.  */
- #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
- #endif
- 
-+#ifdef ENABLE_DEFAULT_SSP
-+#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
-+#else
-+#define NO_SSP_SPEC ""
-+#endif
-+
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1288,7 +1294,7 @@ static const char *cc1_options =
-  %{-version:--version}\
-  %{-help=*:--help=%*}\
-  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%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 8ba281b4cfa..bab39cdf8a2 100644
--- a/gcc/params.opt
-+++ b/gcc/params.opt
-@@ -946,7 +946,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=
-Common Joined UInteger Var(param_ssp_buffer_size) Init(8) IntegerRange(1, 65536) Param Optimization
-+Common Joined UInteger Var(param_ssp_buffer_size) Init(4) IntegerRange(1, 65536) Param Optimization
- The lower bound for a buffer to be considered for stack smashing protection.
- 
- -param=stack-clash-protection-guard-size=
-- 
-2.35.1
-
@@ -1,54 +0,0 @@
-From c4dd51fe15a938fdd76d781a4eede2a9205eacbc 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
- bootstrapping.
-
-Solves error messages like the following:
-
-msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6)
-
-The libgcc_s.so used during build doesn't satisfy the needs of the
-libstdc++.so that msgfmt is linked against. On the other hand, msgfmt
-is used as a stand-alone application here, and what library it uses
-behind the scenes is of no concern to the gcc build process.
-Therefore, simply invoking it "as usual", i.e. without any special
-library path, will make it work as expected here.
-
-2011-09-19 Martin von Gagern
-
-References:
-https://bugs.gentoo.org/372377
-https://bugs.gentoo.org/295480
---
- libstdc++-v3/po/Makefile.am | 1 +
- libstdc++-v3/po/Makefile.in | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
-index ab716ff04ea..e595268d9fc 100644
--- a/libstdc++-v3/po/Makefile.am
-+++ b/libstdc++-v3/po/Makefile.am
-@@ -38,6 +38,7 @@ MSGFMT = msgfmt
- EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
- 
- .po.mo:
-+	env --unset=LD_LIBRARY_PATH \
- 	$(MSGFMT) -o $@ $<
- 
- all-local: all-local-$(USE_NLS)
-diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
-index 8edd2e05639..63f61fcf96f 100644
--- a/libstdc++-v3/po/Makefile.in
-+++ b/libstdc++-v3/po/Makefile.in
-@@ -553,6 +553,7 @@ uninstall-am:
- 
- 
- .po.mo:
-+	env --unset=LD_LIBRARY_PATH \
- 	$(MSGFMT) -o $@ $<
- 
- all-local: all-local-$(USE_NLS)
-- 
-2.35.1
-
@@ -1,28 +0,0 @@
-From 0a1fd78184f00fb77dac00dabe98eb025620efc2 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.
-
---
- include/libiberty.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/libiberty.h b/include/libiberty.h
-index f4c0fe11d6f..cf4b1043e4d 100644
--- a/include/libiberty.h
-+++ b/include/libiberty.h
-@@ -652,8 +652,11 @@ extern void *bsearch_r (const void *, const void *,
- /* Like sprintf but provides a pointer to malloc'd storage, which must
-    be freed by the caller.  */
- 
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL.  */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
- 
- /* Like asprintf but allocates memory without fail. This works like
-    xmalloc.  */
-- 
-2.35.1
-
@@ -1,24 +0,0 @@
-From f81d67f6fe1f1066642606209c882b333d937cb7 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
-
---
- libiberty/Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index 4f1213b983b..d0224649d30 100644
--- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -264,6 +264,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
- 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
- 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- 	  $(RANLIB) $(TARGETLIB); \
-+	  cp $(TARGETLIB) ../ ; \
- 	  cd ..; \
- 	else true; fi
- 
-- 
-2.35.1
-