Compare revisions

Chalkin Deng · Chalkin Deng · Chalkin Deng · Chalkin Deng · Chalkin Deng · Chalkin Deng
--- a/.ci/lib/build_changed_aports.py
+++ b/.ci/lib/build_changed_aports.py
@@ -2,6 +2,7 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
+import pathlib

 # Same dir
 import common
@@ -11,6 +12,7 @@ import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports
+from pmb.core.context import get_context


 def build_strict(packages, arch):
@@ -59,15 +61,16 @@ if __name__ == "__main__":
        verify_checksums(packages, arch)
        sys.exit(0)

-    # Prepare "args" to use pmbootstrap code
-    sys.argv = ["pmbootstrap", "chroot"]
+    # Load context
+    sys.argv = ["pmbootstrap.py", "chroot"]
    args = pmb.parse.arguments()
+    context = get_context()

    # 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")
+        apkbuild_path = pmb.helpers.pmaports.find(package)
+        apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))

        if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
            print(f"{package}: not enabled for {arch}, skipping")

--- a/.ci/lib/check_changed_aports_versions.py
+++ b/.ci/lib/check_changed_aports_versions.py
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 import glob
+import pathlib
 import tempfile
 import sys
 import subprocess
@@ -15,8 +16,9 @@ import add_pmbootstrap_to_import_path  # noqa
 import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging
+from pmb.core.context import get_context

-def get_package_contents(args, package, revision, check=True):
+def get_package_contents(package, revision, check=True):
    # Redirect stderr to /dev/null, so git doesn't complain about files not
    # existing in upstream branch for new packages
    stderr = None
@@ -37,15 +39,16 @@ def get_package_contents(args, package, revision, check=True):
    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)
+        parsed = pmb.parse.apkbuild(pathlib.Path(tempdir, "APKBUILD"),
+                                    False, False)

    return parsed


-def get_package_version(args, package, revision, check=True):
+def get_package_version(package, revision, check=True):
    """ returns version in the format "{pkgver}-r{pkgrel}", or None if no 
        matching package is found """
-    parsed = get_package_contents(args, package, revision, check)
+    parsed = get_package_contents(package, revision, check)
    if parsed is None:
        return None
    return parsed["pkgver"] + "-r" + parsed["pkgrel"]
@@ -91,7 +94,7 @@ def exit_with_error_message():
    exit(1)


-def check_versions(args, packages):
+def check_versions(packages):
    error = False

    # Get relevant commits: compare HEAD against upstream branch or HEAD~1
@@ -110,8 +113,8 @@ def check_versions(args, packages):

    for package in packages:
        # Get versions, skip new packages
-        head = get_package_version(args, package, "HEAD")
-        upstream = get_package_version(args, package, commit, False)
+        head = get_package_version(package, "HEAD")
+        upstream = get_package_version(package, commit, False)
        if not upstream:
            if head.rpartition('r')[2] != "0":
                print(f"- {package}: {head} (HEAD) (new package) [ERROR]")
@@ -129,8 +132,8 @@ def check_versions(args, packages):

        # Additional checks for device packages
        if package.startswith('device-'):
-            head_parsed = get_package_contents(args, package, "HEAD", False)
-            upstream_parsed = get_package_contents(args, package, commit, False)
+            head_parsed = get_package_contents(package, "HEAD", False)
+            upstream_parsed = get_package_contents(package, commit, False)

            # checksums did not change
            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
@@ -191,8 +194,12 @@ if __name__ == "__main__":
    # Initialize args (so we can use pmbootstrap's APKBUILD parsing)
    sys.argv = ["pmbootstrap.py", "chroot"]
    args = pmb.parse.arguments()
-    pmb.helpers.logging.init(args)
+    context = get_context()
+
+    # pmb.helpers.logging.init(args)
+    pmb.helpers.logging.init(context.log, args.verbose, context.details_to_stdout)
+

    # Verify package versions
    print("checking changed package versions...")
-    check_versions(args, packages)
+    check_versions(packages)
--- a/.ci/pytest.sh
+++ b/.ci/pytest.sh
@@ -19,16 +19,11 @@ if [ -z "$(command -v pytest)" ]; then
 	exit 1
 fi

-# Wrap pmbootstrap to use this repository for --aports
 pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
-_pmbootstrap="$(command -v pmbootstrap)"
-pmbootstrap() {
-	"$_pmbootstrap" --aports="$pmaports" "$@"
-}
-
 # Make sure that the work folder format is up to date, and that there are no
 # mounts from aborted test cases (pmbootstrap#1595)
 pmbootstrap work_migrate
+pmbootstrap config aports "$pmaports"
 pmbootstrap -q shutdown

 # Make sure we have a valid device (pmbootstrap#1128)

--- a/.ci/testcases/conftest.py
+++ b/.ci/testcases/conftest.py
@@ -2,24 +2,33 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

+from pathlib import Path
 import add_pmbootstrap_to_import_path
 import pmb.parse
+from pmb.helpers.args import init as init_args
+from pmb.types import PmbArgs
+import pmb.config
+from pmb.core.pkgrepo import pkgrepo_default_path
 import pytest
 import sys
 import os

-
-@pytest.fixture
+@pytest.fixture(scope="session", autouse=True)
 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()
+    pmaports = Path(os.path.realpath(f"{os.path.dirname(__file__)}/../.."))
+    args = PmbArgs()
+    args.aports = [pmaports]
+    args.config = pmb.config.defaults["config"]
+    args.timeout = 900
+    args.details_to_stdout = False
+    args.quiet = False
+    args.verbose = True
+    args.offline = False
+    args.action = "init"
+    args.cross = False
+    args.log = None

-    # Initialize logging
-    pmb.helpers.logging.init(args)
+    init_args(args)
    request.addfinalizer(pmb.helpers.logging.logfd.close)
    return args
--- a/.ci/testcases/test_device.py
+++ b/.ci/testcases/test_device.py
@@ -11,6 +11,8 @@ import sys
 import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
+from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob, pkgrepo_relative_path
+from pmb.core.arch import Arch

 # Cache for codeowners_parse
 codeowners_parsed = {}
@@ -32,11 +34,11 @@ def device_dependency_check(apkbuild, path):
                               " depends anymore (see pmaports!3478)")


-def test_aports_device(args):
+def test_aports_device():
    """
    Various tests performed on the /device/*/device-* aports.
    """
-    for path in glob.iglob(args.aports + "/device/*/device-*/APKBUILD"):
+    for path in pkgrepo_iglob("device/*/device-*/APKBUILD"):
        apkbuild = pmb.parse.apkbuild(path)

        # Depends: Require "postmarketos-base"
@@ -54,27 +56,27 @@ def test_aports_device(args):

        # 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)
+        deviceinfo = pmb.parse.deviceinfo(device)
+        if Arch.from_str("".join(apkbuild["arch"])) != deviceinfo.arch:
+            raise RuntimeError("wrong architecture, please change to arch=\""
+                               f"{deviceinfo.arch}\": {path}")
        if "!archcheck" not in apkbuild["options"]:
            raise RuntimeError("!archcheck missing in options= line: " + path)


-def test_aports_device_kernel(args):
+def test_aports_device_kernel():
    """
    Verify the kernels specified in the device packages:
    * Kernel must not be in depends when kernels are in subpackages
    * Check if only one kernel is defined in depends
    """
-
+    aports = pkgrepo_default_path()
    # Iterate over device aports
-    for path in glob.glob(args.aports + "/device/*/device-*/APKBUILD"):
+    for path in aports.glob("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)
+        kernels_subpackages = pmb.parse._apkbuild.kernels(device)

        # Parse kernels from depends
        kernels_depends = []
@@ -85,29 +87,29 @@ def test_aports_device_kernel(args):

            # Kernel in subpackages *and* depends
            if kernels_subpackages:
-                raise RuntimeError("Kernel package '" + depend + "' needs to"
+                raise RuntimeError(f"Kernel package '{depend}' needs to"
                                   " be removed when using kernel" +
-                                   " subpackages: " + path)
+                                   f" 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)
+                               f" 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)
+                               f" <https://postmarketos.org/devicepkg>): {path}")


-def codeowners_parse(args):
+def codeowners_parse():
    global codeowners_parsed

    pattern_prev = None
+    aports = pkgrepo_default_path()

-    with open(f"{args.aports}/CODEOWNERS") as h:
+    with open(aports / "CODEOWNERS") as h:
        for line in h:
            line = line.rstrip()
            if not line or line.startswith("#"):
@@ -131,12 +133,13 @@ def codeowners_parse(args):
            pattern_prev = pattern


-def require_enough_codeowners_entries(args, path, maintainers):
+def require_enough_codeowners_entries(path, maintainers):
    """
    :param path: full path to an APKBUILD (e.g. /home/user/…/APKBUILD)
    :param maintainers: list of one or more maintainers
    """
-    path = os.path.relpath(path, args.aports)
+
+    _, path = pkgrepo_relative_path(path)

    nicks = set()
    for pattern, pattern_nicks in codeowners_parsed.items():
@@ -158,36 +161,38 @@ def require_enough_codeowners_entries(args, path, maintainers):
        f"{path}: make sure that each maintainer is listed in CODEOWNERS!"


-def test_aports_maintained(args):
+# @pytest.mark.xfail # Not all aports have been updated yet
+def test_aports_maintained():
    """
    Ensure that aports in /device/{main,community} have "Maintainer:" and
    "Co-Maintainer:" (only required for main) listed in their APKBUILDs. Also
    check that at least as many are listed in CODEOWNERS.
    """
-    codeowners_parse(args)
+    codeowners_parse()

-    for path in glob.iglob(f"{args.aports}/device/main/*/APKBUILD"):
-        if '/firmware-' in path:
+    for path in pkgrepo_iglob("device/main/*/APKBUILD"):
+        if 'firmware-' in path.parent.name:
            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"
-        require_enough_codeowners_entries(args, path, maintainers)
+        require_enough_codeowners_entries(path, maintainers)

-    for path in glob.iglob(f"{args.aports}/device/community/*/APKBUILD"):
-        if '/firmware-' in path:
+    for path in pkgrepo_iglob("device/community/*/APKBUILD"):
+        if 'firmware-' in path.parent.name:
            continue
        maintainers = pmb.parse._apkbuild.maintainers(path)
        assert maintainers, f"{path} in community needs at least 1 Maintainer"
-        require_enough_codeowners_entries(args, path, maintainers)
+        require_enough_codeowners_entries(path, maintainers)


-def test_aports_unmaintained(args):
+def test_aports_unmaintained():
    """
    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"):
+
+    for path in pkgrepo_iglob("device/unmaintained/*/APKBUILD"):
        unmaintained = pmb.parse._apkbuild.unmaintained(path)
        assert unmaintained, f"{path} should have an Unmaintained: " +\
            "comment that describes why the package is unmaintained"
--- a/.ci/testcases/test_deviceinfo.py
+++ b/.ci/testcases/test_deviceinfo.py
@@ -10,6 +10,7 @@ import sys

 import add_pmbootstrap_to_import_path
 import pmb.parse
+from pmb.core.pkgrepo import pkgrepo_iglob


 def deviceinfo_obsolete(info):
@@ -22,13 +23,13 @@ def deviceinfo_obsolete(info):
        "weston_pixman_type",
    ]
    for option in obsolete_options:
-        if option in info and info[option]:
+        if getattr(info, option, None):
            raise RuntimeError(f"option {option} is obsolete, please rename"
                               " or remove it (see reasons for removal of at"
                               " https://postmarketos.org/deviceinfo)")


-def test_deviceinfo(args):
+def test_deviceinfo():
    """
    Parse all deviceinfo files successfully and run checks on the parsed data.
    """
@@ -37,10 +38,10 @@ def test_deviceinfo(args):
    count = 0
    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"$")

-    for folder in glob.glob(args.aports + "/device/*/device-*"):
-        device = folder[len(args.aports):].split("-", 1)[1]
+    for folder in pkgrepo_iglob("device/*/device-*"):
+        device = folder.name.split("-", 1)[1]

-        f = open(folder[len(args.aports):][1:] + "/deviceinfo")
+        f = open(folder / "deviceinfo")
        lines = f.read().split("\n")
        f.close()

@@ -66,12 +67,12 @@ def test_deviceinfo(args):
                                       f" to line instead of above? {line}")

            # Successful deviceinfo parsing / obsolete options
-            info = pmb.parse.deviceinfo(args, device)
+            info = pmb.parse.deviceinfo(device)
            deviceinfo_obsolete(info)

            # deviceinfo_name must start with manufacturer
-            name = info["name"]
-            manufacturer = info["manufacturer"]
+            name = info.name
+            manufacturer = info.manufacturer
            if not name.startswith(manufacturer) and \
                    not name.startswith("Google"):
                raise RuntimeError("Please add the manufacturer in front of"

--- a/.ci/testcases/test_firmware.py
+++ b/.ci/testcases/test_firmware.py
@@ -7,9 +7,10 @@ import os

 import add_pmbootstrap_to_import_path
 import pmb.parse
+from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob


-def test_aports_firmware(args):
+def test_aports_firmware():
    """
    Various tests performed on the /**/firmware-* aports.
    """
@@ -26,9 +27,9 @@ def test_aports_firmware(args):
        "firmware-xiaomi-willow",  # Doesn't build, source link is dead (pma#1212)
    ]

-    for path in glob.iglob(f"{args.aports}/**/firmware-*/APKBUILD", recursive=True):
+    for path in pkgrepo_iglob("**/firmware-*/APKBUILD", recursive=True):
        apkbuild = pmb.parse.apkbuild(path)
-        aport_name = os.path.basename(os.path.dirname(path))
+        aport_name = os.path.basename(path.parent)

        if aport_name not in excluded:
            if "pmb:cross-native" not in apkbuild["options"]:

--- a/.ci/testcases/test_framework_versions.py
+++ b/.ci/testcases/test_framework_versions.py
@@ -15,9 +15,10 @@ import sys
 import add_pmbootstrap_to_import_path
 import pmb.config
 import pmb.parse
+from pmb.core.pkgrepo import pkgrepo_iter_package_dirs


-def get_categorized_packages(args):
+def get_categorized_packages():
    """
    Parse all aports and categorize them.

@@ -28,7 +29,7 @@ def get_categorized_packages(args):
    """
    ret = {}

-    for path in glob.glob(args.aports + "/*/*/APKBUILD"):
+    for path in pkgrepo_iter_package_dirs():
        # Parse APKBUILD
        apkbuild = pmb.parse.apkbuild(path)
        url = apkbuild["url"]
@@ -109,10 +110,10 @@ def check_categories(categories):
    return ret


-def test_framework_versions(args):
+def test_framework_versions():
    """
    Make sure that packages of the same framework have the same version.
    """
-    categories = get_categorized_packages(args)
+    categories = get_categorized_packages()
    if not check_categories(categories):
        raise RuntimeError("Framework version check failed!")
--- a/.ci/testcases/test_kernel.py
+++ b/.ci/testcases/test_kernel.py
@@ -11,14 +11,15 @@ from pathlib import Path

 import add_pmbootstrap_to_import_path
 import pmb.parse
+from pmb.core.pkgrepo import pkgrepo_iglob, pkgrepo_relative_path


-def test_aports_kernel(args):
+def test_aports_kernel():
    """
    Various tests performed on the /**/linux-* aports.
    """

-    for path in glob.iglob(f"{args.aports}/**/linux-*/APKBUILD", recursive=True):
+    for path in pkgrepo_iglob("**/linux-*/APKBUILD", recursive=True):
        apkbuild = pmb.parse.apkbuild(path)
        aport_name = os.path.basename(os.path.dirname(path))

@@ -37,14 +38,15 @@ def test_aports_kernel(args):
                                   " automatically.")

        # check some options only for main and community devices
-        for dir in ["main", "device/main", "device/community"]:
-            if path.startswith(f"{args.aports}/{dir}"):
+        _, relpath = pkgrepo_relative_path(path)
+        for part in ["main", "community"]:
+            if part in relpath.parts:
                if "pmb:kconfigcheck-community" not in apkbuild["options"]:
                    raise RuntimeError(f"{aport_name}: \"pmb:kconfigcheck-community\" missing in"
                                       " options= line, required for all community/main devices.")

        # check for postmarketos-installkernel in makedepends when installing kernel with make
-        if bool(re.search("make z?install", Path(path).read_text(encoding="utf-8"))):
+        if bool(re.search("make z?install", path.read_text(encoding="utf-8"))):
            if "postmarketos-installkernel" not in apkbuild["makedepends"]:
                raise RuntimeError(f"{aport_name}: \"postmarketos-installkernel\" missing in"
                                   " makedepends, required when using make install/zinstall.")
--- a/.ci/testcases/test_provides.py
+++ b/.ci/testcases/test_provides.py
@@ -10,6 +10,7 @@ import sys
 import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
+from pmb.core.pkgrepo import pkgrepo_iter_package_dirs, pkgrepo_relative_path


 def apkbuild_check_provides(path, apkbuild, version, pkgname, subpkgname=None):
@@ -65,13 +66,14 @@ def apkbuild_check_provides(path, apkbuild, version, pkgname, subpkgname=None):
    return ret


-def test_provides(args):
+def test_provides():
    errors = []
-    for path in glob.iglob(f"{args.aports}/**/APKBUILD", recursive=True):
+    for path in pkgrepo_iter_package_dirs():
+        path = path / "APKBUILD"
        apkbuild = pmb.parse.apkbuild(path)
        pkgname = apkbuild["pkgname"]
        version = f"{apkbuild['pkgver']}-r{apkbuild['pkgrel']}"
-        path_rel = os.path.relpath(path, args.aports)
+        _, path_rel = pkgrepo_relative_path(path)
        errors += apkbuild_check_provides(path_rel, apkbuild, version, pkgname)

        for subpkg, subpkg_data in apkbuild["subpackages"].items():

--- a/.ci/testcases/test_source.py
+++ b/.ci/testcases/test_source.py
@@ -14,9 +14,10 @@ import pmb.parse
 import pmb.parse._apkbuild
 import pmb.parse.apkindex
 import pmb.helpers.repo
+from pmb.core.pkgrepo import pkgrepo_iter_package_dirs, pkgrepo_relative_path


-def parse_source_from_checksums(args, apkbuild_path):
+def parse_source_from_checksums(apkbuild_path):
    """
    Read the APKBUILD file and parse source files from the checksums at the
    bottom. This has always the same format, even if $source is built with hard
@@ -64,17 +65,20 @@ def parse_source_from_checksums(args, apkbuild_path):
    return ret


-def test_aports_unreferenced_files(args):
+def test_aports_unreferenced_files():
    """
    Raise an error if an unreferenced file is found
    """
-    for apkbuild_path in glob.iglob(args.aports + "/**/APKBUILD", recursive=True):
+    for apkbuild_path in pkgrepo_iter_package_dirs():
        # pmbootstrap parser has some issues with complicated APKBUILDs, skip those.
-        if apkbuild_path.startswith(args.aports + "/cross/"):
+        _, relpath = pkgrepo_relative_path(apkbuild_path)
+        if relpath.parts[0] == "cross":
            continue

+        apkbuild_path = apkbuild_path / "APKBUILD"
+
        apkbuild = pmb.parse.apkbuild(apkbuild_path)
-        sources_chk = parse_source_from_checksums(args, apkbuild_path)
+        sources_chk = parse_source_from_checksums(apkbuild_path)

        # Collect files from subpackages
        subpackage_installs = []
@@ -105,7 +109,7 @@ def test_aports_unreferenced_files(args):
                raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")


-def test_distfiles_conflict(args):
+def test_distfiles_conflict():
    """
    Make sure that each filename mentioned in any source= of any APKBUILD
    always has the same checksum. This is important because apk caches
@@ -115,10 +119,11 @@ def test_distfiles_conflict(args):
    with a checksum error.
    """
    source_all = {}
-    for apkbuild_path in glob.iglob(f"{args.aports}/**/APKBUILD", recursive=True):
-        source = parse_source_from_checksums(args, apkbuild_path)
+    for apkbuild_path in pkgrepo_iter_package_dirs():
+        apkbuild_path = apkbuild_path / "APKBUILD"
+        source = parse_source_from_checksums(apkbuild_path)
        dir_path = os.path.dirname(apkbuild_path)
-        apkbuild_rel = os.path.relpath(apkbuild_path, args.aports)
+        _, apkbuild_rel = pkgrepo_relative_path(apkbuild_path)
        for filename, checksum in source.items():
            # Files bundled with the APKBUILD don't get copied to the distfiles
            # cache, so not relevant for this check. Use glob.glob here and not

--- a/.ci/testcases/test_ui.py
+++ b/.ci/testcases/test_ui.py
@@ -9,25 +9,26 @@ import os

 import add_pmbootstrap_to_import_path
 import pmb.parse
+from pmb.core.pkgrepo import pkgrepo_iglob


-def test_aports_ui(args):
+def test_aports_ui():
    """
    Raise an error if package in _pmb_recommends is not found
    """
-    pmaports_cfg = pmb.config.pmaports.read_config(args)
+    pmaports_cfg = pmb.config.pmaports.read_config()

    for arch in pmaports_cfg["supported_arches"].split(","):
-        for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
+        for path in pkgrepo_iglob("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):
+            if not pmb.helpers.package.check_arch(apkbuild["pkgname"], arch, False):
                continue

            for package in apkbuild["_pmb_recommends"]:
-                depend = pmb.helpers.package.get(args, package,
+                depend = pmb.helpers.package.get(package,
                                                 arch, must_exist=False)
-                if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
+                if depend is None or not pmb.helpers.package.check_arch(package, arch):
                    raise RuntimeError(f"{path}: package '{package}' from"
                                       f" _pmb_recommends not found for arch '{arch}'")

@@ -35,8 +36,8 @@ def test_aports_ui(args):
            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,
+                    depend = pmb.helpers.package.get(package,
                                                     arch, must_exist=False)
-                    if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
+                    if depend is None or not pmb.helpers.package.check_arch(package, arch):
                        raise RuntimeError(f"{path}: package '{package}' from _pmb_recommends "
                                           f"of -extras subpackage is not found for arch '{arch}'")
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,8 @@ stages:
  - lint
  - build
  - autoupdate
+variables:
+  PMBOOTSTRAP_TAG: "master"

 # This defines the rules for when a pipeline should run.
 workflow:
@@ -125,8 +127,6 @@ mr-settings:
 # build changed aports
 .build:
  stage: build
-  tags:
-    - saas-linux-large-amd64
  rules:
    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  before_script:
@@ -152,8 +152,6 @@ build-x86:

 build-aarch64:
  extends: .build
-  tags:
-    - saas-linux-large-arm64
  script:
    - .ci/build-aarch64.sh

@@ -174,9 +172,6 @@ build-riscv64:

 auto-update:
  stage: autoupdate
-  # We build packages before merging too
-  tags:
-    - saas-linux-large-amd64
  rules:
    # This variable is set in the scheduled pipeline configuration. It should be a space separated list of
    # package names to update.

--- a/device/community/device-generic-x86_64/30-gpu-firmware.files
+++ b/device/community/device-generic-x86_64/30-gpu-firmware.files
--- a/device/community/device-generic-x86_64/APKBUILD
+++ b/device/community/device-generic-x86_64/APKBUILD
@@ -2,7 +2,7 @@
 # Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=15
+pkgver=16
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,10 +17,11 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	modules-initfs
-	30-gpu-firmware.files
+	30-gpu-i915-firmware.files
 "
 install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="
+	$pkgname-intel
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-kernel-lts:kernel_lts
 "
@@ -41,9 +42,14 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
+}
+
+intel() {
+	pkgdesc="Intel-specific configuration"
+	install_if="$pkgname=$pkgver-r$pkgrel oem-intel"

-	install -Dm644 "$srcdir"/30-gpu-firmware.files \
-		-t "$pkgdir"/usr/share/mkinitfs/files/
+	install -Dm644 "$srcdir"/30-gpu-i915-firmware.files \
+		-t "$subpkgdir"/usr/share/mkinitfs/files/
 }

 kernel_edge() {
@@ -65,5 +71,5 @@ kernel_lts() {
 sha512sums="
 e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb  deviceinfo
 e464ef0ad4a4c34d2d53f69c4612b612ea878a77c9efdef69b0f842edf701036c8218809fd63aac286d6a08ae07f39e568199fc3e38d145e716c1723e7215019  modules-initfs
-9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881  30-gpu-firmware.files
+9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881  30-gpu-i915-firmware.files
 "
--- a/device/community/linux-google-veyron/APKBUILD
+++ b/device/community/linux-google-veyron/APKBUILD
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-google-veyron
 pkgver=6.1.39
-pkgrel=3
+pkgrel=4
 pkgdesc="Mainline kernel for Google Veyron devices"
 arch="armv7"
 _carch="arm"
@@ -68,7 +68,7 @@ package() {

 sha512sums="
 20d468ae89b57dda82d7c7b814c3d8b1b510e1623775b09a8a0b0a8a0431461e0a1d2df2bfa01f3102932c8eef91405546898b50ec3e6f30015098bb39722b41  linux-6.1.39.tar.xz
-c2bc85928ce2025a2928af1e36d67a5ad66c6786e47e740dec806baf814adc8dcef76c4c4536e825bd09e56876eeb83373556d261c1d260476fc41e1c6d14d7b  config-google-veyron.armv7
+3251546c093d41c3cd832d864a5f24b0de6da1e8ab2856bc7b168d450c450d66c82a141c0c4550ed124a3cf59745bdaef28eab6cef220e3fa8295889d222e1d3  config-google-veyron.armv7
 2912c675c1e07f7e91e2edcaa82738643907ed46614e4b871565930ff4ffece468d47db7905c2c081f936c020ea78db4a9d9f33b76c110125a0e68a1bd57f9fd  veyron.better_clock_selection_logic_and_dts_rate_list.patch
 b16da0e0b1da9f074a773300e954aa5e0da6c2113e20c0b594a7a4875e9addb10efcf5be694467fb00cd8d7c2e3cc83e6d7aac618047775dc0bb354245cf7c35  veyron.dts_allow_dedicating_npll_to_vop.patch
 b7bda162526abdb61c0223f1aac31893526d3d1d21d79ebd3e707be8d9b5dc464f6b4fa20b74444c44fda987352728433913f6f50b9b860c2621d11ae2306e1b  veyron.dts_do_dedicate_npll_to_vop.patch

--- a/device/community/linux-google-veyron/config-google-veyron.armv7
+++ b/device/community/linux-google-veyron/config-google-veyron.armv7
@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 6.1.39 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130201
+CONFIG_GCC_VERSION=140200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -131,6 +131,7 @@ CONFIG_TREE_RCU=y
 CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -821,7 +822,8 @@ CONFIG_BLOCK_LEGACY_AUTOLOAD=y
 CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 # CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_INTEGRITY_T10=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
@@ -1203,8 +1205,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=m
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1494,7 +1496,7 @@ CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BT_BNEP is not set
-# CONFIG_BT_HIDP is not set
+CONFIG_BT_HIDP=m
 # CONFIG_BT_HS is not set
 CONFIG_BT_LE=y
 # CONFIG_BT_LEDS is not set
@@ -1502,7 +1504,6 @@ CONFIG_BT_LE=y
 # CONFIG_BT_AOSPEXT is not set
 CONFIG_BT_DEBUGFS=y
 # CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_FEATURE_DEBUG is not set

 #
 # Bluetooth device drivers
@@ -2128,7 +2129,7 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-# CONFIG_DM_INTEGRITY is not set
+CONFIG_DM_INTEGRITY=m
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
@@ -2653,7 +2654,37 @@ CONFIG_MOUSE_ELAN_I2C_I2C=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_JOYSTICK=y
+# CONFIG_JOYSTICK_ANALOG is not set
+# CONFIG_JOYSTICK_A3D is not set
+# CONFIG_JOYSTICK_ADC is not set
+# CONFIG_JOYSTICK_ADI is not set
+# CONFIG_JOYSTICK_COBRA is not set
+# CONFIG_JOYSTICK_GF2K is not set
+# CONFIG_JOYSTICK_GRIP is not set
+# CONFIG_JOYSTICK_GRIP_MP is not set
+# CONFIG_JOYSTICK_GUILLEMOT is not set
+# CONFIG_JOYSTICK_INTERACT is not set
+# CONFIG_JOYSTICK_SIDEWINDER is not set
+# CONFIG_JOYSTICK_TMDC is not set
+# CONFIG_JOYSTICK_IFORCE is not set
+# CONFIG_JOYSTICK_WARRIOR is not set
+# CONFIG_JOYSTICK_MAGELLAN is not set
+# CONFIG_JOYSTICK_SPACEORB is not set
+# CONFIG_JOYSTICK_SPACEBALL is not set
+# CONFIG_JOYSTICK_STINGER is not set
+# CONFIG_JOYSTICK_TWIDJOY is not set
+# CONFIG_JOYSTICK_ZHENHUA is not set
+# CONFIG_JOYSTICK_AS5011 is not set
+# CONFIG_JOYSTICK_JOYDUMP is not set
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_JOYSTICK_PSXPAD_SPI is not set
+# CONFIG_JOYSTICK_PXRC is not set
+# CONFIG_JOYSTICK_QWIIC is not set
+# CONFIG_JOYSTICK_FSIA6B is not set
+# CONFIG_JOYSTICK_SENSEHAT is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -5256,7 +5287,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 #
 CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
-# CONFIG_HIDRAW is not set
+CONFIG_HIDRAW=y
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=y

@@ -5281,6 +5312,7 @@ CONFIG_HID_COUGAR=m
 CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
+# CONFIG_HID_CP2112 is not set
 CONFIG_HID_CREATIVE_SB0540=m
 CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
@@ -5290,6 +5322,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=m
+# CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GFRM=m
 CONFIG_HID_GLORIOUS=m
@@ -5317,6 +5350,7 @@ CONFIG_HID_LED=m
 CONFIG_HID_LENOVO=m
 CONFIG_HID_LETSKETCH=m
 CONFIG_HID_LOGITECH=m
+# CONFIG_HID_LOGITECH_DJ is not set
 CONFIG_HID_LOGITECH_HIDPP=m
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
@@ -5386,7 +5420,7 @@ CONFIG_HID_MCP2221=m
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_HIDDEV=y
 # end of USB HID support

 #
@@ -5406,7 +5440,7 @@ CONFIG_USB_ULPI_BUS=y
 # CONFIG_USB_CONN_GPIO is not set
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

 #
 # Miscellaneous USB options
@@ -5462,7 +5496,7 @@ CONFIG_USB_R8A66597_HCD=m
 # USB Device Class drivers
 #
 # CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
+CONFIG_USB_PRINTER=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_TMC is not set

@@ -7244,7 +7278,14 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
@@ -7392,6 +7433,7 @@ CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_PMSG=y
+# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=y
 # CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
@@ -7543,6 +7585,8 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -7675,7 +7719,8 @@ CONFIG_CRYPTO_XXHASH=y
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
-# CONFIG_CRYPTO_CRCT10DIF is not set
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRC64_ROCKSOFT=y
 # end of CRCs (cyclic redundancy checks)

 #
@@ -7737,6 +7782,7 @@ CONFIG_CRYPTO_AES_ARM_BS=y
 CONFIG_CRYPTO_AES_ARM_CE=y
 CONFIG_CRYPTO_CHACHA20_NEON=y
 CONFIG_CRYPTO_CRC32_ARM_CE=m
+# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
 # end of Accelerated Cryptographic Algorithms for CPU (arm)

 CONFIG_CRYPTO_HW=y
@@ -7823,8 +7869,8 @@ CONFIG_CRYPTO_LIB_SHA256=y

 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC64_ROCKSOFT is not set
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC64_ROCKSOFT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@@ -7832,7 +7878,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
-# CONFIG_CRC64 is not set
+CONFIG_CRC64=y
 CONFIG_CRC4=m
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y
@@ -7944,8 +7990,8 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_DEBUG_CORE is not set
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
 CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
@@ -8114,22 +8160,27 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
+CONFIG_BUILDTIME_MCOUNT_SORT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 # CONFIG_BOOTTIME_TRACING is not set
-# CONFIG_FUNCTION_TRACER is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+# CONFIG_FUNCTION_PROFILER is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_HWLAT_TRACER is not set
 # CONFIG_OSNOISE_TRACER is not set
 # CONFIG_TIMERLAT_TRACER is not set
-# CONFIG_ENABLE_DEFAULT_TRACERS is not set
 # CONFIG_FTRACE_SYSCALLS is not set
 # CONFIG_TRACER_SNAPSHOT is not set
 CONFIG_BRANCH_PROFILE_NONE=y
@@ -8140,12 +8191,17 @@ CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
 # CONFIG_SYNTH_EVENTS is not set
 # CONFIG_HIST_TRIGGERS is not set
 # CONFIG_TRACE_EVENT_INJECT is not set
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set

--- a/device/community/linux-lenovo-21bx/APKBUILD
+++ b/device/community/linux-lenovo-21bx/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Konrad Dybcio <konradybcio@kernel.org>
 pkgname=linux-lenovo-21bx
 pkgver=6.10
-pkgrel=0
+pkgrel=1
 _commit="f0239008542ebdcd4a94755124b5700649df5c39"
 pkgdesc="Lenovo ThinkPad X13s kernel fork"
 arch="aarch64"
@@ -68,5 +68,5 @@ package() {

 sha512sums="
 efbf5fdaba513098c9c0f8eb2a559e58c6fd1180bcdf897514b2104480f0d2de2065f073d12204989804b61b083c2b3f9d605493ca6e89bb25e0beeae8545273  linux-lenovo-21bx-f0239008542ebdcd4a94755124b5700649df5c39.tar.gz
-4ce995e9f5d71d9e1037072d5f05166cfb1b03d95bfb9a88269e9e2be9960894e9a2ca29f8a25855777291b676e423ce2ee56386372692820ea1722e5b3e9c9e  config-lenovo-21bx.aarch64
+b1ad53eab677711b27505a9a6eac3ab34e83196a3fc2496855c1103d0b78e3e97dabdefd7f86bd318c516f4ab7cb6e303df92e60e1c1ee16ae0bb80ba6f1e08a  config-lenovo-21bx.aarch64
 "
--- a/device/community/linux-lenovo-21bx/config-lenovo-21bx.aarch64
+++ b/device/community/linux-lenovo-21bx/config-lenovo-21bx.aarch64
@@ -2,20 +2,17 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.10.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130201
+CONFIG_GCC_VERSION=140200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -786,6 +783,8 @@ CONFIG_GCC_PLUGINS=y
 CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FUNCTION_ALIGNMENT_8B=y
 CONFIG_FUNCTION_ALIGNMENT=8
+CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
+CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
@@ -812,7 +811,8 @@ CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 # CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
@@ -1188,8 +1188,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=y
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1966,8 +1966,8 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-# CONFIG_DM_INTEGRITY is not set
-# CONFIG_DM_AUDIT is not set
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_AUDIT=y
 # CONFIG_DM_VDO is not set
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set
@@ -2437,7 +2437,7 @@ CONFIG_MHI_WWAN_MBIM=m
 #
 CONFIG_INPUT=y
 CONFIG_INPUT_LEDS=m
-# CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_FF_MEMLESS=m
 # CONFIG_INPUT_SPARSEKMAP is not set
 # CONFIG_INPUT_MATRIXKMAP is not set

@@ -2485,7 +2485,38 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_BCM is not set
 # CONFIG_KEYBOARD_CYPRESS_SF is not set
 # CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_JOYSTICK=y
+# CONFIG_JOYSTICK_ANALOG is not set
+# CONFIG_JOYSTICK_A3D is not set
+# CONFIG_JOYSTICK_ADC is not set
+# CONFIG_JOYSTICK_ADI is not set
+# CONFIG_JOYSTICK_COBRA is not set
+# CONFIG_JOYSTICK_GF2K is not set
+# CONFIG_JOYSTICK_GRIP is not set
+# CONFIG_JOYSTICK_GRIP_MP is not set
+# CONFIG_JOYSTICK_GUILLEMOT is not set
+# CONFIG_JOYSTICK_INTERACT is not set
+# CONFIG_JOYSTICK_SIDEWINDER is not set
+# CONFIG_JOYSTICK_TMDC is not set
+# CONFIG_JOYSTICK_IFORCE is not set
+# CONFIG_JOYSTICK_WARRIOR is not set
+# CONFIG_JOYSTICK_MAGELLAN is not set
+# CONFIG_JOYSTICK_SPACEORB is not set
+# CONFIG_JOYSTICK_SPACEBALL is not set
+# CONFIG_JOYSTICK_STINGER is not set
+# CONFIG_JOYSTICK_TWIDJOY is not set
+# CONFIG_JOYSTICK_ZHENHUA is not set
+# CONFIG_JOYSTICK_AS5011 is not set
+# CONFIG_JOYSTICK_JOYDUMP is not set
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+# CONFIG_JOYSTICK_PSXPAD_SPI is not set
+# CONFIG_JOYSTICK_PXRC is not set
+# CONFIG_JOYSTICK_QWIIC is not set
+# CONFIG_JOYSTICK_FSIA6B is not set
+# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_JOYSTICK_SEESAW is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
@@ -4488,7 +4519,7 @@ CONFIG_HID_MULTITOUCH=m
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_HIDDEV=y
 # end of USB HID support

 CONFIG_I2C_HID=m
@@ -4505,7 +4536,7 @@ CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
 # CONFIG_USB_PCI is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

 #
 # Miscellaneous USB options
@@ -6283,7 +6314,15 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+CONFIG_XFS_SUPPORT_ASCII_CI=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
@@ -6345,7 +6384,7 @@ CONFIG_NETFS_SUPPORT=y
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
+CONFIG_UDF_FS=m
 # end of CD-ROM/DVD Filesystems

 #
@@ -6565,6 +6604,8 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options

 CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y

 #
@@ -6695,7 +6736,8 @@ CONFIG_CRYPTO_XXHASH=y
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
-# CONFIG_CRYPTO_CRCT10DIF is not set
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRC64_ROCKSOFT=y
 # end of CRCs (cyclic redundancy checks)

 #
@@ -6765,6 +6807,7 @@ CONFIG_CRYPTO_AES_ARM64_BS=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
+# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
 # end of Accelerated Cryptographic Algorithms for CPU (arm64)

 CONFIG_CRYPTO_HW=y
@@ -6854,16 +6897,16 @@ CONFIG_CRYPTO_LIB_SHA256=y

 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC64_ROCKSOFT is not set
-# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC64_ROCKSOFT=y
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
 CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
-# CONFIG_CRC64 is not set
+CONFIG_CRC64=y
 # CONFIG_CRC4 is not set
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y

--- a/device/community/linux-pine64-pinephonepro/APKBUILD
+++ b/device/community/linux-pine64-pinephonepro/APKBUILD
@@ -3,7 +3,7 @@ pkgname=linux-pine64-pinephonepro
 pkgver=6.6.0
 _pkgver=6.6
 _tagdate=20231104-22589
-pkgrel=3
+pkgrel=4
 pkgdesc="Mainline kernel for the pinephone pro"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -72,5 +72,5 @@ package() {

 sha512sums="
 d59c410ecc1a824b7b9a38f36b224693812003320220a3464a648084152023ed8be48d0448eb8054cd2b1d42befd5e8958d3ad243e50138e1c9d0269ac2917ea  linux-ppp-6.6-20231104-22589.tar.gz
-0806ec3859bb71739c59108e66fe0f45c9db384f0beab9b736627e79b45363e2c0bc466e6b584c00f91ce262bd7a4a2d14c8f14eee1bb8158c7deddd18452bda  config-pine64-pinephonepro.aarch64
+7f7e431c6e972baad419c705dfed09890bd09bf217ebc4de574643463d27f6202acd53c60b9e8cddfdf4cee32e4652b4e0c94b21e7da4dc75a6750cc868b7eb0  config-pine64-pinephonepro.aarch64
 "
No results found