extra-repos/systemd/systemd-services: add a service file for waydroid-session

[ci:skip-build]: already built successfully in CI

.ci/apkbuild-lint.sh

@@ -6,7 +6,7 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/autoupdate.sh

@@ -6,7 +6,7 @@
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk add git openssh-keygen grep curl
-	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0 $*"
 fi
@@ -90,9 +90,9 @@ update_linux_next() {
 }
 
 # For testing
-#git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports-autoupdate-test.git
+#git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.com/postmarketOS/pmaports-autoupdate-test.git
 
-git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports.git
+git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.com/postmarketOS/pmaports.git
 git fetch gitlab
 git checkout --track gitlab/master
 

.ci/commits.sh

@@ -8,7 +8,12 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-
+	# In .gitlab-ci.yml currently .ci/pytest.sh runs before this and
+	# already downloads and runs install_pmbootstrap.sh.
+	if ! [ -e install_pmbootstrap.sh ]; then
+		wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+		sh ./install_pmbootstrap.sh
+	fi
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi
 

.ci/grep.sh

@@ -57,7 +57,7 @@ fi
 
 POSTMARKETOS_WALLPAPER_PATH='/usr/share/wallpapers/postmarketos.jpg'
 # The excluded devices are "grandfathered in". New devices should not be added here.
-# See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2529
+# See https://gitlab.com/postmarketOS/pmaports/-/issues/2529
 if grep -qr $POSTMARKETOS_WALLPAPER_PATH \
 	--exclude-dir='device-pine64-pinetab' \
 	--exclude-dir='device-oneplus-kebab' \

.ci/kconfig.sh

@@ -6,7 +6,7 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/lib/build_changed_aports.py

@@ -2,7 +2,6 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
-import os
 import pathlib
 
 # Same dir
@@ -10,7 +9,6 @@ import common
 
 # pmbootstrap
 import add_pmbootstrap_to_import_path
-import pmb.core
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports
@@ -19,6 +17,8 @@ from pmb.core.context import get_context
 
 def build_strict(packages, arch):
     common.run_pmbootstrap(["build_init"])
+    common.run_pmbootstrap(["config", "mirrors.pmaports",
+                            "http://mirror.postmarketos.org/postmarketos/staging/systemd/"])
     common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
                             "--strict", "--force",
                             "--arch", arch, ] + list(packages))
@@ -48,6 +48,7 @@ if __name__ == "__main__":
         sys.exit(1)
     arch = sys.argv[1]
 
+    common.run_pmbootstrap(["config", "systemd", "always"])
     # Get and print modified packages
     common.add_upstream_git_remote()
     packages = common.get_changed_packages()
@@ -68,29 +69,9 @@ if __name__ == "__main__":
     args = pmb.parse.arguments()
     context = get_context()
 
-    # Get set of all buildable packages for the enabled repos, for skipping unbuildable
-    # aports later. We might be given a changed aport from e.g. extra-repos/systemd when
-    # that repo is not enabled
-    buildable_pkgs = set()
-    for path in pmb.core.pkgrepo.pkgrepo_iter_package_dirs():
-        buildable_pkgs.add(os.path.basename(path))
-
-    # To store a list of packages from extra-repos/systemd for special handling later:
-    systemd_pkgs = list()
-
-    # Filter out packages that either:
-    #  1. can't be built for given arch
-    #  2. are not found in enabled repos
+    # 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():
-        if package not in buildable_pkgs:
-            print(f"{package}: not in any available repos, skipping")
-            packages.remove(package)
-            # FIXME: this should probably be more generic, if other repos are added later?
-            # This just tosses the package into the list of packages to try building later w/ systemd enabled, and assumes it'll be found there.
-            systemd_pkgs.append(package)
-            continue
-
         apkbuild_path = pmb.helpers.pmaports.find(package)
         apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
 
@@ -106,10 +87,3 @@ if __name__ == "__main__":
     # Build packages
     print(f"building in strict mode for {arch}: {', '.join(packages)}")
     build_strict(packages, arch)
-
-    # Build packages in extra-repos/systemd
-    # FIXME: this should probably be more generic, if other repos are added later?
-    if systemd_pkgs:
-        print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(packages)}")
-        common.run_pmbootstrap(["config", "systemd", "always"])
-        build_strict(systemd_pkgs, arch)

.ci/lib/build_changed_aports.sh

@@ -5,7 +5,7 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/lib/common.py

@@ -36,7 +36,7 @@ def run_git(parameters, check=True, stderr=None):
 def add_upstream_git_remote():
     """ Add a remote pointing to postmarketOS/pmaports. """
     run_git(["remote", "add", "upstream",
-             "https://gitlab.postmarketos.org/postmarketOS/pmaports.git"], False)
+             "https://gitlab.com/postmarketOS/pmaports.git"], False)
     run_git(["fetch", "-q", "upstream"])
 
 
@@ -60,34 +60,8 @@ def get_upstream_branch():
 
         :returns: branch name, e.g. "v20.05" """
 
-    # Prefer gitlab CI target branch name if it's set (i.e. running in gitlab CI)
-    if target_branch := os.environ.get("CI_MERGE_REQUEST_TARGET_BRANCH_NAME"):
-        return target_branch
-
-    global cache
-    if "upstream_branch" in cache:
-        return cache["upstream_branch"]
-
-    # 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
+    # HACK for master_staging_systemd branch
+    return "master_staging_systemd"
 
 
 def get_changed_files(removed=True):

.ci/pytest.sh

@@ -8,6 +8,7 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh pytest
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/testcases/test_directory_structure.py

@@ -10,6 +10,7 @@ expected_directories = [
     "device/community",
     "device/main",
     "device/testing",
+    "extra-repos/systemd",
     "main",
     "modem",
     "non-free",
@@ -28,7 +29,7 @@ def test_directories():
 
 
 # Ensure no file in pmaports are executable.
-# see https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/593.
+# see https://gitlab.com/postmarketOS/pmaports/-/issues/593.
 def test_executable_files():
     for file in glob.iglob("[!temp]**/**/*", recursive=True):
         if os.path.isdir(file) or os.path.islink(file):

.ci/testcases/test_kernel.py

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

.editorconfig

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

.gitlab-ci.yml

@@ -8,7 +8,8 @@ after_script:
   - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
-
+  - build
+  - autoupdate
 
 # This defines the rules for when a pipeline should run.
 workflow:
@@ -21,14 +22,61 @@ workflow:
     # Run scheduled pipeline for autoupdate or manually triggered pipeline
     - if: $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
 
+# device documentation
+wiki:
+  stage: lint
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - .ci/**/*
+        - .gitlab-ci.yml
+        - device/*/device-*/*
+  script:
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/wiki.sh
+
+# testcases linting
+ruff:
+  stage: lint
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - .ci/*
+        - .ci/*/*
+        - .gitlab-ci.yml
+  script:
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/ruff.sh
+
+# shellcheck and various grep checks
+shellcheck-grep:
+  stage: lint
+  image: alpine:edge
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  script:
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/shellcheck.sh
+    - .ci/grep.sh
+    - .ci/codeowners.sh
+
+editor-config:
+  stage: lint
+  image: alpine:edge
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  script:
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/ec.sh
+
 # aports checks (generic)
 pytest-commits:
   stage: lint
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   script:
-    - .ci/pytest.sh
     - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/pytest.sh
     - .ci/commits.sh
   artifacts:
     when: on_failure
@@ -37,3 +85,89 @@ pytest-commits:
       - log_testsuite_pmaports.txt
       - pmbootstrap.cfg
     expire_in: 1 week
+
+# APKBUILD linting
+aport-lint:
+  stage: lint
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  script:
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/apkbuild-lint.sh
+  allow_failure: true
+
+# kernel kconfig check
+kernel-kconfig:
+  stage: lint
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - kconfigcheck.toml
+        - device/*/linux-*/config-*
+        - main/linux-*/config-*
+  script:
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/kconfig.sh
+
+# MR settings
+# (Checks for "Allow commits from members who can merge to the target branch")
+mr-settings:
+  stage: lint
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  before_script:
+    - *global_before_scripts
+    - apk -q add python3
+  script:
+    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
+    - python3 ./check_mr_settings.py
+
+# build changed aports
+.build:
+  stage: build
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  before_script:
+    - *global_before_scripts
+    - .ci/lib/gitlab_prepare_ci.sh
+  after_script:
+    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - packages/
+  timeout: 10 h
+
+build-x86_64:
+  extends: .build
+  script:
+    - .ci/build-x86_64.sh
+
+build-aarch64:
+  extends: .build
+  script:
+    - .ci/build-aarch64.sh
+
+build-armv7:
+  extends: .build
+  script:
+    - .ci/build-armv7.sh
+
+auto-update:
+  stage: autoupdate
+  rules:
+    # This variable is set in the scheduled pipeline configuration. It should be a space separated list of
+    # package names to update.
+    - if: $AUTOUPDATE_PACKAGES != null && $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
+  before_script:
+    - .ci/lib/gitlab_prepare_ci.sh
+  script:
+    - .ci/autoupdate.sh "$AUTOUPDATE_PACKAGES"
+  after_script:
+    - .ci/lib/move_logs.sh $CI_PROJECT_DIR
+  artifacts:
+    when: on_failure
+    paths:
+      - log.txt
+      - log_testsuite_pmaports.txt
+      - pmbootstrap.cfg

cross/crossdirect/APKBUILD

@@ -20,7 +20,7 @@
 
 pkgname=crossdirect
 pkgver=5.1.0
-pkgrel=1
+pkgrel=0
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
 arch="all"
@@ -82,7 +82,7 @@ package() {
 
 sha512sums="
 0f4b48f250425dc57f63955fc8b38477d23db793bee367c3fbe03c3d2a559ba576434d07518310db4cae9d90d501af4051b80038b10fae94b980e537fc9374ad  cargo.sh
-a1af3d2876dc05bb840e4bfb8b6e1c1dcf5b952375a6644dcb9cf659d82ec8bfc4be5d813064057fe9626104a10907ae7072a9d5fd7ac40f3b87e90dbf535eaf  crossdirect.c
+500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
 de2aa6929bbff5db9132673e667f4525b333d062cb1f7a0597dd924de9e5c7215a9f8e2e6263b6fb5ace06f2c4b64f4ebfd0ede9b78add07c2cd08ec8613e98f  rustc.sh
 ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh
 "

cross/crossdirect/crossdirect.c

@@ -43,7 +43,7 @@
 
 void exit_userfriendly()
 {
-	fprintf(stderr, "Please report this at: https://gitlab.postmarketos.org/postmarketOS/pmaports/issues\n");
+	fprintf(stderr, "Please report this at: https://gitlab.com/postmarketOS/pmaports/issues\n");
 	fprintf(stderr, "As a workaround, you can compile without crossdirect.\n");
 	fprintf(stderr, "See 'pmbootstrap -h' for related options.\n");
 	exit(1);

device/community/device-motorola-harpia/APKBUILD

@@ -33,7 +33,7 @@ nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
 	# harpia's WCNSS firmware has problems with WiFi channels on some device
 	# variants, using osprey's firmware seems to help as a workaround
-	# (see https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1085)
+	# (see https://gitlab.com/postmarketOS/pmaports/-/issues/1085)
 	depends="firmware-qcom-adreno-a300 msm-firmware-loader
 		 firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus
 		 firmware-motorola-osprey-wcnss"

device/community/linux-postmarketos-mediatek-mt8173/APKBUILD

@@ -1,8 +1,8 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.11.1
-pkgrel=0
+pkgver=6.10.10
+pkgrel=2
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -37,7 +37,6 @@ source="
 	https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${pkgver//_/-}.tar.xz
 	$_config
 	fix-mmc-order.patch
-	revert-drm-change.patch
 "
 builddir="$srcdir/linux-${_kernver//_/-}"
 
@@ -67,8 +66,7 @@ package() {
 }
 
 sha512sums="
-026b8fe7a1eaacf832e9d0da08861869542248ef89daade3292d1e11b886788e2b1e4c8828b0509c454aedfdc7f22e9afbb446033072ebabf8c02fd5f5bf0d7f  linux-6.11.1.tar.xz
-18f9f5d61a02558cc3a8fbc6311d6d05853e62bac5592ee24c4314d8e63bc2fc50914607cdabbb9e6a9d4c3d3a95100bfc71326387bc2303fa78773e33a042bd  config-postmarketos-mediatek-mt8173.aarch64
+affaa3690150ca13f0ee14f91f0e09a5ad3340a7ea6404e34286dfb4bd4fdfe12fcac47e83da7878681bf28a8a8b78e0b315e1563408885dbb07aac5bd2e4dce  linux-6.10.10.tar.xz
+44c35de93ea3bfe214585c4b8909613b17a6e280765ab84352e3d07490a42403e3e68ab7f26eb9442004a1ee7f78ef0fd6ebdeab01561ac84a8073d817ca3434  config-postmarketos-mediatek-mt8173.aarch64
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
-837e3cbd28f5948beb6f71ce6c39cd738ce5916596c9c3d9727621b7441268a415ec8487dc6b8ae936ac9193bbbd23ebcf023419357e1e1ec5b9d1a9ffc52452  revert-drm-change.patch
 "

device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64

@@ -1,18 +1,21 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.1 Kernel Configuration
+# Linux/arm64 6.10.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=140200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_AS_VERSION=24301
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24200
+CONFIG_LD_VERSION=24301
 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_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -175,7 +178,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-# CONFIG_MEMCG_V1 is not set
+CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -534,7 +537,6 @@ CONFIG_ARM64_CONTPTE=y
 CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
-# CONFIG_COMPRESSED_INSTALL is not set
 CONFIG_DMI=y
 # end of Boot options
 
@@ -757,6 +759,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
+CONFIG_RELR=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -808,6 +811,7 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 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
@@ -894,7 +898,6 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
 CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
 CONFIG_ZBUD=y
 CONFIG_Z3FOLD=y
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -906,7 +909,6 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1403,7 +1405,6 @@ CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
 # CONFIG_NET_DSA_TAG_LAN9303 is not set
 # CONFIG_NET_DSA_TAG_SJA1105 is not set
 # CONFIG_NET_DSA_TAG_TRAILER is not set
-# CONFIG_NET_DSA_TAG_VSC73XX_8021Q is not set
 # CONFIG_NET_DSA_TAG_XRS700X is not set
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
@@ -1721,6 +1722,7 @@ CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
 # CONFIG_PCIE_MEDIATEK is not set
 # CONFIG_PCIE_MEDIATEK_GEN3 is not set
+# CONFIG_PCIE_MICROCHIP_HOST is not set
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_XGENE_MSI=y
 # CONFIG_PCIE_XILINX is not set
@@ -1749,12 +1751,6 @@ CONFIG_PCIE_KIRIN=y
 # Mobiveil-based PCIe controllers
 #
 # end of Mobiveil-based PCIe controllers
-
-#
-# PLDA-based PCIe controllers
-#
-# CONFIG_PCIE_MICROCHIP_HOST is not set
-# end of PLDA-based PCIe controllers
 # end of PCI controller drivers
 
 #
@@ -2196,7 +2192,6 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_UACCE=m
 # CONFIG_PVPANIC is not set
 # CONFIG_GP_PCI1XXXX is not set
-# CONFIG_KEBA_CP500 is not set
 # end of Misc devices
 
 #
@@ -2585,7 +2580,6 @@ CONFIG_SKY2=y
 # CONFIG_PRESTERA is not set
 # CONFIG_NET_VENDOR_MEDIATEK is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_META is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -2782,7 +2776,6 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 #
 # PCS device drivers
 #
-# CONFIG_PCS_XPCS is not set
 # end of PCS device drivers
 
 # CONFIG_PPP is not set
@@ -2854,7 +2847,6 @@ CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_USB is not set
 CONFIG_ATH10K_DEBUG=y
 CONFIG_ATH10K_DEBUGFS=y
-CONFIG_ATH10K_LEDS=y
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
@@ -2943,7 +2935,6 @@ CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192EE is not set
 # CONFIG_RTL8821AE is not set
 # CONFIG_RTL8192CU is not set
-# CONFIG_RTL8192DU is not set
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
 # CONFIG_RTW88 is not set
@@ -3485,7 +3476,6 @@ CONFIG_SPI_MEM=y
 # CONFIG_SPI_CADENCE is not set
 CONFIG_SPI_CADENCE_QUADSPI=y
 # CONFIG_SPI_CADENCE_XSPI is not set
-# CONFIG_SPI_CH341 is not set
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_DW_DMA=y
 # CONFIG_SPI_DW_PCI is not set
@@ -3574,7 +3564,6 @@ CONFIG_PINCTRL_MAX77620=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_IMX_SCMI is not set
 
 #
 # MediaTek pinctrl drivers
@@ -3703,12 +3692,6 @@ CONFIG_GPIO_MAX77620=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
-#
-# GPIO Debugging utilities
-#
-# CONFIG_GPIO_VIRTUSER is not set
-# end of GPIO Debugging utilities
-
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -3723,7 +3706,6 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_REBOOT_MODE=y
 CONFIG_SYSCON_REBOOT_MODE=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -3745,7 +3727,6 @@ CONFIG_BATTERY_BQ27XXX_I2C=y
 # CONFIG_AXP20X_POWER is not set
 # CONFIG_BATTERY_MAX17040 is not set
 CONFIG_BATTERY_MAX17042=m
-# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
@@ -3810,7 +3791,6 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_CHIPCAP2 is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
 # CONFIG_SENSORS_CORSAIR_PSU is not set
-CONFIG_SENSORS_CROS_EC=y
 # CONFIG_SENSORS_DRIVETEMP is not set
 # CONFIG_SENSORS_DS620 is not set
 # CONFIG_SENSORS_DS1621 is not set
@@ -3930,7 +3910,6 @@ CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_INA2XX=m
 # CONFIG_SENSORS_INA238 is not set
 CONFIG_SENSORS_INA3221=m
-# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -4079,7 +4058,6 @@ CONFIG_MFD_HI6421_PMIC=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 CONFIG_MFD_MAX77620=y
@@ -4156,14 +4134,11 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_ROHM_BD718XX=y
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
-# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 CONFIG_MFD_WCD934X=m
 # CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_QCOM_PM8008 is not set
-# CONFIG_MFD_CS40L50_I2C is not set
-# CONFIG_MFD_CS40L50_SPI is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
 # CONFIG_MFD_RSMU_I2C is not set
@@ -4461,7 +4436,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 #
 # Chips&Media media platform drivers
 #
-# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -4503,11 +4477,6 @@ CONFIG_VIDEO_MEDIATEK_VPU=m
 # Qualcomm media platform drivers
 #
 
-#
-# Raspberry Pi media platform drivers
-#
-# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
-
 #
 # Renesas media platform drivers
 #
@@ -4572,8 +4541,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_GC0308 is not set
-# CONFIG_VIDEO_GC05A2 is not set
-# CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145 is not set
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_HI846 is not set
@@ -4583,7 +4550,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 CONFIG_VIDEO_IMX219=m
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX283 is not set
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX296 is not set
 # CONFIG_VIDEO_IMX319 is not set
@@ -4639,7 +4605,7 @@ CONFIG_VIDEO_OV5645=m
 # CONFIG_VIDEO_S5C73M3 is not set
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_VGXY61 is not set
+# CONFIG_VIDEO_ST_VGXY61 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
 
@@ -4682,8 +4648,6 @@ CONFIG_VIDEO_OV5645=m
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
-# CONFIG_VIDEO_MAX96714 is not set
-# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers
 
 #
@@ -4776,21 +4740,18 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_DISPLAY_DP_AUX_BUS=y
 CONFIG_DRM_DISPLAY_HELPER=y
-CONFIG_DRM_BRIDGE_CONNECTOR=y
+CONFIG_DRM_DISPLAY_DP_AUX_BUS=y
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 CONFIG_DRM_DISPLAY_HDCP_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_TTM=m
 CONFIG_DRM_EXEC=y
 CONFIG_DRM_GPUVM=y
 CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_TTM_HELPER=m
-CONFIG_DRM_GEM_DMA_HELPER=y
+CONFIG_DRM_GEM_DMA_HELPER=m
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y
 
@@ -4844,13 +4805,11 @@ CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=y
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # CONFIG_DRM_PANEL_DSI_CM is not set
 CONFIG_DRM_PANEL_LVDS=y
-# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
 # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
@@ -4863,7 +4822,6 @@ CONFIG_DRM_PANEL_INNOLUX_P079ZCA=y
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=y
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
-# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_LG_SW43408 is not set
@@ -5086,7 +5044,6 @@ CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
@@ -5326,7 +5283,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 CONFIG_SND_SOC_AK4613=m
-# CONFIG_SND_SOC_AK4619 is not set
 # CONFIG_SND_SOC_AK4642 is not set
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
@@ -5370,7 +5326,6 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 # CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CS530X_I2C is not set
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
 CONFIG_SND_SOC_DA7219=m
@@ -5378,7 +5333,6 @@ CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=y
 CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES7241=m
-# CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
@@ -5426,7 +5380,6 @@ CONFIG_SND_SOC_RT1015P=m
 # CONFIG_SND_SOC_RT1308_SDW is not set
 # CONFIG_SND_SOC_RT1316_SDW is not set
 # CONFIG_SND_SOC_RT1318_SDW is not set
-# CONFIG_SND_SOC_RT1320_SDW is not set
 CONFIG_SND_SOC_RT5514=m
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
@@ -5493,7 +5446,6 @@ CONFIG_SND_SOC_WCD_CLASSH=m
 CONFIG_SND_SOC_WCD9335=m
 CONFIG_SND_SOC_WCD_MBHC=m
 CONFIG_SND_SOC_WCD934X=m
-# CONFIG_SND_SOC_WCD937X_SDW is not set
 # CONFIG_SND_SOC_WCD938X_SDW is not set
 # CONFIG_SND_SOC_WCD939X_SDW is not set
 # CONFIG_SND_SOC_WM8510 is not set
@@ -6161,7 +6113,6 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_CR0014114 is not set
-CONFIG_LEDS_CROS_EC=m
 # CONFIG_LEDS_EL15203000 is not set
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_LM3532 is not set
@@ -6238,7 +6189,6 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_TTY is not set
-# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -6588,10 +6538,10 @@ CONFIG_CROS_EC_TYPEC=m
 # CONFIG_CROS_HPS_I2C is not set
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CROS_USBPD_NOTIFY=y
-# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_SURFACE_PLATFORMS=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
+# CONFIG_EC_ACER_ASPIRE1 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -7067,7 +7017,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
-# CONFIG_AD7380 is not set
 # CONFIG_AD7476 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD7606_IFACE_SPI is not set
@@ -7082,6 +7031,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD9467 is not set
+# CONFIG_ADI_AXI_ADC is not set
 # CONFIG_AXP20X_ADC is not set
 # CONFIG_AXP288_ADC is not set
 # CONFIG_CC10001_ADC is not set
@@ -7107,7 +7057,6 @@ CONFIG_MAX9611=m
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP3564 is not set
 # CONFIG_MCP3911 is not set
-# CONFIG_MEDIATEK_MT6359_AUXADC is not set
 # CONFIG_MEDIATEK_MT6360_ADC is not set
 CONFIG_MEDIATEK_MT6577_AUXADC=m
 # CONFIG_NAU7802 is not set
@@ -7126,7 +7075,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
-# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1298 is not set
@@ -7178,7 +7126,6 @@ CONFIG_TI_ADS1015=m
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
-# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
@@ -7232,6 +7179,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
 # CONFIG_AD9739A is not set
+# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
@@ -7427,7 +7375,6 @@ CONFIG_SENSORS_ISL29018=m
 CONFIG_VCNL4000=m
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
-# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -7593,7 +7540,6 @@ CONFIG_PWM=y
 CONFIG_PWM_CROS_EC=y
 # CONFIG_PWM_DWC is not set
 # CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_GPIO is not set
 CONFIG_PWM_MTK_DISP=y
 CONFIG_PWM_MEDIATEK=y
 # CONFIG_PWM_PCA9685 is not set
@@ -7609,9 +7555,7 @@ CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
-CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
-# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 CONFIG_MST_IRQ=y
@@ -7758,7 +7702,6 @@ CONFIG_PM_OPP=y
 CONFIG_SLIMBUS=m
 CONFIG_SLIM_QCOM_CTRL=m
 CONFIG_INTERCONNECT=y
-# CONFIG_INTERCONNECT_MTK is not set
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
 # CONFIG_PECI is not set
@@ -7853,7 +7796,6 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=y
 # CONFIG_NETFS_STATS is not set
-# CONFIG_NETFS_DEBUG is not set
 # CONFIG_FSCACHE is not set
 # end of Caches
 
@@ -8178,6 +8120,7 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography
 

device/community/linux-postmarketos-mediatek-mt8173/revert-drm-change.patch

@@ -1,27 +0,0 @@
-From 94cb0ae98fc7e8e0ad0dc4e0d8f0dde2beb681a8 Mon Sep 17 00:00:00 2001
-From: Adam Thiede <me@adamthiede.com>
-Date: Mon, 30 Sep 2024 08:08:23 -0500
-Subject: [PATCH] Revert "drm/mediatek: Support DRM plane alpha in OVL"
-
-This reverts commit bc46eb5d5d7780782c70c7915f59ed25a908d550.
----
- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
-index 9d6d9fd8342e41..3cf02b4eaff6d1 100644
---- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
-+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
-@@ -453,10 +453,8 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,
- 	}
- 
- 	con = ovl_fmt_convert(ovl, fmt);
--	if (state->base.fb) {
--		con |= OVL_CON_AEN;
--		con |= state->base.alpha & OVL_CON_ALPHA;
--	}
-+	if (state->base.fb && state->base.fb->format->has_alpha)
-+		con |= OVL_CON_AEN | OVL_CON_ALPHA;
- 
- 	/* CONST_BLD must be enabled for XRGB formats although the alpha channel
- 	 * can be ignored, or OVL will still read the value from memory.

device/community/linux-postmarketos-qcom-sdm845/APKBUILD

@@ -5,8 +5,8 @@
 
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
-pkgver=6.11.0
-pkgrel=1
+pkgver=6.9.0
+pkgrel=4
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -18,7 +18,7 @@ options="!check !tracedeps
 makedepends="bash bison findutils flex installkernel openssl-dev perl zstd python3"
 
 _config="config-$_flavor.$arch"
-_tag="sdm845-6.11"
+_tag="sdm845-6.9.0-r2"
 
 # Source
 source="
@@ -71,6 +71,6 @@ package() {
 }
 
 sha512sums="
-40a127d280404c61f3c87692b85de6270144f98109b6e026649629e50c8e52a6a067d7f841cbbba6337791b115620894f205016a0dce46e65f9b95bcccff793a  linux-sdm845-6.11.tar.gz
-98b9bf6313079676dd8289a5f7fa79b3ff827e66894683cc2a3f39a2d6905514c9512ead4c8e7681f319fc6d140bf8145a721087fef6558b7fc3bf391eba8506  config-postmarketos-qcom-sdm845.aarch64
+45fb653328776a7b3687b9192979ada93c5ac7c321d54d4b72f47cddc10120982701d4990edc9103f6ec3ffcd2bc917b43ce7fea6ec15a3d3aded2279ecd9226  linux-sdm845-6.9.0-r2.tar.gz
+daf67730b0f8a1280a40ee595e477fd2c86679cd28160227d60821f1feee74de092cb6d2568167086e9edc3f12eafd42024b07cdbbd994f1e71adf6705626391  config-postmarketos-qcom-sdm845.aarch64
 "

device/community/linux-postmarketos-qcom-sm6350/APKBUILD

@@ -2,8 +2,8 @@
 
 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
-pkgver=6.11.0
-pkgrel=0
+pkgver=6.10.5
+pkgrel=3
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -54,6 +54,6 @@ package() {
 }
 
 sha512sums="
-6394edf25f6d4476b3bc26484c6fe6a02e2aa40b74e8526ab07b8257fe11accdd4b037fd7ce4429a246e36aaa443f556f1a9208003569ef044bee439931e93c9  linux-v6.11.0-sm6350.tar.gz
-234683d98b8a526e892bb4547c6e2b10715f171ac2a9ddc20cf47e449b70ba828fee8d00954d37442863ab354ce3ba513fb64a2a53be866733f4f5b6b6d51602  config-postmarketos-qcom-sm6350.aarch64
+5756a8fd466f5c34dcaa9818d274facbe0b0b541ce9d7997b95868b2e84f1491ce8bf7d2714206ad8378d560996b8a736bc3c8505ef8022371644866c841e2a1  linux-v6.10.5-sm6350.tar.gz
+711e5ce6a7e9b491b40270eb23114ee4ad1deeb6312d10ec012abafd0c2cca288f72c4b5f49503f9c12c33ebd6fa3e0dc64ca8323121872d60f7ffd2a0411312  config-postmarketos-qcom-sm6350.aarch64
 "

device/community/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.0 Kernel Configuration
+# Linux/arm64 6.10.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -11,6 +11,8 @@ 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_CC_HAS_ASM_INLINE=y
@@ -165,7 +167,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-# CONFIG_MEMCG_V1 is not set
+CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -241,6 +243,7 @@ CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 
@@ -522,7 +525,6 @@ CONFIG_ARM64_CONTPTE=y
 CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
-# CONFIG_COMPRESSED_INSTALL is not set
 CONFIG_DMI=y
 # end of Boot options
 
@@ -769,6 +771,7 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 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
@@ -888,7 +891,6 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -900,7 +902,6 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1665,9 +1666,6 @@ CONFIG_ARM_PSCI_FW=y
 # Qualcomm firmware drivers
 #
 CONFIG_QCOM_SCM=y
-CONFIG_QCOM_TZMEM=y
-CONFIG_QCOM_TZMEM_MODE_GENERIC=y
-# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_QSEECOM is not set
 # end of Qualcomm firmware drivers
@@ -1927,7 +1925,6 @@ CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
-CONFIG_NET_VENDOR_META=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851_MLL is not set
@@ -2061,7 +2058,6 @@ CONFIG_MDIO_DEVRES=y
 #
 # PCS device drivers
 #
-# CONFIG_PCS_XPCS is not set
 # end of PCS device drivers
 
 # CONFIG_PPP is not set
@@ -2093,7 +2089,6 @@ CONFIG_ATH10K_CE=y
 CONFIG_ATH10K_SNOC=m
 CONFIG_ATH10K_DEBUG=y
 # CONFIG_ATH10K_DEBUGFS is not set
-CONFIG_ATH10K_LEDS=y
 # CONFIG_ATH10K_TRACING is not set
 # CONFIG_WCN36XX is not set
 # CONFIG_ATH11K is not set
@@ -2606,7 +2601,6 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_IMX_SCMI is not set
 CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_IPQ5018 is not set
 # CONFIG_PINCTRL_IPQ5332 is not set
@@ -2719,12 +2713,6 @@ CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
-#
-# GPIO Debugging utilities
-#
-# CONFIG_GPIO_VIRTUSER is not set
-# end of GPIO Debugging utilities
-
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -2740,7 +2728,6 @@ CONFIG_POWER_RESET_QCOM_PON=y
 CONFIG_REBOOT_MODE=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -2759,7 +2746,6 @@ CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -2799,6 +2785,7 @@ CONFIG_HWMON=y
 #
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1029 is not set
@@ -2864,6 +2851,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
@@ -2928,7 +2916,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -3056,7 +3043,6 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 # CONFIG_MFD_MAX77620 is not set
@@ -3125,12 +3111,10 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
-# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 CONFIG_MFD_QCOM_PM8008=y
-# CONFIG_MFD_CS40L50_I2C is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # end of Multifunction device drivers
@@ -3240,17 +3224,14 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DISPLAY_DP_AUX_BUS=y
-CONFIG_DRM_DISPLAY_HELPER=y
-CONFIG_DRM_BRIDGE_CONNECTOR=y
+CONFIG_DRM_DISPLAY_HELPER=m
+CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
-CONFIG_DRM_EXEC=y
+CONFIG_DRM_EXEC=m
 CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_SCHED=y
+CONFIG_DRM_SCHED=m
 
 #
 # I2C encoder or helper chips
@@ -3272,7 +3253,7 @@ CONFIG_DRM_SCHED=y
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_UDL is not set
-CONFIG_DRM_MSM=y
+CONFIG_DRM_MSM=m
 CONFIG_DRM_MSM_GPU_STATE=y
 CONFIG_DRM_MSM_MDSS=y
 # CONFIG_DRM_MSM_MDP4 is not set
@@ -3304,11 +3285,9 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # CONFIG_DRM_PANEL_DSI_CM is not set
 # CONFIG_DRM_PANEL_LVDS is not set
-# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
-CONFIG_DRM_PANEL_HIMAX_HX83112A=y
+CONFIG_DRM_PANEL_HIMAX_HX83112A=m
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -3320,7 +3299,6 @@ CONFIG_DRM_PANEL_HIMAX_HX83112A=y
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
-# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
 # CONFIG_DRM_PANEL_LG_SW43408 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
@@ -3474,7 +3452,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_QCOM_WLED=y
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
@@ -3678,6 +3655,7 @@ CONFIG_HID_LOGITECH=y
 #
 # HID-BPF support
 #
+# CONFIG_HID_BPF is not set
 # end of HID-BPF support
 
 #
@@ -4045,7 +4023,6 @@ CONFIG_LEDS_QCOM_FLASH=y
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
 # CONFIG_LEDS_SGM3140 is not set
-# CONFIG_LEDS_SY7802 is not set
 
 #
 # RGB LED drivers
@@ -4073,7 +4050,6 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_TTY is not set
-# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -4252,12 +4228,10 @@ CONFIG_VIRTIO=y
 # CONFIG_STAGING is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_ARM64_PLATFORM_DEVICES=y
 # CONFIG_EC_ACER_ASPIRE1 is not set
-# CONFIG_EC_LENOVO_YOGA_C630 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -4294,7 +4268,6 @@ CONFIG_COMMON_CLK_QCOM=y
 # CONFIG_CLK_X1E80100_GCC is not set
 # CONFIG_CLK_X1E80100_GPUCC is not set
 # CONFIG_CLK_X1E80100_TCSRCC is not set
-# CONFIG_CLK_QCM2290_GPUCC is not set
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CLK_APCC_MSM8996 is not set
@@ -4306,7 +4279,6 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_IPQ_GCC_9574 is not set
-# CONFIG_IPQ_NSSCC_QCA8K is not set
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8917 is not set
 # CONFIG_MSM_GCC_8939 is not set
@@ -4358,11 +4330,9 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_SDM_LPASSCC_845 is not set
 # CONFIG_SDX_GCC_75 is not set
 CONFIG_SM_CAMCC_6350=y
-# CONFIG_SM_CAMCC_7150 is not set
 # CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_CAMCC_8450 is not set
 # CONFIG_SM_CAMCC_8550 is not set
-# CONFIG_SM_CAMCC_8650 is not set
 CONFIG_SM_DISPCC_6350=y
 # CONFIG_SM_DISPCC_8650 is not set
 # CONFIG_SM_GCC_4450 is not set
@@ -4389,7 +4359,6 @@ CONFIG_SM_GPUCC_6350=y
 # CONFIG_SM_GPUCC_8650 is not set
 # CONFIG_SM_TCSRCC_8550 is not set
 # CONFIG_SM_TCSRCC_8650 is not set
-# CONFIG_SM_VIDEOCC_7150 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
 # CONFIG_SM_VIDEOCC_8250 is not set
 # CONFIG_SM_VIDEOCC_8350 is not set
@@ -4426,7 +4395,6 @@ CONFIG_MAILBOX=y
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 # CONFIG_QCOM_APCS_IPC is not set
-# CONFIG_QCOM_CPUCP_MBOX is not set
 CONFIG_QCOM_IPCC=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
@@ -4539,10 +4507,8 @@ CONFIG_QCOM_COMMAND_DB=y
 CONFIG_QCOM_GENI_SE=y
 # CONFIG_QCOM_GSBI is not set
 CONFIG_QCOM_LLCC=y
-CONFIG_QCOM_MDT_LOADER=y
+CONFIG_QCOM_MDT_LOADER=m
 # CONFIG_QCOM_OCMEM is not set
-CONFIG_QCOM_PD_MAPPER=m
-CONFIG_QCOM_PDR_MSG=m
 # CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 # CONFIG_QCOM_PMIC_GLINK is not set
 CONFIG_QCOM_QMI_HELPERS=y
@@ -4684,6 +4650,7 @@ CONFIG_IIO=y
 # CONFIG_AD7291 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD799X is not set
+# CONFIG_ADI_AXI_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HX711 is not set
@@ -4707,7 +4674,6 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_SD_ADC_MODULATOR is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_VF610_ADC is not set
@@ -4746,7 +4712,6 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
-# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
@@ -4782,6 +4747,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_AD5380 is not set
 # CONFIG_AD5446 is not set
 # CONFIG_AD5593R is not set
+# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_AD5696_I2C is not set
 # CONFIG_DPOT_DAC is not set
 # CONFIG_DS4424 is not set
@@ -4925,7 +4891,6 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
-# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -5059,9 +5024,7 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
-# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 CONFIG_QCOM_PDC=y
@@ -5152,7 +5115,6 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
-CONFIG_TRACE_GPU_MEM=y
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
@@ -5212,7 +5174,6 @@ CONFIG_INTERCONNECT_QCOM_SM6350=y
 # CONFIG_INTERCONNECT_QCOM_SM8550 is not set
 # CONFIG_INTERCONNECT_QCOM_SM8650 is not set
 # CONFIG_INTERCONNECT_QCOM_X1E80100 is not set
-CONFIG_INTERCONNECT_CLK=y
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
 # CONFIG_PECI is not set
@@ -5304,7 +5265,6 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=m
 # CONFIG_NETFS_STATS is not set
-# CONFIG_NETFS_DEBUG is not set
 # CONFIG_FSCACHE is not set
 # end of Caches
 
@@ -5569,6 +5529,7 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography
 
@@ -5895,7 +5856,6 @@ CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
@@ -6217,6 +6177,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
 # CONFIG_TEST_VMALLOC is not set
+# CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set

device/community/soc-qcom-sdm845/APKBUILD

@@ -2,8 +2,8 @@
 # Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=23
-pkgrel=0
+pkgver=22
+pkgrel=3
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -25,7 +25,7 @@ subpackages="
 	$pkgname-vulkan
 "
 
-_ucm_commit="45cb4c634e534ddfb255e85162fe705f94a23015"
+_ucm_commit="aaa7889f7a6de640b4d78300e118457335ad16c0"
 source="
 	10-initramfs-sdm845.files
 	51-qcom-sdm845.conf
@@ -153,7 +153,7 @@ sha512sums="
 28c14f47eaedec577d152001c51753537c98f267ac4a0acf78a304efebe5f6a1b4dc6d501497da9a0a925806a1d9c80b25e001cf9b1eb21efa22cd6a41ff753b  51-qcom-sdm845.conf
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
-af58c9dfcbeb9fe01e433c36e869bef1f2fe03e1087fb28fb6752008d5320b5ac19c32aa64bb88f7d3a619d8e20ab001ec36f11960957d806cc3b14eb30b377d  alsa-ucm-conf-45cb4c634e534ddfb255e85162fe705f94a23015.tar.gz
+62e85ff4d983bd58078633088a6506b8ed9dab88b13adb1af72abd324386a3614ad4af6b3a9594c5a1d1fbdb1891ad906d360764081c83318e9970c94838dfb8  alsa-ucm-conf-aaa7889f7a6de640b4d78300e118457335ad16c0.tar.gz
 6fb4c0bd8b7ed534d855a6732ccff783960e3cfa0e0cc7effcbb93afa00798dec15361a37a3200081bc114c8d266b7a0851cc4e819ad36eabdb47a50c72620d9  call_audio_idle_suspend_workaround.confd
 5a58475b6e2ee1d655f3f23d8dc19e1cb2f32f1dfff3b9a9337d9c5baad1ec24bfaec0fb9cc03f00e5a291bee27c6b8bffbc65157e2bee5d65ef6d1adcb0910b  call_audio_idle_suspend_workaround.initd
 6da0a9209f114354aa2aa1185ec3896a8e0bb1bfce0dc3fc4c0de339cf1389feaa2d724e733c251ff032a5e86d37d9549e94f8f7c7a5accfedbd8a4d6316bbfd  call_audio_idle_suspend_workaround.sh

device/main/device-pine64-pinephone/device-pine64-pinephone.pre-upgrade

@@ -3,7 +3,7 @@
 # legacy u-boot images are no longer necessary, but were generated outside of
 # packaging so remove them here to prevent a failed upgrade if /boot is too
 # full
-# see: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/2449
+# see: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2449
 rm -f /boot/uImage-postmarketos-allwinner
 rm -f /boot/uInitrd-postmarketos-allwinner
 

device/main/device-purism-librem5/APKBUILD

@@ -4,7 +4,7 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
 pkgver=4
-pkgrel=3
+pkgrel=2
 _confver=64
 _purismrel=1
 # <librem5-base ver>.<purism release>
@@ -208,11 +208,11 @@ sha512sums="
 703d12826464eb2bdb6bf4a7d10adb73b37564d3792794523b252f0f7cb66184add150a6938580cc33615281d1c0abd7ff158ae2143b89fa28c0cd3dc367e5ff  deviceinfo
 138ed85e6509e4611bf21a0061c312e6c2ce60f722ee9e4565d19c5f025301d4df3fa321343524219a54b20c5288dc6ed1b058ac66f4d608af22eb5bc83e84c6  modules-initfs
 ccb47fd421c5e35a8def8e6fb61dad99e42cf542690068a68f90c257e41d33f45f1069db0a8d89372d9029681812957033995639a6a8a5e3eed48019325e0f4d  flash_script.lst
-79a7088139629745a19b0465ac632d61ce7c513fc0bb6ea71784cd615f5ab8b32bee5ea903d7d7eb1a4508c4844f90f0435d789ea2642a529dd930d0de631ca5  modprobe.d_rsi.conf
+3f62c04eb92d850e32d5e1b17534dec753563342ea6c4f9dc2572700d4f6eeb8ae8cd8e8e4f1b0f5c61f21d87bc61c02212f27313986157220003d78e2d69505  modprobe.d_rsi.conf
 a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f6e65a5d1b1a9099936382c99b49a44303f7b6d77a075a471  modules-load.d_librem5.conf
 8ef4ec7a9e9a4fb801d207e7d94b627aacc9243a93b0ec28e0823a6f44b8102416c040e4ddf499f87bb9dfa960cf6f627b008b79f197f6814b3fd881e18ae8ef  pcscd-librem5-reader.conf
 2618b40eebd3602066ee75ab85cbdbb4cfee498def9879c95a304f05a6eeedf1ab28c5dd9fa5efc8f88c790f49c96458c61d5dfe8a3ca0f96bcc0e244313ab01  pcscd-librem5.initd
-59634b85867a65191934e365ccde40ae03dbad6cf3dc3cc513daf3265dd1105af7cca7d52ef8e20f40fdbdbeb74aee5a26908ae8de083a80e223d2c275a8135d  uboot-script.cmd
+976c36b469a5c36e1823c35e4e1bc41d88f12c6710d1d4f8f904349ab06ee58a6c728dc4b705b7578427e322c57ecd4e4c61fc62effc88e25987f6ea3e6ffcc2  uboot-script.cmd
 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616  xorg.conf
 fad386071fc45f9880a94cc8004fabd5d98b3e6a12606c98d8e72e0208f22ab54f03b921f5967a959782507e2bff67d2fa92e46d8cd242011a3afcdbda529279  70-librem5-xwayland-accel.sh
 b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378  0001-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch

device/main/device-purism-librem5/modprobe.d_rsi.conf

@@ -2,7 +2,7 @@
 blacklist rsi_91x
 blacklist rsi_sdio
 # Redpine WIFI module
-# Note: LE coex. disabled, see: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1042
+# Note: LE coex. disabled, see: https://gitlab.com/postmarketOS/pmaports/-/issues/1042
 options redpine_91x dev_oper_mode=5 rsi_zone_enabled=1 antenna_diversity=1
 # Note: this line re-enables LE, replace above line with this one when LE
 # is fixed:

device/main/device-purism-librem5/uboot-script.cmd

@@ -23,7 +23,7 @@ setenv bootargs init=/init.sh rw console=ttymxc0,115200 PMOS_FORCE_PARTITION_RES
 # Default to "-r4" if board_rev isn't set, since there are apparently Evergreen
 # boards that either 1) identify as r4, 2) identify as r5 (or something else?),
 # or 3) don't identify as anything(?).
-# See: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1643#note_1147248594
+# See: https://gitlab.com/postmarketOS/pmaports/-/issues/1643#note_1147248594
 dtb_file=imx8mq-librem5-r4.dtb
 if itest.s "x3" == "x$board_rev" ; then
         dtb_file=imx8mq-librem5-r3.dtb

device/main/firmware-pine64-rtl8723bt/APKBUILD

@@ -39,7 +39,7 @@ package() {
 	#
 	# Ref:
 	#
-	# - https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3179
+	# - https://gitlab.com/postmarketOS/pmaports/-/issues/3179
 	#
 	# - https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=ed9c1349f8ebae720f3572ad3e74af59bfe345d7
 

device/main/linux-postmarketos-allwinner/0001-dts-add-dontbeevil-pinephone-devkit.patch

@@ -1,4 +1,4 @@
-From b1aa006649db47a3a7f4f8a0cb9867bc553d9609 Mon Sep 17 00:00:00 2001
+From d4332814a2b716a54a743412559cd98cb050d652 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Sat, 20 Apr 2019 01:19:48 +0200
 Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
@@ -17,7 +17,7 @@ Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
  create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts
 
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 0a0ec8a39259..0fb55ce917d7 100644
+index 38867649c063..5cddf8655d64 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
 @@ -1,6 +1,8 @@
@@ -532,5 +532,5 @@ index 000000000000..15a91f2d6202
 +	status = "disabled";
 +};
 -- 
-2.46.1
+2.45.0
 

device/main/linux-postmarketos-allwinner/0002-dts-add-pinetab-dev-old-display-panel.patch

@@ -1,4 +1,4 @@
-From 5c671df3771c2ccda1e3537949050bab1d012e8f Mon Sep 17 00:00:00 2001
+From 915dabee2a8213d0fc343179e815d4639c184d32 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:42:01 +0200
 Subject: [PATCH] dts: add pinetab-dev (old display panel)
@@ -10,7 +10,7 @@ Subject: [PATCH] dts: add pinetab-dev (old display panel)
  create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
 
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 0fb55ce917d7..c17cc1afa402 100644
+index 5cddf8655d64..8cfed65e268d 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
 @@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.2.dtb
@@ -57,5 +57,5 @@ index 000000000000..1e287f2fb9f3
 +	};
 +};
 -- 
-2.46.1
+2.45.0
 

device/main/linux-postmarketos-allwinner/0003-dts-pinetab-add-missing-ohci1.patch

@@ -1,4 +1,4 @@
-From c52f6eb387d094ea181bb156440b9f5014361b39 Mon Sep 17 00:00:00 2001
+From 388517c7e13be56a364e48820e64a7f9376b1248 Mon Sep 17 00:00:00 2001
 From: Oliver Smith <ollieparanoid@postmarketos.org>
 Date: Tue, 20 Oct 2020 11:11:48 +0200
 Subject: [PATCH] dts: pinetab: add missing ohci1
@@ -13,7 +13,7 @@ https://gitlab.com/pine64-org/linux/-/commit/69ae7087ec51b09bb6a0afb53dddb5eb030
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index 419fe19b4a6f..e30034a1553b 100644
+index 37466d70bb25..29e527e499db 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 @@ -311,6 +311,10 @@ &ohci0 {
@@ -28,5 +28,5 @@ index 419fe19b4a6f..e30034a1553b 100644
  	status = "okay";
  };
 -- 
-2.46.1
+2.45.0
 

device/main/linux-postmarketos-allwinner/0004-dts-pinetab-make-audio-routing-consistent-with-pinep.patch

@@ -1,4 +1,4 @@
-From 91f8fcf39d8465ba7d6c8147650eb564915225e6 Mon Sep 17 00:00:00 2001
+From eba1ff43e3bb9c7624f9678e7e9528663f89380e Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:44:51 +0200
 Subject: [PATCH] dts: pinetab: make audio routing consistent with
@@ -9,7 +9,7 @@ Subject: [PATCH] dts: pinetab: make audio routing consistent with
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index e30034a1553b..b2a3c0f97ce1 100644
+index 29e527e499db..230eedb39d50 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 @@ -494,13 +494,13 @@ &sound {
@@ -32,5 +32,5 @@ index e30034a1553b..b2a3c0f97ce1 100644
  			"ADCR", "Right ADC",
  			"Internal Microphone Left", "MBIAS",
 -- 
-2.46.1
+2.45.0
 

device/main/linux-postmarketos-allwinner/0005-dts-pinephone-drop-modem-power-node.patch

@@ -1,4 +1,4 @@
-From 48e55b423aa0347751c58c90c5d6846943736122 Mon Sep 17 00:00:00 2001
+From 2ee09f1d8da9d5fcf7b2579525c87151ee0896a2 Mon Sep 17 00:00:00 2001
 From: Clayton Craft <clayton@craftyguy.net>
 Date: Wed, 16 Dec 2020 20:16:14 -0800
 Subject: [PATCH] dts: pinephone: drop modem-power node
@@ -139,7 +139,7 @@ index ec4927dfe9dc..57b651d695af 100644
 +	gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
 +};
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index dcd392fe6027..24b7f01fd901 100644
+index fe7f2113a727..68392dee4407 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 @@ -310,6 +310,17 @@ ec25_codec: ec25-codec {
@@ -160,7 +160,7 @@ index dcd392fe6027..24b7f01fd901 100644
  	i2c_csi: i2c-csi {
  		compatible = "i2c-gpio";
  		sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PE13 */
-@@ -389,6 +400,7 @@ reg_usb_5v: usb-5v {
+@@ -382,6 +393,7 @@ reg_usb_5v: usb-5v {
  	reg_vbat_bb: vbat-bb {
  		compatible = "regulator-fixed";
  		regulator-name = "vbat-bb";
@@ -169,5 +169,5 @@ index dcd392fe6027..24b7f01fd901 100644
  		regulator-max-microvolt = <3500000>;
  		gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
 -- 
-2.46.1
+2.45.0
 

device/main/linux-postmarketos-allwinner/0006-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch

@@ -1,4 +1,4 @@
-From 39c6fba7dd220d7349e0a425e9aaaabe979dd924 Mon Sep 17 00:00:00 2001
+From dee9e527e2f59edf679dffbd0dad2179be9e9965 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:27:30 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
@@ -8,10 +8,10 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
  1 file changed, 27 insertions(+)
 
 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index bf40057c5cf3..55a8d221b002 100644
+index 20e3df1c59d4..d37108020fb7 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2381,6 +2381,30 @@ static const struct panel_desc hannstar_hsd101pww2 = {
+@@ -2344,6 +2344,30 @@ static const struct panel_desc hannstar_hsd101pww2 = {
  	.connector_type = DRM_MODE_CONNECTOR_LVDS,
  };
  
@@ -42,7 +42,7 @@ index bf40057c5cf3..55a8d221b002 100644
  static const struct drm_display_mode hitachi_tx23d38vm0caa_mode = {
  	.clock = 33333,
  	.hdisplay = 800,
-@@ -4717,6 +4741,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4513,6 +4537,9 @@ static const struct of_device_id platform_of_match[] = {
  	}, {
  		.compatible = "hit,tx23d38vm0caa",
  		.data = &hitachi_tx23d38vm0caa
@@ -53,5 +53,5 @@ index bf40057c5cf3..55a8d221b002 100644
  		.compatible = "innolux,at043tn24",
  		.data = &innolux_at043tn24,
 -- 
-2.46.1
+2.45.0
 

device/main/linux-postmarketos-allwinner/0007-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch

@@ -1,4 +1,4 @@
-From 21d71ed910712ed81eef6cf6254d89fe6d49c3a1 Mon Sep 17 00:00:00 2001
+From 538c7faf1059027cb62f2e5ec4931a8fccaa3976 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:29:37 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
@@ -10,10 +10,10 @@ Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
  create mode 100644 arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts
 
 diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index 54b156fca9bf..77593039273c 100644
+index 7c7fb94d2153..097614b95ff2 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
-@@ -111,6 +111,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
+@@ -110,6 +110,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
  	sun6i-a31-mele-a1000g-quad.dtb \
  	sun6i-a31s-colorfly-e708-q1.dtb \
  	sun6i-a31s-cs908.dtb \
@@ -131,5 +131,5 @@ index 000000000000..4fcba20ffe48
 +	status = "okay";
 +};
 -- 
-2.46.1
+2.45.0
 

device/main/linux-postmarketos-allwinner/0008-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch

@@ -1,4 +1,4 @@
-From 6aa3e90d38c53c76b31ecc33e190605f0b63d554 Mon Sep 17 00:00:00 2001
+From c8bf750c05bff5c271c1f51135d75e5641b0c58a Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:11:22 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
@@ -8,10 +8,10 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
  1 file changed, 27 insertions(+)
 
 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 55a8d221b002..abdf57dc2a63 100644
+index d37108020fb7..b269ddadd64f 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2301,6 +2301,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
+@@ -2264,6 +2264,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
  	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
  };
  
@@ -42,7 +42,7 @@ index 55a8d221b002..abdf57dc2a63 100644
  static const struct display_timing hannstar_hsd070pww1_timing = {
  	.pixelclock = { 64300000, 71100000, 82000000 },
  	.hactive = { 1280, 1280, 1280 },
-@@ -4729,6 +4753,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4525,6 +4549,9 @@ static const struct of_device_id platform_of_match[] = {
  	}, {
  		.compatible = "giantplus,gpm940b0",
  		.data = &giantplus_gpm940b0,
@@ -53,5 +53,5 @@ index 55a8d221b002..abdf57dc2a63 100644
  		.compatible = "hannstar,hsd070pww1",
  		.data = &hannstar_hsd070pww1,
 -- 
-2.46.1
+2.45.0
 

device/main/linux-postmarketos-allwinner/0009-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch

@@ -1,4 +1,4 @@
-From b346724c85c5d7852eab9b9902fd2f761185df7c Mon Sep 17 00:00:00 2001
+From 4b4c85b0a093be28ec9a8a72ef3a3f764fb28e03 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:18:58 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
@@ -10,7 +10,7 @@ Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
  create mode 100644 arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts
 
 diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index 77593039273c..ddc3b0deab8c 100644
+index 097614b95ff2..902b8f6752a0 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
 @@ -36,6 +36,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
@@ -274,5 +274,5 @@ index 000000000000..5f17902410c1
 +	status = "okay";
 +};
 -- 
-2.46.1
+2.45.0
 

device/main/linux-postmarketos-allwinner/0010-eMMC-workaround.patch

@@ -1,4 +1,4 @@
-From cd0734143da954f0a4bda9c40b353d55f9cacf66 Mon Sep 17 00:00:00 2001
+From 125b782564a7dac6e6d1137e8103e2613b12600e Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Sat, 24 Aug 2019 01:36:44 +0200
 Subject: [PATCH] eMMC workaround
@@ -34,5 +34,5 @@ index e9370c736497..a4abd589e95d 100644
  
  	ret = mmc_of_parse(mmc);
 -- 
-2.46.1
+2.45.0
 

device/main/linux-postmarketos-allwinner/0011-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch

@@ -1,4 +1,4 @@
-From e166f056c5a77c2258f8c1581d9b34de76f4a839 Mon Sep 17 00:00:00 2001
+From c824f1e06e282be26c78918cb15f2dd1c6687e5e Mon Sep 17 00:00:00 2001
 From: Maxim Karasev <begs@disroot.org>
 Date: Sat, 4 Sep 2021 14:56:01 +0300
 Subject: [PATCH] arm64: dts: allwinner: orangepi-3: fix ethernet
@@ -10,7 +10,7 @@ patch from LibreELEC tree.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-index 332a9fe83ccd..6e53dadf543e 100644
+index 218c26c59429..a424eded0016 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
 @@ -145,7 +145,7 @@ hdmi_out_con: endpoint {
@@ -34,5 +34,5 @@ index 332a9fe83ccd..6e53dadf543e 100644
  };
  
 -- 
-2.46.1
+2.45.0
 

device/main/linux-postmarketos-allwinner/0012-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch

@@ -0,0 +1,295 @@
+From b9e47d013dac71b2f6d6c877222aa128138c3099 Mon Sep 17 00:00:00 2001
+From: Denis Burkov <hitechshell@mail.ru>
+Date: Mon, 11 Mar 2024 18:23:39 +0500
+Subject: [PATCH] ARM: dts: allwinner: sun5i-a13-pocketbook-614-plus: Add
+ initial devicetree
+
+---
+ arch/arm/boot/dts/allwinner/Makefile          |   2 +
+ .../sun5i-a13-pocketbook-614-plus.dts         | 254 ++++++++++++++++++
+ 2 files changed, 256 insertions(+)
+ create mode 100644 arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts
+
+diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
+index 902b8f6752a0..f7eb88a5709b 100644
+--- a/arch/arm/boot/dts/allwinner/Makefile
++++ b/arch/arm/boot/dts/allwinner/Makefile
+@@ -62,6 +62,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
+ 	sun5i-a13-olinuxino.dtb \
+ 	sun5i-a13-olinuxino-micro.dtb \
+ 	sun5i-a13-pocketbook-touch-lux-3.dtb \
++	sun5i-a13-pocketbook-614-plus.dtb \
+ 	sun5i-a13-q8-tablet.dtb \
+ 	sun5i-a13-utoo-p66.dtb \
+ 	sun5i-gr8-chip-pro.dtb \
+@@ -83,6 +84,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
+ 	sun5i-a13-olinuxino.dtb \
+ 	sun5i-a13-olinuxino-micro.dtb \
+ 	sun5i-a13-pocketbook-touch-lux-3.dtb \
++	sun5i-a13-pocketbook-614-plus.dtb \
+ 	sun5i-a13-q8-tablet.dtb \
+ 	sun5i-a13-utoo-p66.dtb \
+ 	sun5i-gr8-chip-pro.dtb \
+diff --git a/arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts b/arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts
+new file mode 100644
+index 000000000000..cad9ce5f2a6f
+--- /dev/null
++++ b/arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts
+@@ -0,0 +1,254 @@
++// SPDX-License-Identifier: GPL-2.0+
++/*
++ * Copyright 2024 Denis Burkov <hitechshell@mail.ru>
++ */
++
++/dts-v1/;
++#include "sun5i-a13.dtsi"
++#include "sunxi-common-regulators.dtsi"
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/interrupt-controller/irq.h>
++
++/ {
++	model = "PocketBook 614 Plus";
++	compatible = "pocketbook,614-plus", "allwinner,sun5i-a13";
++
++	aliases {
++		serial0 = &uart1;
++		i2c0 = &i2c0;
++		i2c1 = &i2c1;
++		i2c2 = &i2c2;
++		rtc0 = &pcf8563;
++	};
++
++	chosen {
++		stdout-path = "serial0:115200n8";
++	};
++
++	leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&led_pins_pocketbook>;
++
++		led {
++			gpios = <&pio 4 8 GPIO_ACTIVE_LOW>; /* PE8 */
++			default-state = "on";
++		};
++	};
++
++	gpio-keys {
++		compatible = "gpio-keys";
++		autorepeat;
++		label = "GPIO Keys";
++		pinctrl-names = "default";
++		pinctrl-0 = <&pocketbook_btn_pins>;
++
++		key-right {
++			label = "Right";
++			linux,code = <KEY_NEXT>;
++			gpios = <&pio 6 9 GPIO_ACTIVE_LOW>; /* PG9 */
++		};
++
++		key-left {
++			label = "Left";
++			linux,code = <KEY_PREVIOUS>;
++			gpios = <&pio 6 10 GPIO_ACTIVE_LOW>; /* PG10 */
++		};
++	};
++
++	reg_3v3_mmc0: regulator-mmc0 {
++		compatible = "regulator-fixed";
++		regulator-name = "vdd-mmc0";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		pinctrl-names = "default";
++		pinctrl-0 = <&pocketbook_reg_mmc0_pin>;
++		gpio = <&pio 4 4 GPIO_ACTIVE_LOW>; /* PE4 */
++		vin-supply = <&reg_vcc3v3>;
++	};
++};
++
++&cpu0 {
++	cpu-supply = <&reg_dcdc2>;
++};
++
++&ehci0 {
++	status = "okay";
++};
++
++&i2c0 {
++	status = "okay";
++
++	axp209: pmic@34 {
++		compatible = "x-powers,axp209";
++		reg = <0x34>;
++		interrupts = <0>;
++	};
++};
++
++#include "axp209.dtsi"
++
++&i2c1 {
++	status = "okay";
++
++	pcf8563: rtc@51 {
++		compatible = "nxp,pcf8563";
++		reg = <0x51>;
++		#clock-cells = <0>;
++	};
++};
++
++&i2c2 {
++	status = "okay";
++
++	/* Touchpanel is connected here. */
++};
++
++&lradc {
++	vref-supply = <&reg_ldo2>;
++	status = "okay";
++
++	button-300 {
++		label = "Down";
++		linux,code = <KEY_DOWN>;
++		channel = <0>;
++		voltage = <300000>;
++	};
++
++	button-700 {
++		label = "Up";
++		linux,code = <KEY_UP>;
++		channel = <0>;
++		voltage = <700000>;
++	};
++
++	button-1000 {
++		label = "Left";
++		linux,code = <KEY_LEFT>;
++		channel = <0>;
++		voltage = <1000000>;
++	};
++
++	button-1200 {
++		label = "Menu";
++		linux,code = <KEY_MENU>;
++		channel = <0>;
++		voltage = <1200000>;
++	};
++
++	button-1500 {
++		label = "Right";
++		linux,code = <KEY_RIGHT>;
++		channel = <0>;
++		voltage = <1500000>;
++	};
++};
++
++&mmc0 {
++	vmmc-supply = <&reg_3v3_mmc0>;
++	bus-width = <4>;
++	cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
++	status = "okay";
++};
++
++&mmc2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc2_4bit_pc_pins>;
++	vmmc-supply = <&reg_vcc3v3>;
++	bus-width = <4>;
++	non-removable;
++	status = "okay";
++};
++
++&ohci0 {
++	status = "okay";
++};
++
++&otg_sram {
++	status = "okay";
++};
++
++&pio {
++	led_pins_pocketbook: led-pin {
++		pins = "PE8";
++		function = "gpio_out";
++	};
++	pocketbook_btn_pins: pocketbook_btn_pins {
++		pins = "PG9", "PG10";
++		function = "gpio_in";
++		bias-pull-up;
++	};
++	pocketbook_reg_mmc0_pin: pocketbook_reg_mmc0_pin {
++		pins = "PE4";
++		function = "gpio_out";
++	};
++};
++
++&reg_dcdc2 {
++	regulator-always-on;
++	regulator-min-microvolt = <1000000>;
++	regulator-max-microvolt = <1500000>;
++	regulator-name = "vdd-cpu";
++};
++
++&reg_dcdc3 {
++	regulator-always-on;
++	regulator-min-microvolt = <1000000>;
++	regulator-max-microvolt = <1400000>;
++	regulator-name = "vdd-int-dll";
++};
++
++&reg_ldo1 {
++	regulator-name = "vdd-rtc";
++};
++
++&reg_ldo2 {
++	regulator-always-on;
++	regulator-min-microvolt = <3000000>;
++	regulator-max-microvolt = <3000000>;
++	regulator-name = "avcc";
++};
++
++&reg_ldo3 {
++	regulator-min-microvolt = <3300000>;
++	regulator-max-microvolt = <3300000>;
++	regulator-name = "vcc-wifi";
++};
++
++&reg_usb0_vbus {
++	status = "okay";
++	gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
++};
++
++&reg_usb1_vbus {
++	gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */
++	status = "okay";
++};
++
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart1_pg_pins>;
++	status = "okay";
++};
++
++&usb_otg {
++	dr_mode = "otg";
++	status = "okay";
++};
++
++&usb_power_supply {
++	status = "okay";
++};
++
++&battery_power_supply {
++	status = "okay";
++};
++
++&usbphy {
++	usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */
++	usb0_vbus_det-gpios = <&axp_gpio 1 GPIO_ACTIVE_HIGH>;
++	usb0_vbus-supply = <&reg_usb0_vbus>;
++	usb1_vbus-supply = <&reg_usb1_vbus>;
++	status = "okay";
++};
+-- 
+2.45.0
+

device/main/linux-postmarketos-allwinner/APKBUILD

@@ -1,11 +1,11 @@
-# Maintainer: Arnav Singh <me@arnavion.dev>
-# Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
+# Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
+# Co-Maintainer: Arnav Singh <me@arnavion.dev>
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=6.11.0_git20240915
-pkgrel=0
-_tag="orange-pi-6.11-20240915-2344"
+pkgver=6.9.10_git20240721
+pkgrel=5
+_tag="orange-pi-6.9-20240721-2345"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -43,6 +43,7 @@ source="$pkgname-$_tag.tar.gz::https://codeberg.org/megi/linux/archive/$_tag.tar
 	0009-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
 	0010-eMMC-workaround.patch
 	0011-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+	0012-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch
 	"
 builddir="$srcdir/linux"
 
@@ -79,18 +80,19 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
 }
 sha512sums="
-8ade8d4c15c9cd1e27a2cc5a93d98e50597824d98995d69ab1b428677ad9e8232704184f9eafd36986f88b783d39735c16210b542aa346d37679a2ccfcfca835  linux-postmarketos-allwinner-orange-pi-6.11-20240915-2344.tar.gz
-d6b6ac843e93aa26c0d9ec1c03d2d3d71200bc802119d7e7bd76efabeb30fd2cfdfabb22a60ee5e078a13f9a56bd09531ee8acc43e293565f9bd24383ae8573f  config-postmarketos-allwinner.aarch64
-8d918a9f28a3e47feebcf53732b0c20d9c0f1068ccda01cbd5d1d2c8c41183899d8fbfb95f773ad9468d863ceaeaf9d35cfb09603d4b5c52f55673efad98bf2b  config-postmarketos-allwinner.armv7
-54bb653f2eec755d831e4c3c7d5a202c09e8d738335d79664879fea6783c54ea74a935259e77bbbe748138a17e92f421ab3e6bd5b07f7e970fd7b22deebcb84b  0001-dts-add-dontbeevil-pinephone-devkit.patch
-1bfff7c0bd3c6761520c444968b9d61b9c43a733d398628dbe12134858a2803b4761117cd2946e86595a3dd2cbffb395c075502dafa40d9fa97e298f49701eb2  0002-dts-add-pinetab-dev-old-display-panel.patch
-91d10d8d377e3f957f76b634a2e075a8927462621610a12be3fbb7e233580bfbb41e0bc5dab06d16eb59fda54a61c4d0415de7b07a7a3de4b46c7f33d7c00aa3  0003-dts-pinetab-add-missing-ohci1.patch
-27f740236f9612616984bb25fee9970b5874b1f4560fdad45738174953cc00c6b6632e6beb384c84d7d18333c1788a49c20ba32ab360a0a7deda17fbadcaf838  0004-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
-ac775aef3fcece0d1bb18dd6df40e84ed616549a9f4369da196bc3f92da9eaab1d388e8c38ae8082bcf18884f7cda9e8a226fa79442af3bdfade8acfcab88685  0005-dts-pinephone-drop-modem-power-node.patch
-0fe41ef47ace057d4f4bdab2c9f8c908ea4f16f6b118432c71c2a2ad467286532a62dffdbfe0e46781619eca449f11a6d8b13c18e1859a9aaa8a3208156e75a9  0006-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
-029d2e5863af00bbfe1e6a7fa2455d8773a475434881f528d9c868a9b04c6173c13e9dc63d51920142a89f6d66d6e49d8d14577b243d6c15427dfe2bf2788a8d  0007-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
-fa4da8e9b43dfa217afb49fe7c83d7a0a59b1a1bef31d7228c8c5560df36c61bfaaff4134d31655c24e791106a7e75b6797d91f487b802133136d8cb79b32572  0008-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
-7393d67d1144c61bc327a6ce571d4c2b043576a356a74ec74384afc667bc044ecbeb57d2218523b83f84bc873b1b3ae3161b7f8270113953092bb55bbeb89aeb  0009-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
-1d922045f835beec1e1a652ae6c2cf7c0081d114bfa4a9bf03c6fdbd79827d9600aae7c79b0740b354bf5aa9c1bd131ced5e939fb1b3e01777e93fcd17dd4f19  0010-eMMC-workaround.patch
-359cda536862c90f0a5c7e87e12448982650c9451921cbad6d611887031ac2c6d0b619666c557acadedf12bc8c27511f118deb97b8e88c76fd09bc18462ed844  0011-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+c6081383741fe883d8f6e223caa45d7ecf179f4cd0c759432bbbb2e43603088840393a0cf58735ab5dda4dbf5e2655d8c9b053a74b029ac4768c200ff6ca6f65  linux-postmarketos-allwinner-orange-pi-6.9-20240721-2345.tar.gz
+3281e69061af98020adf412773a187cb3245b26e0dc22c29a08f37c64360e8ad23a5ea2c4cc19365e2c2ed07d7aae0d63e9e116a9f0badb25584dfe763f3476c  config-postmarketos-allwinner.aarch64
+0011646badbea59ecc670667252d0f6b9fe84c05e43cd3583f7730de526d072f29f47100f65d17dbf84d1284ed6b6cae8eb9d7b6a8df33a178cdfa376402b2e1  config-postmarketos-allwinner.armv7
+a1fe1a21c34062eb92b6a4a9d2ef330d0e745859af283ccf05fc899ec263f9d452c1399c29620a0e4c748eca4b0c13645668b2fc0dc72f5703426d472f1294be  0001-dts-add-dontbeevil-pinephone-devkit.patch
+0ef26b34fa834c119ebff6daa27b1dd3fac27448d6a40c0b2022a00c239dad0ef3e2b3ab3f9eec5460f921c9c6ea21db360adc175a7e658d5c34c5d0aacc498f  0002-dts-add-pinetab-dev-old-display-panel.patch
+d37d929100a9de9431cc3cef6b714b61b5af9633e35a2880fcc8b60279fdc9ab65198fa70d01e070a9f263818d994b9b851973bb079ddea1ca66d2b7964f365d  0003-dts-pinetab-add-missing-ohci1.patch
+e368935e8e1a2380b0b42961ca65e7ebb842916e80b7b3e96211d5091413d5b8112e60f2437f82795e9c21183411f81daf1f2806b7a93b0c03dca0a64e25f079  0004-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+e4dd137537cecc8cfbb2152120134ee4fb19b930ed0e66313c414fb14061f9d2dd4c280cfbde722f8f39531868823c8f12ec79e45800f5c6e0ded03475557f79  0005-dts-pinephone-drop-modem-power-node.patch
+0234490da9ea6d172ccea95092ab8a0623d2b57d43b0066d0b77a096b4a5e2a02047579f12b09d2e6bc1b77a3f9ea67dc26e9d5c02b947a7126f822132c85d30  0006-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+09e8a2b06b45bb0be75a4c09f6a9d165861a950bf6ed1cd91faa493710dd9fdc0aa35a38e23a731bb3f281c30c353310e4a17cdea3ddc6ab7ec3436722eb3b07  0007-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+96d7b7d8161dcd7379092b6aec531ca47ee0566c308057aec2f934256f67ee9f3dcd2fb7ca592b056a5305600ea4125932c96f2c244966d7d46f9b1f3fb77052  0008-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+22cf608d79337aee6354e7db6bf1f177a6b4ab89f7b26da46e0cf2e280978ace7203829a0e87675449ef41b488ab114cedd5ab911e326b87fa823a0073c8d1fc  0009-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+898f1227fe27e38706ea8e6e2846cbc9bded328090ddb457733cf6417f2e1da5bac2d9caa753b29a0667a2733a937b9d447b666a070462a93d1cfea3f88daea7  0010-eMMC-workaround.patch
+4acfd79aa2978d6b8078fbd7649a2dda4ef5a1e03b52d7e034a7cc40b5a7349c4dc741fab9cb7722fa61eb022fd270719ed5257ac8487796c9e2b1135a123e86  0011-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+0770f510a12f8ec29fa2798682b0687438f733634df0b339876b8181c08cd154904412aa88d5dd5df336803da3a4f5c274cba5008be533e036dc5deb3c41fb17  0012-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch
 "

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.0 Kernel Configuration
+# Linux/arm64 6.9.10 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -115,7 +115,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_SCHED_HW_PRESSURE=y
+CONFIG_SCHED_THERMAL_PRESSURE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
@@ -137,7 +137,6 @@ CONFIG_RCU_EXPERT=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 # CONFIG_FORCE_TASKS_RCU is not set
-CONFIG_NEED_TASKS_RCU=y
 CONFIG_TASKS_RCU=y
 # CONFIG_FORCE_TASKS_RUDE_RCU is not set
 CONFIG_TASKS_RUDE_RCU=y
@@ -180,12 +179,11 @@ CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
 CONFIG_CC_NO_STRINGOP_OVERFLOW=y
 CONFIG_ARCH_SUPPORTS_INT128=y
-CONFIG_SLAB_OBJ_EXT=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-# CONFIG_MEMCG_V1 is not set
+CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -243,6 +241,7 @@ CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
@@ -259,6 +258,7 @@ CONFIG_RSEQ=y
 CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 
@@ -311,7 +311,6 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
 # Platform selection
 #
 # CONFIG_ARCH_ACTIONS is not set
-# CONFIG_ARCH_AIROHA is not set
 CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_APPLE is not set
@@ -392,7 +391,6 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
-CONFIG_ARM64_ERRATUM_3194386=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
@@ -530,7 +528,6 @@ CONFIG_CMDLINE="console=ttyAMA0"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_EFI is not set
-# CONFIG_COMPRESSED_INSTALL is not set
 # end of Boot options
 
 #
@@ -697,7 +694,6 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_PMD_MKWRITE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_ARCH_WANTS_EXECMEM_LATE=y
 CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@@ -735,7 +731,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
 CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
-CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
 
 #
 # GCOV-based kernel profiling
@@ -755,6 +750,7 @@ CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_DEBUG is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -780,9 +776,11 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 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
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
 # CONFIG_BLK_WBT is not set
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
@@ -847,7 +845,6 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=m
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -859,7 +856,6 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -871,7 +867,7 @@ CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_GUP_FAST=y
+CONFIG_HAVE_FAST_GUP=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
@@ -901,7 +897,6 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
 CONFIG_THP_SWAP=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_SYSFS is not set
@@ -932,7 +927,6 @@ CONFIG_LRU_GEN_WALKS_MMU=y
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
-CONFIG_EXECMEM=y
 
 #
 # Data Access Monitoring
@@ -1866,7 +1860,6 @@ CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
 # CONFIG_BAREUDP is not set
 # CONFIG_GTP is not set
-# CONFIG_PFCP is not set
 # CONFIG_AMT is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
@@ -1902,7 +1895,6 @@ CONFIG_SUN4I_EMAC=y
 # CONFIG_NET_VENDOR_LITEX is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
-CONFIG_NET_VENDOR_META=y
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -1949,7 +1941,6 @@ CONFIG_FIXED_PHY=y
 #
 # MII PHY device drivers
 #
-# CONFIG_AIR_EN8811H_PHY is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_ADIN_PHY is not set
 # CONFIG_ADIN1100_PHY is not set
@@ -1992,7 +1983,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_REALTEK_PHY=m
 # CONFIG_RENESAS_PHY is not set
 # CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_RK630_PHY is not set
 CONFIG_SMSC_PHY=m
 # CONFIG_STE10XP is not set
 # CONFIG_TERANETICS_PHY is not set
@@ -2099,7 +2089,6 @@ CONFIG_ATH10K_CE=y
 # CONFIG_ATH10K_USB is not set
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_DEBUGFS is not set
-CONFIG_ATH10K_LEDS=y
 # CONFIG_ATH10K_TRACING is not set
 # CONFIG_WCN36XX is not set
 # CONFIG_ATH11K is not set
@@ -2145,7 +2134,6 @@ CONFIG_WLAN_VENDOR_REALTEK=y
 # CONFIG_RTL8187 is not set
 CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CU is not set
-# CONFIG_RTL8192DU is not set
 # CONFIG_RTL8XXXU is not set
 # CONFIG_RTW88 is not set
 # CONFIG_RTW89 is not set
@@ -2476,7 +2464,6 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
 CONFIG_TCG_TPM=y
-# CONFIG_TCG_TPM2_HMAC is not set
 # CONFIG_TCG_TIS is not set
 # CONFIG_TCG_TIS_I2C is not set
 # CONFIG_TCG_TIS_I2C_CR50 is not set
@@ -2694,12 +2681,6 @@ CONFIG_GPIO_PCA953X_IRQ=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
-#
-# GPIO Debugging utilities
-#
-# CONFIG_GPIO_VIRTUSER is not set
-# end of GPIO Debugging utilities
-
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -2713,7 +2694,6 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_REBOOT_MODE=y
 CONFIG_SYSCON_REBOOT_MODE=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -2737,7 +2717,6 @@ CONFIG_BATTERY_AXP20X=y
 CONFIG_AXP20X_POWER=y
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
@@ -2774,6 +2753,7 @@ CONFIG_HWMON=y
 #
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1029 is not set
@@ -2839,6 +2819,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
@@ -2904,7 +2885,6 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -3027,7 +3007,6 @@ CONFIG_MFD_AXP20X_RSB=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 # CONFIG_MFD_MAX77620 is not set
@@ -3095,12 +3074,10 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
-# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_QCOM_PM8008 is not set
-# CONFIG_MFD_CS40L50_I2C is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # end of Multifunction device drivers
@@ -3173,7 +3150,6 @@ CONFIG_REGULATOR_PWM=y
 # CONFIG_REGULATOR_RTQ6752 is not set
 # CONFIG_REGULATOR_RTQ2208 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
-CONFIG_REGULATOR_SUN20I=y
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
@@ -3363,7 +3339,6 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
 #
 # Chips&Media media platform drivers
 #
-# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -3397,11 +3372,6 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
 # Qualcomm media platform drivers
 #
 
-#
-# Raspberry Pi media platform drivers
-#
-# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
-
 #
 # Renesas media platform drivers
 #
@@ -3461,8 +3431,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_GC0308 is not set
-# CONFIG_VIDEO_GC05A2 is not set
-# CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145_MIPI is not set
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_HI846 is not set
@@ -3472,7 +3440,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_IMX219 is not set
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX283 is not set
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX296 is not set
 # CONFIG_VIDEO_IMX319 is not set
@@ -3527,7 +3494,7 @@ CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_VGXY61 is not set
+# CONFIG_VIDEO_ST_VGXY61 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
 # CONFIG_VIDEO_HM5065 is not set
@@ -3668,8 +3635,6 @@ CONFIG_VIDEO_GC2145=m
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
-# CONFIG_VIDEO_MAX96714 is not set
-# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers
 # end of Media ancillary drivers
 
@@ -3687,9 +3652,9 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_DISPLAY_HELPER=y
-# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
-# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_GEM_DMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y
@@ -3736,11 +3701,9 @@ CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=y
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=y
 # CONFIG_DRM_PANEL_DSI_CM is not set
 # CONFIG_DRM_PANEL_LVDS is not set
-# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
 # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -3752,8 +3715,6 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
-# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
-# CONFIG_DRM_PANEL_LG_SW43408 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
@@ -3770,11 +3731,9 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
-# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
@@ -3862,7 +3821,6 @@ CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 # CONFIG_DRM_PL111 is not set
 CONFIG_DRM_LIMA=y
 CONFIG_DRM_PANFROST=y
-# CONFIG_DRM_PANTHOR is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_SSD130X is not set
@@ -3918,7 +3876,6 @@ CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
@@ -4077,7 +4034,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 CONFIG_SND_SOC_AK4613=m
-# CONFIG_SND_SOC_AK4619 is not set
 # CONFIG_SND_SOC_AK4642 is not set
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
@@ -4114,7 +4070,6 @@ CONFIG_SND_SOC_BT_SCO=m
 # CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CS530X_I2C is not set
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
 CONFIG_SND_SOC_DMIC=m
@@ -4122,13 +4077,13 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_HDA is not set
 # CONFIG_SND_SOC_ICS43432 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 # CONFIG_SND_SOC_MAX98090 is not set
 # CONFIG_SND_SOC_MAX98357A is not set
@@ -4151,7 +4106,7 @@ CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM5102A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
-# CONFIG_SND_SOC_PCM6240 is not set
+# CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_RT5640 is not set
@@ -4354,7 +4309,6 @@ CONFIG_HID_MULTITOUCH=y
 # CONFIG_HID_U2FZERO is not set
 CONFIG_HID_WACOM=m
 # CONFIG_HID_WIIMOTE is not set
-# CONFIG_HID_WINWING is not set
 # CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
@@ -4607,7 +4561,7 @@ CONFIG_USB_HSIC_USB3503=y
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
 # CONFIG_USB_CHAOSKEY is not set
-# CONFIG_USB_ONBOARD_DEV is not set
+# CONFIG_USB_ONBOARD_HUB is not set
 
 #
 # USB Physical Layer drivers
@@ -4625,7 +4579,6 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-# CONFIG_U_SERIAL_CONSOLE is not set
 
 #
 # USB Peripheral Controller
@@ -4645,8 +4598,6 @@ CONFIG_USB_BDC_UDC=y
 # end of USB Peripheral Controller
 
 CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_ACM=y
-CONFIG_USB_U_SERIAL=y
 CONFIG_USB_U_ETHER=y
 CONFIG_USB_F_NCM=y
 CONFIG_USB_F_ECM=y
@@ -4840,7 +4791,6 @@ CONFIG_LEDS_SGM3140=y
 # CONFIG_LEDS_LM3601X is not set
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
-# CONFIG_LEDS_SY7802 is not set
 
 #
 # RGB LED drivers
@@ -4867,8 +4817,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
+# CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set
-# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -4928,7 +4878,6 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8111 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
@@ -5063,6 +5012,7 @@ CONFIG_VHOST_MENU=y
 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
 # CONFIG_RTLLIB is not set
 CONFIG_RTL8723BS=m
 # CONFIG_R8712U is not set
@@ -5118,10 +5068,8 @@ CONFIG_VIDEO_SUNXI_CEDRUS=y
 CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
-CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -5187,7 +5135,6 @@ CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
 CONFIG_MAILBOX=y
 CONFIG_ARM_MHU=y
 # CONFIG_ARM_MHU_V2 is not set
-# CONFIG_ARM_MHU_V3 is not set
 CONFIG_PLATFORM_MHU=y
 # CONFIG_PL320_MBOX is not set
 # CONFIG_ALTERA_MBOX is not set
@@ -5410,6 +5357,7 @@ CONFIG_BMC150_ACCEL_I2C=m
 # CONFIG_AD7291 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD799X is not set
+# CONFIG_ADI_AXI_ADC is not set
 CONFIG_AXP20X_ADC=y
 # CONFIG_AXP288_ADC is not set
 # CONFIG_CC10001_ADC is not set
@@ -5434,7 +5382,6 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_SUN20I_GPADC is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_VF610_ADC is not set
@@ -5473,7 +5420,6 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
-# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
@@ -5612,7 +5558,6 @@ CONFIG_INV_MPU6050_I2C=m
 # CONFIG_AL3010 is not set
 # CONFIG_AL3320A is not set
 # CONFIG_APDS9300 is not set
-# CONFIG_APDS9306 is not set
 # CONFIG_APDS9960 is not set
 # CONFIG_AS73211 is not set
 # CONFIG_BH1750 is not set
@@ -5657,7 +5602,6 @@ CONFIG_STK3310=m
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
-# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -5790,10 +5734,10 @@ CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 # end of Temperature sensors
 
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_CLK is not set
 # CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_GPIO is not set
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_SUN4I=y
 # CONFIG_PWM_XILINX is not set
@@ -5806,9 +5750,7 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
-# CONFIG_LAN966X_OIC is not set
 CONFIG_SUN6I_R_INTC=y
 CONFIG_SUNXI_NMI_INTC=y
 # CONFIG_XILINX_INTC is not set
@@ -6016,9 +5958,9 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=m
 # CONFIG_NETFS_STATS is not set
-# CONFIG_NETFS_DEBUG is not set
 CONFIG_FSCACHE=y
 # CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_DEBUG is not set
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_ERROR_INJECTION is not set
@@ -6327,6 +6269,7 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography
 
@@ -6447,6 +6390,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
 # CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+# CONFIG_CRYPTO_STATS is not set
 # end of Userspace interface
 
 CONFIG_CRYPTO_HASH_INFO=y
@@ -6621,13 +6565,13 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_SWIOTLB=y
 # CONFIG_SWIOTLB_DYNAMIC is not set
 CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
-CONFIG_DMA_NEED_SYNC=y
 # CONFIG_DMA_RESTRICTED_POOL is not set
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
@@ -6654,7 +6598,6 @@ CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 # CONFIG_IRQ_POLL is not set
 CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_HAVE_GENERIC_VDSO=y
@@ -6747,7 +6690,6 @@ CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
 # CONFIG_DEBUG_VM_PGTABLE is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_MEM_ALLOC_PROFILING is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
@@ -6774,7 +6716,6 @@ CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
 # Scheduler Debugging
 #
 CONFIG_SCHED_INFO=y
-# CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
 # CONFIG_DEBUG_TIMEKEEPING is not set
@@ -6803,7 +6744,6 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
 # CONFIG_RCU_CPU_STALL_CPUTIME is not set
 # end of RCU Debugging
 
-CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -6859,7 +6799,6 @@ CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 # CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_VALIDATE_RCU_IS_WATCHING is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.11.0 Kernel Configuration
+# Linux/arm 6.9.10 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -115,7 +115,7 @@ CONFIG_PREEMPTION=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_SCHED_HW_PRESSURE=y
+CONFIG_SCHED_THERMAL_PRESSURE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 CONFIG_PSI=y
@@ -134,7 +134,6 @@ CONFIG_TREE_SRCU=y
 CONFIG_NEED_SRCU_NMI_SAFE=y
 CONFIG_TASKS_RCU_GENERIC=y
 # CONFIG_FORCE_TASKS_RCU is not set
-CONFIG_NEED_TASKS_RCU=y
 CONFIG_TASKS_RCU=y
 # CONFIG_FORCE_TASKS_RUDE_RCU is not set
 CONFIG_TASKS_RUDE_RCU=y
@@ -173,12 +172,11 @@ CONFIG_GCC10_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
 CONFIG_CC_NO_STRINGOP_OVERFLOW=y
-CONFIG_SLAB_OBJ_EXT=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-# CONFIG_MEMCG_V1 is not set
+CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -220,7 +218,6 @@ CONFIG_RD_ZSTD=y
 CONFIG_INITRAMFS_PRESERVE_MTIME=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
 CONFIG_LD_ORPHAN_WARN=y
 CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
 CONFIG_SYSCTL=y
@@ -234,6 +231,7 @@ CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
@@ -250,6 +248,7 @@ CONFIG_RSEQ=y
 CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
@@ -482,7 +481,6 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
-CONFIG_ARM_PAN=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_ARM_MODULE_PLTS=y
@@ -635,12 +633,10 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
 # CONFIG_SECCOMP_CACHE_DEBUG is not set
-CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_LTO_NONE=y
-CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -691,6 +687,7 @@ CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_DEBUG is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -715,9 +712,11 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 # CONFIG_BLK_DEV_BSGLIB 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
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
 # CONFIG_BLK_WBT is not set
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
@@ -775,7 +774,6 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=m
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -787,7 +785,6 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -835,7 +832,6 @@ CONFIG_LRU_GEN_ENABLED=y
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
-CONFIG_EXECMEM=y
 
 #
 # Data Access Monitoring
@@ -1734,7 +1730,6 @@ CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
 # CONFIG_BAREUDP is not set
 # CONFIG_GTP is not set
-# CONFIG_PFCP is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
 CONFIG_TUN=y
@@ -1784,7 +1779,6 @@ CONFIG_NET_VENDOR_ADI=y
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
-CONFIG_NET_VENDOR_META=y
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
@@ -1836,7 +1830,6 @@ CONFIG_FIXED_PHY=y
 #
 # MII PHY device drivers
 #
-# CONFIG_AIR_EN8811H_PHY is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_ADIN_PHY is not set
 # CONFIG_ADIN1100_PHY is not set
@@ -1879,7 +1872,6 @@ CONFIG_MICREL_PHY=y
 CONFIG_REALTEK_PHY=y
 # CONFIG_RENESAS_PHY is not set
 # CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_RK630_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_STE10XP is not set
 # CONFIG_TERANETICS_PHY is not set
@@ -2048,7 +2040,6 @@ CONFIG_ATH10K_SDIO=m
 CONFIG_ATH10K_USB=m
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K_DEBUGFS=y
-CONFIG_ATH10K_LEDS=y
 CONFIG_ATH10K_SPECTRAL=y
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
@@ -2146,7 +2137,6 @@ CONFIG_WLAN_VENDOR_REALTEK=y
 # CONFIG_RTL8187 is not set
 CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CU is not set
-# CONFIG_RTL8192DU is not set
 CONFIG_RTL8XXXU=m
 CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTW88=m
@@ -2577,7 +2567,6 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
-# CONFIG_SPI_CH341 is not set
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
@@ -2755,15 +2744,8 @@ CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
-#
-# GPIO Debugging utilities
-#
-# CONFIG_GPIO_VIRTUSER is not set
-# end of GPIO Debugging utilities
-
 # CONFIG_W1 is not set
 # CONFIG_POWER_RESET is not set
-# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -2785,7 +2767,6 @@ CONFIG_BATTERY_AXP20X=y
 CONFIG_AXP20X_POWER=y
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
@@ -2823,6 +2804,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_AD7314 is not set
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1029 is not set
@@ -2892,6 +2874,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
@@ -2959,7 +2942,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -3086,7 +3068,6 @@ CONFIG_MFD_AXP20X_RSB=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 # CONFIG_MFD_MAX77620 is not set
@@ -3163,13 +3144,10 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
-# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_QCOM_PM8008 is not set
-# CONFIG_MFD_CS40L50_I2C is not set
-# CONFIG_MFD_CS40L50_SPI is not set
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # CONFIG_MFD_RSMU_SPI is not set
@@ -3240,7 +3218,6 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_RTQ6752 is not set
 # CONFIG_REGULATOR_RTQ2208 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
-CONFIG_REGULATOR_SUN20I=y
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
@@ -3369,7 +3346,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 #
 # Chips&Media media platform drivers
 #
-# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -3403,11 +3379,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # Qualcomm media platform drivers
 #
 
-#
-# Raspberry Pi media platform drivers
-#
-# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
-
 #
 # Renesas media platform drivers
 #
@@ -3485,8 +3456,6 @@ CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
-# CONFIG_VIDEO_MAX96714 is not set
-# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers
 
 #
@@ -3514,10 +3483,9 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_DISPLAY_HELPER=y
-# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
-# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_GEM_DMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y
@@ -3573,13 +3541,11 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # CONFIG_DRM_PANEL_DSI_CM is not set
 CONFIG_DRM_PANEL_LVDS=y
-# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
 # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
@@ -3592,10 +3558,8 @@ CONFIG_DRM_PANEL_LVDS=y
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
-# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
-# CONFIG_DRM_PANEL_LG_SW43408 is not set
 # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
@@ -3617,13 +3581,11 @@ CONFIG_DRM_PANEL_LVDS=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
-# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
@@ -3728,7 +3690,6 @@ CONFIG_DRM_DW_HDMI=y
 # CONFIG_DRM_TVE200 is not set
 CONFIG_DRM_LIMA=y
 # CONFIG_DRM_PANFROST is not set
-# CONFIG_DRM_PANTHOR is not set
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
@@ -3783,7 +3744,6 @@ CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
@@ -3941,7 +3901,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4619 is not set
 # CONFIG_SND_SOC_AK4642 is not set
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
@@ -3982,14 +3941,12 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CS530X_I2C is not set
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
 # CONFIG_SND_SOC_DMIC is not set
 # CONFIG_SND_SOC_EC25 is not set
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
@@ -3998,6 +3955,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_HDA is not set
 # CONFIG_SND_SOC_ICS43432 is not set
 # CONFIG_SND_SOC_IDT821034 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 # CONFIG_SND_SOC_MAX98090 is not set
 # CONFIG_SND_SOC_MAX98357A is not set
@@ -4024,8 +3982,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_PCM5102A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
-# CONFIG_SND_SOC_PCM6240 is not set
 # CONFIG_SND_SOC_PEB2466 is not set
+# CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_RT5640 is not set
@@ -4234,7 +4192,6 @@ CONFIG_HID_MONTEREY=y
 # CONFIG_HID_UDRAW_PS3 is not set
 CONFIG_HID_WACOM=m
 # CONFIG_HID_WIIMOTE is not set
-# CONFIG_HID_WINWING is not set
 # CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
@@ -4411,7 +4368,7 @@ CONFIG_APPLE_MFI_FASTCHARGE=m
 # CONFIG_USB_HSIC_USB3503 is not set
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_ONBOARD_DEV is not set
+# CONFIG_USB_ONBOARD_HUB is not set
 
 #
 # USB Physical Layer drivers
@@ -4453,7 +4410,6 @@ CONFIG_USB_MAX3420_UDC=m
 # end of USB Peripheral Controller
 
 CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
 CONFIG_USB_U_ETHER=m
 CONFIG_USB_U_AUDIO=m
@@ -4661,8 +4617,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_PANIC is not set
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
+# CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set
-# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -4718,7 +4674,6 @@ CONFIG_RTC_DRV_PCF8563=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8111 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
@@ -4834,6 +4789,7 @@ CONFIG_DMABUF_HEAPS_CMA=y
 CONFIG_UIO=m
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_UIO_DMEM_GENIRQ=m
+# CONFIG_UIO_PRUSS is not set
 # CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_MENU=y
@@ -4852,6 +4808,7 @@ CONFIG_VHOST_MENU=y
 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
 CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
@@ -4911,12 +4868,12 @@ CONFIG_VIDEO_SUNXI_CEDRUS=y
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_KS7010 is not set
+# CONFIG_PI433 is not set
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
 CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
@@ -4986,7 +4943,6 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 # end of Clock Source drivers
 
 CONFIG_MAILBOX=y
-# CONFIG_ARM_MHU_V3 is not set
 # CONFIG_PLATFORM_MHU is not set
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
@@ -5183,14 +5139,12 @@ CONFIG_MMA7660=m
 # CONFIG_AD7091R5 is not set
 # CONFIG_AD7091R8 is not set
 # CONFIG_AD7124 is not set
-# CONFIG_AD7173 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
 # CONFIG_AD7280 is not set
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
-# CONFIG_AD7380 is not set
 # CONFIG_AD7476 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD7606_IFACE_SPI is not set
@@ -5201,10 +5155,10 @@ CONFIG_MMA7660=m
 # CONFIG_AD7793 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
-# CONFIG_AD7944 is not set
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD9467 is not set
+# CONFIG_ADI_AXI_ADC is not set
 CONFIG_AXP20X_ADC=y
 # CONFIG_AXP288_ADC is not set
 # CONFIG_CC10001_ADC is not set
@@ -5244,7 +5198,6 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1298 is not set
@@ -5296,7 +5249,6 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
-# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_SCD30_CORE is not set
 # CONFIG_SCD4X is not set
@@ -5337,7 +5289,6 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
-# CONFIG_AD9739A is not set
 # CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
@@ -5478,7 +5429,6 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_AL3010 is not set
 # CONFIG_AL3320A is not set
 # CONFIG_APDS9300 is not set
-# CONFIG_APDS9306 is not set
 # CONFIG_APDS9960 is not set
 # CONFIG_AS73211 is not set
 # CONFIG_BH1750 is not set
@@ -5523,7 +5473,6 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
-# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -5665,10 +5614,10 @@ CONFIG_AXP20X_ADC=y
 # end of Temperature sensors
 
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_CLK is not set
 # CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_GPIO is not set
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_SUN4I=y
 # CONFIG_PWM_XILINX is not set
@@ -5680,7 +5629,6 @@ CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_AL_FIC is not set
-# CONFIG_LAN966X_OIC is not set
 CONFIG_SUN4I_INTC=y
 CONFIG_SUN6I_R_INTC=y
 CONFIG_SUNXI_NMI_INTC=y
@@ -5738,7 +5686,6 @@ CONFIG_PHY_SUN50I_USB3=y
 # CONFIG_ARM_CCI_PMU is not set
 # CONFIG_ARM_CCN is not set
 CONFIG_ARM_PMU=y
-CONFIG_ARM_V7_PMU=y
 # CONFIG_ARM_PMUV3 is not set
 # end of Performance monitor support
 
@@ -5866,9 +5813,9 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=m
 # CONFIG_NETFS_STATS is not set
-# CONFIG_NETFS_DEBUG is not set
 CONFIG_FSCACHE=y
 # CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_DEBUG is not set
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_ERROR_INJECTION is not set
@@ -6078,7 +6025,6 @@ CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 CONFIG_INIT_STACK_NONE=y
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
 # CONFIG_INIT_STACK_ALL_ZERO is not set
-# CONFIG_GCC_PLUGIN_STACKLEAK is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
@@ -6147,6 +6093,7 @@ CONFIG_CRYPTO_ECC=y
 CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography
 
@@ -6264,6 +6211,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
 # CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+# CONFIG_CRYPTO_STATS is not set
 # end of Userspace interface
 
 CONFIG_CRYPTO_HASH_INFO=y
@@ -6429,7 +6377,6 @@ CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
-CONFIG_DMA_NEED_SYNC=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_ARCH_HAS_DMA_ALLOC=y
 CONFIG_DMA_CMA=y
@@ -6454,7 +6401,6 @@ CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 # CONFIG_IRQ_POLL is not set
 CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_HAVE_GENERIC_VDSO=y
@@ -6538,7 +6484,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_SHRINKER_DEBUG is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_MEM_ALLOC_PROFILING is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
@@ -6561,7 +6506,6 @@ CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
 #
 # Scheduler Debugging
 #
-# CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
 # CONFIG_DEBUG_TIMEKEEPING is not set

device/testing/device-fairphone-fp2/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp2
 pkgdesc="Fairphone 2"
-pkgver=8
-pkgrel=0
+pkgver=7
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -90,7 +90,7 @@ phosh() {
 }
 
 sha512sums="
-4f662c7c66601a9c277b260cbbd2806d37cdc273f39599bc49bbc0974a8dd6541338f3a4f9ca3758670b72ee56df64ae918781c21b7ee9441cee40408e983196  deviceinfo
+f44cc3b5db025b0df7e3df88561a46b10b8b106e27e5a227ea50b44ebbd91d2986f4eac3a5f1e3cbac2d3a8c119708d22c057bbb9e4fc7b3b9c0c03460f5e850  deviceinfo
 1a99953420a4068c6205dd90015e895909d39011dcc72fd73ac6880920fe4b95fe54377b9d4864a2d4fac56c4334e0c896ba8cc92dea61f93e9384de0998a910  modules-initfs.mainline
 55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f  FP2.conf
 b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1  hifi

device/testing/device-fairphone-fp2/deviceinfo

@@ -26,7 +26,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1"
 deviceinfo_kernel_cmdline_mainline="earlycon=msm_serial_dm,0xf991e000 msm.vram=192m msm.allow_vram_carveout=1"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"

device/testing/device-google-blueline/APKBUILD

@@ -1,42 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
-# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
-# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
-
-pkgname=device-google-blueline
-pkgdesc="Google Pixel 3"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	linux-postmarketos-qcom-sdm845
-	mkbootimg
-	firmware-google-blueline
-	firmware-google-blueline-dtbo
-	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-ucm
-	soc-qcom-sdm845-qbootctl
-	soc-qcom-sdm845-nonfree-firmware
-"
-makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-initfs
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-sha512sums="
-1a6c56470ccf94a51d235b011d0069ed028f781eb94863759113b62646138e3a8a34936536715eb908b5bea06c360567b0f217427fc4e5b34a617388072367ec  deviceinfo
-e92b431723994d0edc9d946d45746282d7ff25d13b799bada703ba13669de131a97f317ed0fecdedeefea7879a06bafe1df7e4a42f86c46e9e4f30309a928b15  modules-initfs
-"

device/testing/device-google-blueline/deviceinfo

@@ -1,39 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Google Pixel 3"
-deviceinfo_manufacturer="Google"
-deviceinfo_codename="google-blueline"
-deviceinfo_year="2018"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="false"
-deviceinfo_screen_width="1080"
-deviceinfo_screen_height="2160"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_offset_base="0x00000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00000000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_pagesize="4096"
-deviceinfo_flash_sparse="true"
-
-# Kernel options
-deviceinfo_dtb="qcom/sdm845-google-blueline"
-deviceinfo_append_dtb="true"
-deviceinfo_flash_kernel_on_update="true"
-
-# Required for devices using UFS as storage (instead of e.g. eMMC)
-deviceinfo_rootfs_image_sector_size="4096"

device/testing/device-google-blueline/modules-initfs

@@ -1,6 +0,0 @@
-i2c_qcom_geni
-rmi_core
-rmi_i2c
-qcom_fg
-qcom_pmi8998_charger
-ftm5

device/testing/device-lg-hammerhead/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-hammerhead
-pkgver=8
-pkgrel=0
+pkgver=7
+pkgrel=1
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
 arch="armv7"
@@ -86,7 +86,7 @@ sha512sums="
 f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr.conf
 b0ff3cf868380481638cce975688eb622e50d4a45a877892e087789ad7f292f8723de1fbf3da2af445adad31df99d7976c31dcf4f685a046b644b38aa109067d  20-gsk-gpu-workaround.sh
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
-a4cc185a61fd0657783ee3f3a1bb897ea5adced032b71e8fc84e0211bf91a194d2c9651211cf4f6a6e4309358466d708503643e15d316198294109c599ad749e  deviceinfo
+9d4839f940ff55dc3213e4fae3f119a5cd9c5242f06fb835fb7cf38d8455ba2278c41fef41e2dcd9f6aa06857ec772c2ca9ba018e482f7e8b32409a42542774f  deviceinfo
 fd639faebbee2c0c2c227710678376e0d039b7d96a62103f7ba7e6304d7060023f09064918e93a125465d20d125c0334225680521a7aeae5a43d77d7360c180c  modules-initfs
 ee1deae3c21de4dfcf9842abc7ba984229fd37bff058cb630a9bd44e787484ddfa3e5d4d85dbd30850d3ac34822aa91c82c3a5d7c107a990f202fb7da2f4db98  phoc.ini
 0a9da551fa9d48d8a663f6bc74e8a7d6e2d2a6e009bd163fa46cd302e75656ad7ae57402a0bd70614ec253e0f2445b4c6999df07104f4c657ed630305c7f40d4  xorg.conf

device/testing/device-lg-hammerhead/deviceinfo

@@ -21,7 +21,6 @@ deviceinfo_gpu_accelerated="true"
 
 # Fastboot related
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_kernel_on_update="true"

device/testing/device-oneplus-bacon/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-bacon
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=2
 pkgdesc="OnePlus One"
 url="https://postmarketos.org"
 arch="armv7"
@@ -49,7 +49,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-c287140317c0cf8bc912ceb75260dd95f95e4222b507e0f2c3d436e1c3e0ae9055108a9a70748b6bf0a5465339ffb18286e62d6f5e2ee1e050a1ef904474bd20  deviceinfo
+28ba572e6e45383e5a55670977195235dab098439987f57aa02fa2bb4865877bf2156f665301e25af051742e828f15cae74ee2de306cfc45d092dedd6a83bac2  deviceinfo
 fd639faebbee2c0c2c227710678376e0d039b7d96a62103f7ba7e6304d7060023f09064918e93a125465d20d125c0334225680521a7aeae5a43d77d7360c180c  modules-initfs.mainline
 65e9ee7352b1dc39d99ea411eb0ed9c56f9975230907db5add3a1b4146cdf6f227c934052dab38a1937ed67d67585f28fb7410f10a1bec9dd5e4eb69d7253515  90-android-touch-dev.rules
 "

device/testing/device-oneplus-bacon/deviceinfo

@@ -22,7 +22,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=bacon user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1 buildvariant=userdebug"
 deviceinfo_kernel_cmdline_mainline="msm.vram=192m msm.allow_vram_carveout=1"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02000000"

device/testing/device-purism-librem5dev/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-purism-librem5dev
 pkgdesc="Purism Librem 5 Devkit"
 pkgver=2
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -60,7 +60,7 @@ package() {
 	install -D -m644 "$srcdir"/modprobe.d_rsi.conf "$pkgdir"/etc/modprobe.d/rsi.conf
 	install -D -m644 "$srcdir"/00-mesa.sh "$pkgdir"/etc/profile.d/00-mesa.sh
 	install -D -m644 "$srcdir"/flash_script.lst "$pkgdir"/usr/share/uuu/flash_script.lst
-	install -D -m644 "$_confdir"/default/hwdb/80-librem5.hwdb "$pkgdir"/usr/lib/udev/hwdb.d/80-librem5.hwdb
+	install -D -m644 "$_confdir"/default/hwdb/80-librem5.hwdb "$pkgdir"/lib/udev/hwdb.d/80-librem5.hwdb
 	install -D -m644 "$_confdir"/debian/librem5-base-defaults.librem5-devkit-sgtl5000.udev \
 		"$pkgdir"/usr/lib/udev/rules.d/librem5-base-defaults.librem5-devkit-sgtl5000.udev
 	install -D -m644 "$_confdir"/debian/librem5-base-defaults.librem5-pm.udev  \

device/testing/device-samsung-klte/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5 (G900F/G9006/G9008/G9009W)"
-pkgver=8
-pkgrel=0
+pkgver=7
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -64,6 +64,6 @@ nonfree_firmware() {
 
 sha512sums="
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
-ad2971c45756c705c0cb52709be14fe41a2cef8087aeeaefddecefa94dfe9c5d819f58379ee710dc9ab37a809b775c1fef848145b4694f34f289dbad0e2ac990  deviceinfo
+74118bac1032a58f4d337b91410fee5c71d3380bfef4f656407fa5cf93717ee0dcdd2464e4ccaad5c5f2f93f20f8ff6ad8e3a4631708cbee8227bc6056c904a0  deviceinfo
 0e123f1ce1255395addf08218c7ca7947c7dbd0a81f578ff1c96c53c51bb2c616cd50b390fa92f6fc67ed9c73957f8dd8390213df1520e2d97b9ff256ddbb954  modules-initfs
 "

device/testing/device-samsung-klte/deviceinfo

@@ -25,7 +25,6 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_flash_sparse="true"
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 msm.vram=192m msm.allow_vram_carveout=1"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"

device/testing/device-sony-leo/APKBUILD

@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-leo
 pkgdesc="Sony Xperia Z3"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -57,5 +57,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-6a3c544e9044c560af3cb2342b3c61d0c22a5e7e099e0a92dab4ed94b8ec3eae263f08209218d24c16382529a13f52d5bb0428a2a6730a3978823cb9f7a86094  deviceinfo
+cede75ba790a68fe96d8aa7fdc82439d20afb26bf9df78072e73ad3cca5fa3ea8d318a11008a7bb9bad71302fc28ca61219fb5fd19bfa839bf6ae9b76aa80f9d  deviceinfo
 "

device/testing/device-sony-leo/deviceinfo

@@ -23,7 +23,6 @@ deviceinfo_append_dtb_mainline="true"
 deviceinfo_flash_method="fastboot"
 
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x00000000"

device/testing/firmware-google-blueline-dtbo/APKBUILD

@@ -1,28 +0,0 @@
-# Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
-# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
-# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
-
-pkgname=firmware-google-blueline-dtbo
-pkgver=1
-pkgrel=0
-_commit="88468ea69b2598551861cb48f0785463a61f066c"
-pkgdesc="dtbo.img needed to boot mainline on Pixel 3"
-url="https://gitlab.com/phodina/dtbo-google-blueline"
-arch="aarch64"
-license="GPL-2.0-only"
-makedepends="dtc android-tools"
-source="$pkgname-$_commit.tar.gz::https://gitlab.com/phodina/dtbo-google-blueline/-/archive/$_commit.tar.gz"
-options="!check !archcheck !strip !tracedeps pmb:cross-native"
-builddir="$srcdir/dtbo-google-blueline-$_commit"
-
-build() {
-	dtc -O dtb -o sdm845-b1-dvt1.1.dtbo -b 0 -@ sdm845-b1-dvt.dts
-	mkdtboimg cfg_create dtbo.img dtboimg.cfg
-}
-
-package() {
-	install -D -m644 dtbo.img \
-		"$pkgdir"/boot/dtbo-google-blueline.img
-}
-
-sha512sums="7c8e27ab8c29027b53a699954f62571a6750a3c7337659d166507b063a843feff9e357f0b5f5ebbb30ffbb8ae7f4bc7fe3da267cb86b0c77c2e36d62fb471061  firmware-google-blueline-dtbo-88468ea69b2598551861cb48f0785463a61f066c.tar.gz"

device/testing/firmware-google-blueline/APKBUILD

@@ -1,42 +0,0 @@
-# Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
-# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
-# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
-
-pkgname=firmware-google-blueline
-pkgver=1
-pkgrel=0
-pkgdesc="Firmware for Google Pixel 3 (blueline)"
-url="https://gitlab.com/phodina/firmware-google-blueline"
-# Suggested by Caleb as it has working Wifi
-url="https://gitlab.com/sdm845-mainline/firmware-google-pixel3"
-arch="aarch64"
-depends="linux-firmware-qcom linux-firmware-ath10k"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-
-_commit="7deb5f8e0b0499a80ea85dfc7941351c77e7738c"
-
-source="firmware-google-blueline-$_commit.tar.gz::https://gitlab.com/phodina/firmware-google-blueline/-/archive/$_commit/firmware-google-blueline-$_commit.tar.gz
-	firmware.files"
-
-builddir="$srcdir/firmware-google-blueline-$_commit"
-
-package() {
-
-	while IFS="" read -r _i || [ -n "$_i" ]; do
-		install -Dm644 "$_i" "$pkgdir/$_i"
-	done < "$srcdir/firmware.files"
-
-	# TODO: Do we need these? If so put them into correct paths and into
-	# NFC/Secure Element firmware
-	#install -Dm644 misc/pn557.bin "$pkgdir/lib/firmware/postmarketos/"
-	# Haptic driver firmware
-	#install -Dm644 misc/cs40l20.bin "$pkgdir/lib/firmware/postmarketos/"
-	# Haptic driver firmware
-	#install -Dm644 misc/drv2624.bin "$pkgdir/lib/firmware/postmarketos/"
-}
-
-sha512sums="
-a556672e5c463a6421c97da679819e8a7d327194d56f7c02eac03dbbb9d34117331a8bdcb71e0e9fd6b965129ae0788db76d8c34c436a26bf5e030e57d01fab7  firmware-google-blueline-7deb5f8e0b0499a80ea85dfc7941351c77e7738c.tar.gz
-4fb96f0cda7cac67bb31afdb86fbc6d587d51318fc0b377f37af794423e185bdcba5304670cc53bd618cf8839db6cc1ed7a1d84ba149df817bc2e345b2787694  firmware.files
-"

device/testing/firmware-google-blueline/firmware.files

@@ -1,15 +0,0 @@
-./lib/firmware/postmarketos/qca/crbtfw21.tlv
-./lib/firmware/qcom/sdm845/pixel3/a630_zap.mbn
-./lib/firmware/qcom/sdm845/pixel3/adsp.mbn
-./lib/firmware/qcom/sdm845/pixel3/adspr.jsn
-./lib/firmware/qcom/sdm845/pixel3/adspua.jsn
-./lib/firmware/qcom/sdm845/pixel3/cdsp.mbn
-./lib/firmware/qcom/sdm845/pixel3/cdspr.jsn
-./lib/firmware/qcom/sdm845/pixel3/ipa_fws.mbn
-./lib/firmware/qcom/sdm845/pixel3/mba.mbn
-./lib/firmware/qcom/sdm845/pixel3/modem.mbn
-./lib/firmware/qcom/sdm845/pixel3/modemr.jsn
-./lib/firmware/qcom/sdm845/pixel3/modemuw.jsn
-./lib/firmware/qcom/sdm845/pixel3/slpi.mbn
-./lib/firmware/qcom/sdm845/pixel3/venus.mbn
-./lib/firmware/qcom/sdm845/pixel3/wlanmdsp.mbn

device/testing/firmware-samsung-s5k5baf/APKBUILD

@@ -1,5 +1,5 @@
 # Maintainer: Timbz <timon.baetz@protonmail.com>
-# See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/2248#note_605868837
+# See https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2248#note_605868837
 pkgname=firmware-samsung-s5k5baf
 pkgver=1.0
 pkgrel=0

device/testing/kobo-epdc-extractor/APKBUILD

@@ -1,26 +1,26 @@
 # Maintainer: Andreas Kemnade <andreas@kemnade.info>
 pkgname=kobo-epdc-extractor
-pkgver=1.1
-pkgrel=0
+pkgver=1.0
+pkgrel=1
 pkgdesc="Extractor for waveform on the kobo devices"
 arch="armv7"
 license="MIT"
-url="https://github.com/akemnade/kobo-firmware-extractor"
+url="https://postmarketos.org"
 install="$pkgname.post-install"
 source="
-	kobo-firmware-extractor-$pkgver.tar.gz::https://github.com/akemnade/kobo-firmware-extractor/archive/refs/tags/$pkgver.tar.gz
+	kobo-firmware-extractor-1.0.tar.gz::https://github.com/akemnade/kobo-firmware-extractor/archive/refs/tags/1.0.tar.gz
 	start-epd.sh
 	kobo-epdc-extractor.files
 	extract-waveform.initd
 	"
-builddir="$srcdir"/kobo-firmware-extractor-$pkgver
+builddir="$srcdir"/kobo-firmware-extractor-1.0
 
 build() {
 	make
 }
 
 package() {
-	make PREFIX="/usr" DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 	touch kobo-epdc-extractor
 	# we need it in case we want to do use a graphical display unlock
 	install -Dm644 kobo-epdc-extractor -t \
@@ -35,8 +35,8 @@ package() {
 }
 
 sha512sums="
-0f7c3dc3f08543ecabf8ab9e5abbaed3e04b75da666150ade8afbfa6482958ee9efe5df49412445aec9eccbe9722b0d37c2ae6a8211c2633bc2d2ba696cc21c0  kobo-firmware-extractor-1.1.tar.gz
+2e44387b1275902f296ce77efd18b4759487891b28cb6b88477f44cd21ac6bc81b23c8d3016f81fe926bf87750b588d621fc1c36ca477dce42d3150f0b010953  kobo-firmware-extractor-1.0.tar.gz
 d008a75fb6ae229e1257af517e741717611cb2bc9cd11ab736f9e066493986cf4a6199854deaf90a1e8c91cbc02e7f79b2cf67ccd92ba110290d4af0b5c5f8ef  start-epd.sh
-d2d4aab75a39e7c7667c15fbaac081e6007950b1b6e8c7073ee75eb0266e86c312d6ba3d9976bc9046ca07bbf761ec9e7091476037f952b8a2335a872e2e92a2  kobo-epdc-extractor.files
+c71bf714bd05f9c4c2724fc855b90f5a7fa4c1014ff41f16a07a91e791ada67fede5b92536e22ef3634724a881492fa4151b1fb8060561e1bea2a2f960ba794e  kobo-epdc-extractor.files
 380a131085f50c1a5a80504368c943f3a9372c21ef9dc7fab74eccfc03795652f65a5f4dcf436930f316ba03ad13472e9bc4bfc045f5f0acdb1b94cb0bb5d687  extract-waveform.initd
 "

device/testing/kobo-epdc-extractor/kobo-epdc-extractor.files

@@ -1,2 +1,2 @@
-/usr/bin/extract-kobohidden
-/usr/bin/extract-waveform.sh
+/bin/extract-kobohidden
+/bin/extract-waveform.sh

device/testing/linux-google-crosshatch-mainline/APKBUILD

@@ -1,6 +1,6 @@
 # Kernel config based on: arch/arm64/configs/defconfig
 # APKBUILD based on linux-postmarketos-mainline
-# See: https://gitlab.postmarketos.org/postmarketOS/pmaports/issues/153
+# See: https://gitlab.com/postmarketOS/pmaports/issues/153
 
 _flavor=google-crosshatch-mainline
 _config="config-$_flavor.$CARCH"

device/testing/linux-next/APKBUILD

@@ -2,7 +2,7 @@
 # Kernel config based on: arch/arm64/configs/defconfig
 
 pkgname=linux-next
-pkgver=6.12_git20241004
+pkgver=6.12_git20240930
 pkgrel=2
 _nextver="${pkgver#*_git}"
 pkgdesc="Linux next kernel"
@@ -69,7 +69,7 @@ package() {
 }
 
 sha512sums="
-3ca798a76b7b17e0948f27377dafd05df43cc241f2aab590e4297213ee714ccca2457f4d3bfccdde48e227bee4a7abb65fbbd83c55506d7cdbd20ac125cfeefa  linux-next-next-20241004.tar.gz
+9edf7524d6d9240ecc0fc34e26f0710e7a54ceed6e61fe730b9c7c16b33030335232b2916772004b8a9ae71ed7b9e22114facf656c960d38d98bedfff717441d  linux-next-next-20240930.tar.gz
 adbb506c0a2d676b1964a5d7c693f72338541ebd0cacee62e4579d43163c468d95607d73bf7439fb55b4d6bfa0dd42578b07ee20965aa03c2a9d8022cb3ae267  devices.config
 a30df186f06519e2f519bfe622bbd46caec6c2473a1fd3df370320a661d53882b49cfb2b3be7edd92fabdb4a8e6e3419194e8d43cca3cf4ab1615275dab4fee4  pmos.config
 "

device/testing/linux-samsung-coreprimevelte/APKBUILD

@@ -2,9 +2,8 @@
 
 _flavor=samsung-coreprimevelte
 pkgname=linux-$_flavor
-pkgver=6.11.0
-_pkgver=6.11
-pkgrel=0
+pkgver=6.10_rc5
+pkgrel=2
 pkgdesc="Samsung Galaxy Core Prime VE LTE mainline kernel"
 arch="aarch64"
 _carch="arm64"
@@ -18,10 +17,10 @@ mpfr-dev openssl-dev perl postmarketos-installkernel pxa-mkbootimg dtc"
 # Source
 _config="config-$_flavor.$arch"
 source="
-	$pkgname-${pkgver/_/-}.tar.gz::$url/-/archive/v${_pkgver/_/-}-pxa1908/linux-v${_pkgver/_/-}-pxa1908.tar.gz
+	$pkgname-${pkgver/_/-}.tar.gz::$url/-/archive/v${pkgver/_/-}-pxa1908/linux-v${pkgver/_/-}-pxa1908.tar.gz
 	$_config
 "
-builddir="$srcdir/linux-v${_pkgver/_/-}-pxa1908"
+builddir="$srcdir/linux-v${pkgver/_/-}-pxa1908"
 
 prepare() {
 	default_prepare
@@ -52,6 +51,6 @@ package() {
 }
 
 sha512sums="
-665128c8ac7054d82cbc047303e7e60a1669f1b5ac166e1155e8defd48a341e504905920bc949831b9b7c0dfc39c6c1c8e482fdb75bc73bea396e736b3b49810  linux-samsung-coreprimevelte-6.11.0.tar.gz
-c78ff38350dc9d9138fbd06ccfe3d4cd46c0899179449254626cf3a00c16ad0c68ef03254ec8b63584fe3b10d658a8c470bbdec43ae422790ba9f0a93a8980e3  config-samsung-coreprimevelte.aarch64
+e7b1980d55e981b4af20ab2079f77aee28f38023afff259c7fad6694f6faf5ce000bfb0ae56a76dd3d208888bdaf5e783bd0cdf85dd80f2317a2decdeee04298  linux-samsung-coreprimevelte-6.10-rc5.tar.gz
+0690317db9caf60d75aba4d2eaa98507fbd639dce4bb1e31f3a2b8b2706915000b5177b2cdb55aaade1b807811c3a67223079643eea90b2f575a864991596538  config-samsung-coreprimevelte.aarch64
 "

device/testing/linux-samsung-coreprimevelte/config-samsung-coreprimevelte.aarch64

@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.0 Kernel Configuration
+# Linux/arm64 6.10.0-rc5 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -13,6 +13,7 @@ CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 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
@@ -166,7 +167,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-# CONFIG_MEMCG_V1 is not set
+CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -242,6 +243,7 @@ CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_GUEST_PERF_EVENTS=y
@@ -383,7 +385,9 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_SSBS=y
 CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -527,7 +531,6 @@ CONFIG_CMDLINE="console=tty0"
 # CONFIG_CMDLINE_FROM_BOOTLOADER is not set
 CONFIG_CMDLINE_FORCE=y
 # CONFIG_EFI is not set
-# CONFIG_COMPRESSED_INSTALL is not set
 # end of Boot options
 
 #
@@ -761,8 +764,6 @@ CONFIG_GCC_PLUGINS=y
 CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
 CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FUNCTION_ALIGNMENT=4
-CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
-CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -858,7 +859,6 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -870,7 +870,6 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1638,7 +1637,6 @@ CONFIG_NET_CORE=y
 #
 # PCS device drivers
 #
-# CONFIG_PCS_XPCS is not set
 # end of PCS device drivers
 
 # CONFIG_PPP is not set
@@ -2068,7 +2066,6 @@ CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_IMX_SCMI is not set
 
 #
 # Renesas pinctrl drivers
@@ -2144,12 +2141,6 @@ CONFIG_GPIO_PXA=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
-#
-# GPIO Debugging utilities
-#
-# CONFIG_GPIO_VIRTUSER is not set
-# end of GPIO Debugging utilities
-
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -2165,7 +2156,6 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_REBOOT_MODE=y
 CONFIG_SYSCON_REBOOT_MODE=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_IP5XXX_POWER is not set
@@ -2181,7 +2171,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_MANAGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
@@ -2341,12 +2330,10 @@ CONFIG_MFD_WM8994=m
 CONFIG_MFD_ROHM_BD718XX=y
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
-# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_QCOM_PM8008 is not set
-# CONFIG_MFD_CS40L50_I2C is not set
 CONFIG_MFD_VEXPRESS_SYSREG=y
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_RSMU_I2C is not set
@@ -2616,7 +2603,6 @@ CONFIG_BACKLIGHT_KTD2801=m
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
@@ -3098,7 +3084,6 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 # CONFIG_LEDS_TRIGGER_PATTERN is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set
-# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -3211,11 +3196,11 @@ CONFIG_XEN_AUTO_XLATE=y
 # CONFIG_STAGING is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_OLPC_XO175 is not set
 # CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_ARM64_PLATFORM_DEVICES=y
+# CONFIG_EC_ACER_ASPIRE1 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -3425,7 +3410,6 @@ CONFIG_PWM=y
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_CLK is not set
 # CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_GPIO is not set
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_PXA=m
 # CONFIG_PWM_XILINX is not set
@@ -3438,9 +3422,7 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
-# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 # end of IRQ chip support
@@ -3866,6 +3848,7 @@ CONFIG_CRYPTO_ECC=y
 CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
 CONFIG_CRYPTO_CURVE25519=y
 # end of Public-key cryptography
 
@@ -4191,7 +4174,6 @@ CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_HAVE_GENERIC_VDSO=y
@@ -4468,6 +4450,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
 # CONFIG_TEST_VMALLOC is not set
+# CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set

device/testing/linux-sony-nicki-mainline/APKBUILD

@@ -1,6 +1,6 @@
 # Kernel config based on: arch/arm/configs/qcom_defconfig
 # APKBUILD based on linux-postmarketos-mainline
-# See: https://gitlab.postmarketos.org/postmarketOS/pmaports/issues/184
+# See: https://gitlab.com/postmarketOS/pmaports/issues/184
 
 _flavor=sony-nicki-mainline
 _config="config-$_flavor.$CARCH"

device/testing/petitboot-motorola-smi/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=petitboot-motorola-smi
 pkgver=1.13
-pkgrel=1
+pkgrel=0
 _commit="c6e874098175b03deb6829c340fccad7bfb5a258"
 pkgdesc="Petitboot based bootloader for motorola-smi"
 url="https://github.com/open-power/petitboot"
@@ -52,7 +52,7 @@ build() {
 	cp --parents /etc/terminfo/v/vt102 initramfs
 	ln -s /bin/init initramfs/init
 	cp --parents -r /etc/udev/rules.d initramfs
-	cp --parents -r /usr/lib/udev/rules.d initramfs
+	cp --parents -r /lib/udev/rules.d initramfs
 	loadkeys -b keymap.map > initramfs/etc/keymap.bmap
 	cd initramfs; find . ! -name '*.*~' | cpio -o -H newc | gzip > $srcdir/initramfs.cpio.gz
 

extra-repos/systemd/abuild/0001-abuild-add-systemd-splitfunc.patch

@@ -0,0 +1,66 @@
+From 0bda547b2d7694ab40e0237ea6ae8a25a237ee50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
+Date: Thu, 11 Apr 2024 13:57:26 +0200
+Subject: [PATCH 1/2] abuild: add systemd splitfunc
+
+Co-authored-by: Caleb Connolly <caleb@postmarketos.org>
+---
+ abuild.in | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/abuild.in b/abuild.in
+index 36317d6..74e47f1 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -815,6 +815,11 @@ postcheck() {
+ 			&& ! is_openrc_pkg "$name"; then
+ 		warning "Found OpenRC directory (/etc/conf.d or /etc/init.d) but name doesn't end with -openrc"
+ 	fi
++	# look for /usr/lib/systemd
++	if [ -e "$dir"/usr/lib/systemd ] \
++			&& ! is_systemd_pkg "$name"; then
++		warning "Found systemd directory (/usr/lib/systemd) but it's not in a systemd package"
++	fi
+ 	# look for /usr/share/doc
+ 	if [ -e "$dir"/usr/share/doc ] \
+ 			&& ! is_doc_pkg "$name"; then
+@@ -1371,6 +1376,11 @@ is_openrc_pkg() {
+ 	test "${1%-openrc}" != "$1"
+ }
+ 
++# returns true if this is the -systemd package
++is_systemd_pkg() {
++	test "${1%-systemd}" != "$1" || test "systemd" == "$1"
++}
++
+ # returns true if this is the -bash-completion package
+ is_bashcomp_pkg() {
+ 	test "${1%-bash-completion}" != "$1"
+@@ -2143,6 +2153,24 @@ openrc() {
+ 	default_openrc
+ }
+ 
++# predefined splitfunc systemd
++default_systemd() {
++	depends="$depends_systemd"
++	pkgdesc="$pkgdesc (systemd files)"
++	install_if="systemd ${subpkgname%-systemd}=$pkgver-r$pkgrel"
++
++	if [ -d lib/systemd ]; then
++		error "Detected /lib/systemd dir, should be installed to /usr/lib/systemd"
++		return 1
++	fi
++
++	amove usr/lib/systemd
++}
++
++systemd() {
++	default_systemd
++}
++
+ default_devhelp() {
+ 	depends=""
+ 	pkgdesc="$pkgname - devhelp files"
+-- 
+2.45.2
+

extra-repos/systemd/abuild/0002-abuild-add-warning-in-systemd-split-func-about-non-u.patch

@@ -0,0 +1,28 @@
+From d27596cd67928e4795dc99dbc139b231354c3381 Mon Sep 17 00:00:00 2001
+From: Clayton Craft <clayton@craftyguy.net>
+Date: Fri, 5 Jul 2024 10:38:50 -0700
+Subject: [PATCH 2/2] abuild: add warning in -systemd split func about
+ non-usr-merged birs
+
+---
+ abuild.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/abuild.in b/abuild.in
+index 74e47f1..e5f9be0 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -2165,6 +2165,10 @@ default_systemd() {
+ 	fi
+ 
+ 	amove usr/lib/systemd
++
++	if [ -d bin ] || [ -d lib ] || [ -d usr/sbin ]; then
++		warning "Files should be installed to /usr/bin or /usr/lib, not /bin, /lib, or /usr/sbin"
++	fi
+ }
+ 
+ systemd() {
+-- 
+2.45.2
+

extra-repos/systemd/abuild/APKBUILD

@@ -0,0 +1,107 @@
+# Forked from Alpine to add systemd-service support
+
+pkgname=abuild
+pkgver=99993.12.0
+_pkgver=3.12.0
+pkgrel=3
+pkgdesc="Script to build Alpine Packages"
+url="https://git.alpinelinux.org/cgit/abuild/"
+arch="all"
+license="GPL-2.0-only"
+depends="fakeroot scanelf openssl>3 apk-tools>=2.0.7-r1 libc-utils
+	attr tar pkgconf patch lzip curl libcap-getcap"
+makedepends="openssl-dev>3 zlib-dev pkgconfig scdoc"
+checkdepends="kyua git"
+install="$pkgname.pre-install $pkgname.pre-upgrade"
+subpackages="
+	apkbuild-cpan:cpan:noarch
+	apkbuild-gem-resolver:gems:noarch
+	apkbuild-pypi:pypi:noarch
+	abuild-rootbld:_rootbld:noarch
+	$pkgname-doc
+	"
+options="suid !check" # tests are SLOW in qemu
+pkggroups="abuild"
+source="
+	https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$_pkgver/abuild-$_pkgver.tar.gz
+	0001-abuild-add-systemd-splitfunc.patch
+	0002-abuild-add-warning-in-systemd-split-func-about-non-u.patch
+	"
+builddir="$srcdir/$pkgname-$_pkgver"
+
+build() {
+	make VERSION="$_pkgver-r$pkgrel"
+}
+
+check() {
+	make check
+}
+
+package() {
+	make install VERSION="$_pkgver-r$pkgrel" DESTDIR="$pkgdir"
+
+	install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
+
+	case "$CARCH" in
+	x86*|ppc64le)
+		# binutils only supports it here
+		cat >>"$pkgdir"/usr/share/abuild/default.conf <<-EOF
+
+		# binutils ld.bfd supports this on this architecture; default to it
+		export RUSTFLAGS="\$RUSTFLAGS -Clink-arg=-Wl,-z,pack-relative-relocs"
+		export LDFLAGS="\$LDFLAGS -Wl,-z,pack-relative-relocs"
+		EOF
+	esac
+
+	case "$CARCH" in
+	x86_64)
+		# https://lists.alpinelinux.org/~alpine/devel/%3C1628515011.zujvcn248v.none%40localhost%3E
+		# note that this is x86-exclusive. on other architectures, this is pretty much always bad
+		# https://github.com/rust-lang/rust/pull/106380
+		cat >>"$pkgdir"/usr/share/abuild/default.conf <<-EOF
+
+		# -fno-plt has very slight improvements to general code size and speed on x86-only,
+		# for the common system dynamic linking case
+		export CFLAGS="\$CFLAGS -fno-plt"
+		export CXXFLAGS="\$CXXFLAGS -fno-plt"
+		EOF
+		;;
+	esac
+
+	install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
+}
+
+cpan() {
+	pkgdesc="Script to generate perl APKBUILD from CPAN"
+	depends="perl perl-libwww perl-json perl-module-build perl-module-build-tiny
+		perl-lwp-protocol-https"
+
+	amove usr/bin/apkbuild-cpan
+}
+
+gems() {
+	pkgdesc="APKBUILD dependency resolver for RubyGems"
+	depends="ruby ruby-augeas"
+
+	amove usr/bin/apkbuild-gem-resolver
+}
+
+pypi() {
+	pkgdesc="Script to generate python3 APKBUILD from PYPI"
+	depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https
+	perl-ipc-system-simple"
+
+	amove usr/bin/apkbuild-pypi
+}
+
+_rootbld() {
+	pkgdesc="Build packages in chroot"
+	depends="abuild bubblewrap cmd:envsubst git"
+	mkdir -p "$subpkgdir"
+}
+
+sha512sums="
+00fac67aa96a83f33406dde60bd9526bfa5fdff690b84dbe867b6ed197f147b2afafcdfbda900c005e00a64a42bcb98ca425ffc8bf2158b9540cbb67d935577d  abuild-3.12.0.tar.gz
+52cc5857b3c93bd4595de1d06c3c600b88871c68f7a1ea51e10d720ddd9c8fb7f0f63cd2f4fe280c0d9adaf607de8b858f4add3e46b1a5a28cc6c711359f6c60  0001-abuild-add-systemd-splitfunc.patch
+3782341dac814ecbcb7d2b4242d85f03ca2e4bf9eeb3b1e9524b2c434b05c864f5a4b5b8abc4031085e7e943e90780fe07b1e99d4cfadf0695340ad321647cac  0002-abuild-add-warning-in-systemd-split-func-about-non-u.patch
+"

extra-repos/systemd/abuild/abuild.pre-install

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+addgroup -S abuild 2>/dev/null
+
+exit 0

extra-repos/systemd/abuild/abuild.pre-upgrade

@@ -0,0 +1 @@
+abuild.pre-install

extra-repos/systemd/accountsservice/APKBUILD

@@ -0,0 +1,59 @@
+# Forked from Alpine to build with systemd support
+# this provides the ability to activate user sessions
+# from dbus by invoking logind
+
+pkgname=accountsservice
+pkgver=99923.13.9
+_pkgver=23.13.9
+pkgrel=0
+pkgdesc="D-Bus interface for user account query and manipulation"
+url="https://www.freedesktop.org/software/accountsservice/"
+arch="all"
+license="GPL-3.0-or-later"
+depends_dev="gobject-introspection-dev"
+makedepends="
+	$depends_dev
+	dbus-dev
+	systemd-dev
+	glib-dev
+	meson
+	polkit-dev
+	vala
+	"
+subpackages="$pkgname-dev $pkgname-lang lib$pkgname:libs"
+source="https://www.freedesktop.org/software/accountsservice/accountsservice-$_pkgver.tar.xz
+	musl-fgetspent_r.patch
+	musl-wtmp.patch
+	opt-tests.patch
+	"
+# mocklibc fails to build with implicits
+options="!check"
+builddir="$srcdir/accountsservice-$_pkgver"
+
+build() {
+	abuild-meson \
+		-Db_lto=true \
+		-Dsystemdsystemunitdir=/usr/lib/systemd/system \
+		-Dintrospection=true \
+		-Ddocbook=false \
+		-Dgtk_doc=false \
+		-Dadmin_group=wheel \
+		-Dtests="$(want_check && echo true || echo false)" \
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test --print-errorlogs --no-rebuild -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+sha512sums="
+c6eb543ce2e07b61bbdfa454e388949bc688517be0536b14f30c66383ed105b15d3fab8b6c62b1eaa08f67d9bdc29b928729d9f7c704f47de4decf0de8e12f89  accountsservice-23.13.9.tar.xz
+469392beca8f5941eafaa193c4fcb0472770ee4183ce520416a1b5d6abafe0e201990eb74d06bfbd9e20af08e55aff5f0031f267083f6c6879f0fe4e5028103c  musl-fgetspent_r.patch
+6d81caed730473d5c94d575c580a236b4267b374bf50588860922a7ecbeef0b2a1d50124fa3ae195c4f26abe8c3bd6df2aea6d27a0ce23e99acef9fff3eb9652  musl-wtmp.patch
+cc5ea18d885ccc5a85f5f4191d3157f3953878af289a9cabc373afea67726042144d66fd9f8d08dac7090fc23037ab98adb4101e8378a16ab2eb04043c88378f  opt-tests.patch
+"

extra-repos/systemd/accountsservice/musl-fgetspent_r.patch

@@ -0,0 +1,34 @@
+diff --git a/src/daemon.c b/src/daemon.c
+index 312394a..e7b3c58 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -140,6 +140,28 @@ error_get_type (void)
+ #define MAX_LOCAL_USERS 50
+ #endif
+ 
++#ifndef __GLIBC__
++ /* Musl libc does not support fgetspent_r(), write own
++  * wrapper
++  */
++static int fgetspent_r(FILE *fp, struct spwd *spbuf, char *buf, size_t buflen, struct spwd **spbufp) {
++       struct spwd *shadow_entry = fgetspent(fp);
++       if(!shadow_entry)
++               return -1;
++       size_t namplen = strlen(shadow_entry->sp_namp);
++       size_t pwdplen = strlen(shadow_entry->sp_pwdp);
++
++       if(namplen + pwdplen + 2 > buflen)
++               return -1;
++
++       *spbufp = memcpy(spbuf, shadow_entry, sizeof(struct spwd));
++       spbuf->sp_namp = strncpy(buf, shadow_entry->sp_namp, namplen + 1);
++       spbuf->sp_pwdp = strncpy(buf + namplen + 1, shadow_entry->sp_pwdp, pwdplen + 1);
++
++       return 0;
++}
++#endif
++
+ static struct passwd *
+ entry_generator_fgetpwent (Daemon       *daemon,
+                            GHashTable   *users,
+

extra-repos/systemd/accountsservice/musl-wtmp.patch

@@ -0,0 +1,15 @@
+the assert expects a working /var/log/wtmp at build time
+diff --git a/meson.build b/meson.build
+index 4a509e7..f995d28 100644
+--- a/meson.build
++++ b/meson.build
+@@ -103,8 +103,7 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+ 
+   config_h.set('PATH_WTMP', '_PATH_WTMPX')
+ else
+-  path_wtmp = '/var/log/utx.log'
+-  assert(run_command('test', '-e', path_wtmp, check: false).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
++  path_wtmp = '/var/log/wtmp'
+   config_h.set_quoted('PATH_WTMP', path_wtmp)
+ endif
+ 

extra-repos/systemd/accountsservice/opt-tests.patch

@@ -0,0 +1,24 @@
+diff --git a/meson.build b/meson.build
+index 4a509e7..5119fab 100644
+--- a/meson.build
++++ b/meson.build
+@@ -232,7 +232,9 @@ if get_option('gtk_doc')
+   subdir('doc/libaccountsservice')
+ endif
+ 
+-subdir('tests')
++if get_option('tests')
++  subdir('tests')
++endif
+ 
+ configure_file(
+   output: 'config.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index b34a0fa..56872c7 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,3 +13,4 @@ option('vapi', type: 'boolean', value: true, description : 'Enable Vala bindings
+ 
+ option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
++option('tests', type: 'boolean', value: true, description: 'tests')

extra-repos/systemd/alpine-base/APKBUILD

@@ -0,0 +1,33 @@
+# Forked from Alpine to remove openrc dependency
+
+pkgname=alpine-base
+pkgver=9999
+pkgrel=1
+pkgdesc="Meta package for minimal alpine base"
+url="https://alpinelinux.org"
+arch="noarch"
+license="MIT"
+depends="
+	alpine-baselayout
+	alpine-release
+	apk-tools
+	busybox
+	busybox-suid
+	libc-utils
+"
+
+# can't include systemd here, as we wan't to upgrade from alpine's base to our systemd-base while building
+subpackages="alpine-release:release"
+replaces="alpine-baselayout"
+options="pmb:strict !check"
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+release() {
+	depends="alpine-keys"
+	pkgdesc="Alpine release data"
+
+	mkdir -p "$subpkgdir"
+}

extra-repos/systemd/dbus/APKBUILD

@@ -0,0 +1,109 @@
+# Forked from Alpine to enable systemd
+
+pkgname=dbus
+pkgver=9991.14.10
+_pkgver=1.14.10
+pkgrel=3
+pkgdesc="Freedesktop.org message bus system"
+url="https://www.freedesktop.org/Software/dbus"
+arch="all"
+license="AFL-2.1 OR GPL-2.0-or-later"
+depends_dev="util-linux-dev"
+makedepends="
+	$depends_dev
+	expat-dev
+	glib-dev
+	libsm-dev
+	libx11-dev
+	meson
+	systemd-dev
+	xmlto
+	libcap-getcap
+	"
+pkggroups="messagebus"
+provider_priority=1
+install="$pkgname.pre-install"
+triggers="$pkgname.trigger=/usr/share/dbus-1/system.d"
+options="!check" # Borked in pmbootstrap...
+subpackages="
+	$pkgname-daemon-launch-helper:launchhelper
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-libs
+	$pkgname-x11
+	$pkgname-systemd
+	"
+source="https://dbus.freedesktop.org/releases/dbus/dbus-$_pkgver.tar.xz"
+builddir="$srcdir/dbus-$_pkgver"
+
+# secfixes:
+#   1.14.4-r0:
+#     - CVE-2022-42010
+#     - CVE-2022-42011
+#     - CVE-2022-42012
+#   1.12.18-r0:
+#     - CVE-2020-12049
+#   1.12.16-r0:
+#     - CVE-2019-12749
+
+build() {
+	CFLAGS="$CFLAGS -flto=auto" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--localstatedir=/var \
+		--sysconfdir=/etc \
+		--with-system-pid-file=/run/dbus/dbus.pid \
+		--enable-checks \
+		--disable-assertions \
+		--enable-systemd \
+		--enable-inotify \
+		--enable-libaudit \
+		--enable-user-session \
+		--disable-static
+
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	depends="$pkgname-libs=$pkgver-r$pkgrel"
+
+	make DESTDIR="$pkgdir" install
+
+	# can't  install tmpfs
+	rm -r "$pkgdir"/var/run
+}
+
+libs() {
+	pkgdesc="D-BUS access libraries"
+	depends="systemd-libs"
+
+	amove usr/lib/lib*.so.*
+}
+
+x11() {
+	pkgdesc="X11 add-ons for D-BUS"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/bin/dbus-launch
+}
+
+launchhelper() {
+	pkgdesc="DBus SUID launch helper for autospawning"
+	install_if="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/libexec/dbus-daemon-launch-helper
+}
+
+dev() {
+	default_dev
+}
+
+sha512sums="
+775b708326059692937acb69d4ce1a89e69878501166655b5d1b1628ac31b50dd53d979d93c84e57f95e90b15e25aa33893e51a7421d3537e9c2f02b1b91bfae  dbus-1.14.10.tar.xz
+"

extra-repos/systemd/dbus/dbus.pre-install

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+addgroup -S messagebus 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G messagebus -g messagebus messagebus 2>/dev/null
+
+exit 0

extra-repos/systemd/dbus/dbus.trigger

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+dbus-send --system --type=method_call --dest=org.freedesktop.DBus / \
+	org.freedesktop.DBUS.ReloadConfig >/dev/null 2>&1 || :

extra-repos/systemd/drkonqi/APKBUILD

@@ -0,0 +1,76 @@
+# Forked from Alpine to add systemd!
+
+pkgname=drkonqi
+pkgver=99996.1.4
+_pkgver=6.1.4
+pkgrel=0
+pkgdesc="The KDE crash handler"
+# armhf blocked by extra-cmake-modules
+arch="all !armhf"
+url="https://kde.org/plasma-desktop/"
+license="GPL-2.0-or-later"
+depends="
+	kirigami
+	kitemmodels
+	py3-sentry-sdk
+	"
+makedepends="
+	extra-cmake-modules
+	kcompletion-dev
+	kconfigwidgets-dev
+	kcoreaddons-dev
+	kcrash-dev
+	kdeclarative-dev
+	ki18n-dev
+	kidletime-dev
+	kio-dev
+	kjobwidgets-dev
+	knotifications-dev
+	kservice-dev
+	kstatusnotifieritem-dev
+	kuserfeedback-dev
+	kwallet-dev
+	kwidgetsaddons-dev
+	py3-chai
+	qt6-qtbase-dev
+	samurai
+	syntax-highlighting-dev
+	systemd-dev
+	"
+checkdepends="
+	py3-psutil
+	py3-pygdbmi
+	"
+
+case "$pkgver" in
+	*.90*) _rel=unstable;;
+	*) _rel=stable;;
+esac
+subpackages="$pkgname-lang"
+_repo_url="https://invent.kde.org/plasma/drkonqi.git"
+source="https://download.kde.org/stable/plasma/$_pkgver/drkonqi-$_pkgver.tar.xz"
+
+builddir="$srcdir/$pkgname-$_pkgver"
+
+build() {
+	cmake -B build -G Ninja \
+		-DWITH_PYTHON_VENDORING=OFF \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_TESTING=ON
+	cmake --build build
+}
+
+check() {
+	# connectiontest requires a network connection
+	ctest --test-dir build --output-on-failure -E "(connection|preamble)test"
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+ef79b3b4b31d1d8329a699a8b9d2a1dc28e7faf88ac7a3c11aa7361dc77adab3293d069d178da3e6d2117496736b30c7b092a7b27185381209ea2ce3aae4ab7c  drkonqi-6.1.4.tar.xz
+"

extra-repos/systemd/gdm/0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch

@@ -0,0 +1,72 @@
+From a12b01f4f71d7ca1ed528ea11f99520c10b0d93c Mon Sep 17 00:00:00 2001
+From: Newbyte <newbie13xd@gmail.com>
+Date: Tue, 14 Mar 2023 19:37:17 +0100
+Subject: [PATCH 1/2] DOWNSTREAM: use /bin/touch and /bin/rm instead of /usr/bin/touch and /ust/bin/rm
+
+as that's the path here in Alpine.
+---
+ data/61-gdm.rules.in | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
+index a4f841bdf..481c5b4dd 100644
+--- a/data/61-gdm.rules.in
++++ b/data/61-gdm.rules.in
+@@ -2,13 +2,13 @@ SUBSYSTEM!="pci", GOTO="gdm_pci_device_end"
+ ACTION!="bind", ACTION!="add", GOTO="gdm_pci_device_end"
+ 
+ # cirrus
+-ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
++ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
+ # virtio
+-ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
++ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
+ # qxl
+-ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
++ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
+ # vga
+-ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
++ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
+ 
+ # disable Wayland on Hi1710 chipsets
+ ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
+@@ -36,7 +36,7 @@ SUBSYSTEM!="drm", GOTO="gdm_nomodeset_end"
+ # but keep it enabled for simple framebuffer drivers
+ DRIVERS=="simple-framebuffer", GOTO="gdm_nomodeset_end"
+ IMPORT{parent}="GDM_MACHINE_HAS_VIRTUAL_GPU"
+-ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
++ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
+ IMPORT{cmdline}="nomodeset", GOTO="gdm_disable_wayland"
+ LABEL="gdm_nomodeset_end"
+ 
+@@ -46,7 +46,7 @@ LABEL="gdm_nomodeset_end"
+ KERNEL!="nvidia", GOTO="gdm_nvidia_end"
+ SUBSYSTEM!="module", GOTO="gdm_nvidia_end"
+ ACTION!="add", GOTO="gdm_nvidia_end"
+-RUN+="/usr/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
++RUN+="/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
+ 
+ # Check if suspend/resume services necessary for working wayland support is available
+ TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
+@@ -68,7 +68,7 @@ LABEL="gdm_nvidia_end"
+ KERNEL!="card[0-9]-eDP-*", GOTO="gdm_laptop_check_end"
+ SUBSYSTEM!="drm", GOTO="gdm_laptop_check_end"
+ ACTION!="add", GOTO="gdm_laptop_check_end"
+-RUN+="/usr/bin/touch /run/udev/gdm-machine-is-laptop"
++RUN+="/bin/touch /run/udev/gdm-machine-is-laptop"
+ GOTO="gdm_hybrid_nvidia_laptop_check"
+ LABEL="gdm_laptop_check_end"
+ 
+@@ -79,7 +79,7 @@ SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
+ ACTION!="add", GOTO="gdm_hybrid_graphics_check_end"
+ IMPORT{program}="/bin/sh -c \"echo GDM_NUMBER_OF_GRAPHICS_CARDS=`ls -1d /sys/class/drm/card[0-9] | wc -l`\""
+-ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
+-ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
++ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
++ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
+ LABEL="gdm_hybrid_graphics_check_end"
+ 
+ # If this is a hybrid graphics laptop with vendor nvidia driver, disable wayland
+-- 
+2.39.2
+

extra-repos/systemd/gdm/0003-DOWNSTREAM-pam-rename-common-to-base.patch

@@ -0,0 +1,44 @@
+we use base-* named configs
+--
+diff --git a/data/pam-openembedded/gdm-autologin.pam b/data/pam-openembedded/gdm-autologin.pam
+index a9f4354..3e0708b 100644
+--- a/data/pam-openembedded/gdm-autologin.pam
++++ b/data/pam-openembedded/gdm-autologin.pam
+@@ -1,5 +1,5 @@
+ #%PAM-1.0
+-auth       required    pam_permit.so
+-account    include     common-account
+-password   include     common-auth
+-session    include     common-session
++auth       required    pam_rootok.so
++account    include     base-account
++password   include     base-auth
++session    include     base-session
+diff --git a/data/pam-openembedded/gdm-launch-environment.pam b/data/pam-openembedded/gdm-launch-environment.pam
+index a9f4354..3e0708b 100644
+--- a/data/pam-openembedded/gdm-launch-environment.pam
++++ b/data/pam-openembedded/gdm-launch-environment.pam
+@@ -1,5 +1,5 @@
+ #%PAM-1.0
+-auth       required    pam_permit.so
+-account    include     common-account
+-password   include     common-auth
+-session    include     common-session
++auth       required    pam_rootok.so
++account    include     base-account
++password   include     base-auth
++session    include     base-session
+diff --git a/data/pam-openembedded/gdm-password.pam b/data/pam-openembedded/gdm-password.pam
+index 758464d..f4643d1 100644
+--- a/data/pam-openembedded/gdm-password.pam
++++ b/data/pam-openembedded/gdm-password.pam
+@@ -1,5 +1,5 @@
+ #%PAM-1.0
+-auth       include     common-auth
+-account    include     common-account
+-password   include     common-password
+-session    include     common-session
++auth       include     base-auth
++account    include     base-account
++password   include     base-password
++session    include     base-session

extra-repos/systemd/gdm/APKBUILD

@@ -0,0 +1,89 @@
+# Forked from Alpine for systemd support
+
+pkgname=gdm
+pkgver=99946.2
+_pkgver=46.2
+pkgrel=1
+pkgdesc="GNOME display manager"
+url="https://wiki.gnome.org/Projects/GDM"
+# blocked by gnome-shell
+arch="all !armhf !s390x"
+license="GPL-2.0-or-later"
+depends="
+	dbus
+	gnome-session
+	gnome-settings-daemon
+	gnome-shell
+	gsettings-desktop-schemas
+	linux-pam>=1.4
+	xrdb
+	xwayland
+	"
+makedepends="
+	accountsservice-dev
+	dconf
+	eudev-dev
+	gettext
+	glib-dev
+	gtk+3.0-dev
+	itstool
+	json-glib-dev
+	libcanberra-dev
+	libgudev-dev
+	libsm-dev
+	libx11-dev
+	libxau-dev
+	libxcb-dev
+	libxdmcp-dev
+	linux-pam-dev
+	meson
+	systemd-dev
+	"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-systemd"
+options="!check" # Causes circular dep with gnome-shell
+source="https://download.gnome.org/sources/gdm/${_pkgver%%.*}/gdm-$_pkgver.tar.xz
+	0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
+	0003-DOWNSTREAM-pam-rename-common-to-base.patch
+	Xsession
+	"
+install="gdm.pre-install gdm.post-deinstall"
+builddir="$srcdir/gdm-$_pkgver"
+
+build() {
+	abuild-meson \
+		-Db_lto=true \
+		-Ddefault-pam-config=openembedded \
+		-Dgdm-xsession=false \
+		-Dpam-mod-dir=/usr/lib/security \
+		-Dselinux=disabled \
+		-Dlibaudit=disabled \
+		-Dsystemdsystemunitdir=/usr/lib/systemd/system \
+		-Dsystemduserunitdir=/usr/lib/systemd/user \
+		. output
+	meson compile -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+
+#	install -Dm644 /dev/stdin usr/lib/sysusers.d/gdm.conf <<END
+#g gdm 120 -
+#u gdm 120 "Gnome Display Manager" /var/lib/gdm
+#END
+
+	#sed -i "s/pam_systemd\.so/pam_elogind.so/" "$pkgdir"/etc/pam.d/*
+
+	install -m755 -D "$srcdir/Xsession" "$pkgdir"/etc/gdm
+}
+
+systemd() {
+	install="$subpkgname.post-install $subpkgname.pre-deinstall"
+	default_systemd
+}
+
+sha512sums="
+29cb00b42b64313f63cbf33a0caf9ecaf43f38699983017966fba951b867742129ef150cd927d02add5f7c1c20049ba1301e5ee094caa54835dc12cf29c86210  gdm-46.2.tar.xz
+70b2bb6d6711c17a14c6e6a48b7b29f1b22cf858953f16723ba3e00570dce0416bcb72e4b3d3d4ef608eed32e1f7efa617f94f0a3327c7f5ceeb6b7232e4be84  0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
+66611d49fc4c9578415a7e554834edcb9de99396bd0ca511dcfd4fb256e8a1cd1fd5f10464f4668ffe04799d919bc22ddb58e8bf272017edba69a7951522e63d  0003-DOWNSTREAM-pam-rename-common-to-base.patch
+f836cf0acdf148f2ae09ac28251b5126ce597f08254c43b1ec77596f75e1a3229926116c13f98554625be763e8d28415b27bd679b0a5de9f86bdca7857054c82  Xsession
+"

extra-repos/systemd/gdm/Xsession

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec "$@"

extra-repos/systemd/gdm/gdm-systemd.post-install

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+. /usr/lib/systemd/systemd-apk-macros.sh
+systemd_service_post_install system gdm.service

extra-repos/systemd/gdm/gdm-systemd.pre-deinstall

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+. /usr/lib/systemd/systemd-apk-macros.sh
+systemd_service_pre_deinstall system gdm.service

extra-repos/systemd/gdm/gdm.post-deinstall

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+deluser gdm 2>/dev/null
+delgroup gdm 2>/dev/null
+
+exit 0

extra-repos/systemd/gdm/gdm.pre-install

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+addgroup -S -g 32 gdm 2>/dev/null
+adduser -S -D -H -h /var/lib/gdm -s /sbin/nologin -G gdm -g gdm -u 32 gdm 2>/dev/null
+
+exit 0

extra-repos/systemd/gnome-desktop/APKBUILD

@@ -0,0 +1,100 @@
+# Forked from Alpine to add systemd!
+
+pkgname=gnome-desktop
+pkgver=99944.0
+_pkgver=44.0
+pkgrel=2
+pkgdesc="GNOME desktop core libraries"
+url="https://gitlab.gnome.org/GNOME/gnome-desktop"
+arch="all"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+depends_dev="gobject-introspection-dev gsettings-desktop-schemas-dev"
+makedepends="$depends_dev
+	eudev-dev
+	fontconfig-dev
+	gdk-pixbuf-dev
+	glib-dev
+	gtk-doc
+	gtk+3.0-dev
+	gtk4.0-dev
+	iso-codes-dev
+	itstool
+	libseccomp-dev
+	libxml2-utils
+	meson
+	systemd-dev
+	xkeyboard-config-dev
+	"
+options="!check" # Can't find its own GSettings schemas
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-lang
+	$pkgname-dbg
+	$pkgname-debug
+	libgnome-bg-4:bg_four
+	libgnome-desktop-3:three
+	libgnome-desktop-4:four
+	libgnome-rr-4:rr_four
+	"
+# Patch: https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/158
+source="https://download.gnome.org/sources/gnome-desktop/${_pkgver%.*}/gnome-desktop-$_pkgver.tar.xz
+	utf8-explicit.patch
+	"
+builddir="$srcdir/$pkgname-$_pkgver"
+
+build() {
+	abuild-meson \
+		-Db_lto=true \
+		-Dudev=enabled \
+		-Dbuild_gtk4=true \
+		-Dsystemd=enabled \
+		-Dlegacy_library=true \
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
+}
+
+package() {
+	depends="
+		libgnome-bg-4=$_pkgver-r$pkgrel
+		libgnome-desktop-3=$_pkgver-r$pkgrel
+		libgnome-desktop-4=$_pkgver-r$pkgrel
+		libgnome-rr-4=$_pkgver-r$pkgrel
+		"
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+bg_four() {
+	amove usr/lib/girepository-*/GnomeBG-4.0.typelib
+	amove usr/lib/libgnome-bg-4.so.*
+}
+
+three() {
+	depends="bubblewrap"
+	amove usr/lib/girepository-*/GnomeDesktop-3.0.typelib
+	amove usr/lib/libgnome-desktop-3.so.*
+}
+
+four() {
+	depends="bubblewrap"
+	amove usr/lib/girepository-*/GnomeDesktop-4.0.typelib
+	amove usr/lib/libgnome-desktop-4.so.*
+}
+
+rr_four() {
+	amove usr/lib/girepository-*/GnomeRR-4.0.typelib
+	amove usr/lib/libgnome-rr-4.so.*
+}
+
+debug() {
+	amove usr/libexec/gnome-desktop-debug
+}
+
+sha512sums="
+707e96ffe1bbe27c448dd007b5a005e06ea3bba945c1c6708c61b8cec204cef6f5ed540f8ba0f5e566c2fdbc825fc6f9f0440706e0aea132490ca6d48823e180  gnome-desktop-44.0.tar.xz
+b50843e018121df5c426916cce919aae65570e373a26bb49cd53549963b41eeddf6bd439050f307646883e0777d8a5d8a266c3792c0c688ab02e892031b05f8e  utf8-explicit.patch
+"

extra-repos/systemd/gnome-desktop/utf8-explicit.patch

@@ -0,0 +1,16 @@
+diff --git i/libgnome-desktop/gnome-languages.c w/libgnome-desktop/gnome-languages.c
+index adfc4eee..275b3182 100644
+--- i/libgnome-desktop/gnome-languages.c
++++ w/libgnome-desktop/gnome-languages.c
+@@ -364,7 +364,10 @@ add_locale (const char *language_name,
+         language_name_get_codeset_details (language_name, NULL, &is_utf8);
+ 
+         if (is_utf8) {
+-                name = g_strdup (language_name);
++                if (strchr (language_name, '.') == NULL)
++                        name = g_strdup_printf ("%s.UTF-8", language_name);
++                else
++                        name = g_strdup (language_name);
+         } else if (utf8_only) {
+ 
+                 if (strchr (language_name, '.'))

extra-repos/systemd/gnome-keyring/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch

@@ -0,0 +1,57 @@
+https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/gnome-keyring/trunk/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patc
+
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 21 May 2022 18:42:21 +0000
+Subject: [PATCH] build: Use p11_module_configs as default pkcs11-config dir
+
+When building p11-kit with meson, `p11_system_config_modules` points at
+the dir for system config in `/etc. This is its proper meaning.
+
+When building p11-kit with autotools, `p11_system_config_modules` is a
+copy of `p11_module_configs` "for compatibility", and points to the dir
+for packaged configs in `/usr/share`.
+
+We want the dir for packaged configs, so use the right variable.
+---
+ configure.ac                 | 10 +++++-----
+ pkcs11/rpc-layer/Makefile.am |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1bf7c14c8ccc..98d8c01018fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -294,15 +294,15 @@
+                            [directory to install PKCS#11 config])
+             ])
+ if test -z "$with_pkcs11_config" ; then
+-	P11_SYSTEM_CONFIG_MODULES=$($PKG_CONFIG p11-kit-1 --variable=p11_module_configs)
++	P11_MODULE_CONFIGS=$($PKG_CONFIG p11-kit-1 --variable=p11_module_configs)
+ else
+-	P11_SYSTEM_CONFIG_MODULES="$with_pkcs11_config"
++	P11_MODULE_CONFIGS="$with_pkcs11_config"
+ fi
+-if test "$P11_SYSTEM_CONFIG_MODULES" = ""; then
++if test "$P11_MODULE_CONFIGS" = ""; then
+ 	AC_MSG_ERROR([Could not find location for pkcs11 module config])
+ fi
+-AC_MSG_RESULT($P11_SYSTEM_CONFIG_MODULES)
+-AC_SUBST(P11_SYSTEM_CONFIG_MODULES)
++AC_MSG_RESULT($P11_MODULE_CONFIGS)
++AC_SUBST(P11_MODULE_CONFIGS)
+ 
+ AC_MSG_CHECKING([module path to install pkcs11 modules])
+ AC_ARG_WITH(pkcs11-modules, [
+diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am
+index ccdff9191ad4..d3a3b57bbc6e 100644
+--- a/pkcs11/rpc-layer/Makefile.am
++++ b/pkcs11/rpc-layer/Makefile.am
+@@ -46,7 +46,7 @@ gnome_keyring_pkcs11_la_LDFLAGS = \
+ 	-no-undefined -export-symbols-regex 'C_GetFunctionList'
+ 
+ # This is the configuration file that p11-kit uses to load the module
+-pkcs11configdir = $(P11_SYSTEM_CONFIG_MODULES)
++pkcs11configdir = $(P11_MODULE_CONFIGS)
+ pkcs11config_DATA = \
+ 	pkcs11/rpc-layer/gnome-keyring.module
+ 

extra-repos/systemd/gnome-keyring/APKBUILD

@@ -0,0 +1,78 @@
+# Forked from Alpine
+# systemd unit activation
+
+pkgname=gnome-keyring
+pkgver=99946.1
+_pkgver=46.1
+pkgrel=2
+pkgdesc="GNOME keyring"
+url="https://wiki.gnome.org//Projects/GnomeKeyring"
+arch="all"
+license="GPL-2.0-only LGPL-2.0-only"
+# the gcr binaries are needed for things to open the keyring via libsecret
+depends="gcr"
+makedepends="
+	autoconf
+	automake
+	gcr-dev
+	gobject-introspection-dev
+	gtk+3.0-dev
+	gtk-doc
+	intltool
+	libcap-ng-dev
+	libgcrypt-dev
+	libxslt
+	linux-pam-dev
+	openssh-client
+	systemd-dev
+	"
+checkdepends="
+	dbus-x11
+	python3
+	xvfb-run
+	"
+provides="dbus:org.freedesktop.Secrets"
+# Highest priority of the bunch since it has the least deps
+provider_priority=500
+options="!check" # Failing tests on 32-bit architectures
+subpackages="
+	$pkgname-doc
+	$pkgname-lang
+	$pkgname-systemd
+	"
+source="https://download.gnome.org/sources/gnome-keyring/${_pkgver%.*}/gnome-keyring-$_pkgver.tar.xz
+	0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch"
+builddir="$srcdir/gnome-keyring-$_pkgver"
+
+build() {
+	export LDFLAGS="$LDFLAGS -lintl"
+	autoreconf -vfi
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-pam-dir=/usr/lib/security \
+		--disable-selinux \
+		--with-libcap-ng=no
+	make
+}
+
+check() {
+	xvfb-run make check -j1
+}
+
+package() {
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	make DESTDIR="$pkgdir" install
+}
+
+systemd() {
+	install="$subpkgname.post-install $subpkgname.pre-deinstall"
+	default_systemd
+}
+
+sha512sums="
+82d9685a87b43c6aa1f377114af389675836df4b5c26d43d6843f1dfac6ae0eb771a4ac67f71e5a2f5b88cbdbb5300d63bfcfd8087ee60463a9579d242c6b884  gnome-keyring-46.1.tar.xz
+53e04eade3579fe5d65d11d6cde6c5fdffc9f73a3a7f372b1f4dbc7437212e753123c12854d3a5a7a22f3beb1b00604eec0371615ceb0f7024cb38cf35e33065  0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
+"

extra-repos/systemd/gnome-keyring/gnome-keyring-systemd.post-install

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+. /usr/lib/systemd/systemd-apk-macros.sh
+systemd_service_post_install user gnome-keyring-daemon

extra-repos/systemd/gnome-keyring/gnome-keyring-systemd.pre-deinstall

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+. /usr/lib/systemd/systemd-apk-macros.sh
+systemd_service_pre_deinstall user gnome-keyring-daemon

extra-repos/systemd/gnome-session/APKBUILD

@@ -0,0 +1,54 @@
+# Forked from Alpine for systemd
+
+pkgname=gnome-session
+pkgver=99946.0
+_pkgver=46.0
+pkgrel=1
+pkgdesc="GNOME session manager"
+url="https://gitlab.gnome.org/GNOME/gnome-session"
+arch="all"
+license="GPL-2.0-or-later"
+depends="
+	alsa-plugins-pulse
+	bash
+	dconf
+	polkit
+	"
+makedepends="
+	docbook-xml
+	systemd-dev
+	gnome-desktop-dev
+	gnome-settings-daemon-dev
+	gtk+3.0-dev
+	itstool
+	json-glib-dev
+	libsm-dev
+	libxml2-utils
+	libxslt
+	meson
+	upower-dev
+	xmlto
+	"
+options="!check" #no tests
+subpackages="$pkgname-lang $pkgname-doc $pkgname-systemd"
+source="https://download.gnome.org/sources/gnome-session/${_pkgver%%.*}/gnome-session-$_pkgver.tar.xz"
+builddir="$srcdir/gnome-session-$_pkgver"
+
+build() {
+	abuild-meson \
+		-Db_lto=true \
+		-Dsystemduserunitdir=/usr/lib/systemd/user \
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+sha512sums="
+2187b8ae4ac4ec728283c5dc03edba6472864a704f6c6cd7a3e962515a3925d3a8438f7f89855dd082d2c013868da81e16da280c70b0e07537c8e431301b4bd8  gnome-session-46.0.tar.xz
+"

extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD

@@ -1,17 +1,20 @@
+# Forked from Alpine for systemd support
+
 pkgname=gnome-settings-daemon-mobile
-pkgver=46.0
-pkgrel=1
+pkgver=99946.0
+_pkgver=46.0
+pkgrel=0
 pkgdesc="GNOME settings daemon"
 url="https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile"
 arch="all"
 options="!check" # tests fail on builders
 license="GPL-2.0-only AND LGPL-2.1-only"
 depends="pulseaudio"
+provides="gnome-settings-daemon=$pkgver-r$pkgrel"
 depends_dev="
 	alsa-lib-dev
 	colord-dev
 	cups-dev
-	elogind-dev
 	geoclue-dev
 	geocode-glib-dev>=3.26.4-r1
 	lcms2-dev
@@ -24,6 +27,7 @@ depends_dev="
 	nss-dev
 	pango-dev
 	polkit-dev
+	systemd-dev
 	pulseaudio-dev
 	upower-dev
 	"
@@ -50,37 +54,29 @@ _commit=46-mobile-0
 _gvc_commit="8e7a5a4c3e51007ce6579292642517e3d3eb9c50"
 source="gnome-settings-daemon-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile/-/archive/$_commit/gnome-settings-daemon-mobile-$_commit.tar.gz
 	libgnome-volume-control-$_gvc_commit.tar.gz::https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/gnome-shell-$_gvc_commit.tar.gz"
-builddir="$srcdir/gnome-settings-daemon-mobile-$_commit"
+builddir="$srcdir/$pkgname-$_commit"
 
 build() {
-	cd "$builddir"
 	rm -rf "$builddir/subprojects/gvc"
 	mv "$srcdir/libgnome-volume-control-$_gvc_commit" $builddir/subprojects/gvc
 	abuild-meson \
 		-Db_lto=true \
-		-Delogind=true \
-		-Dsystemd=false \
+		-Dsystemd=true \
 		. output
 	meson compile -C output
 }
 
-check() {
-	meson test --no-rebuild --print-errorlogs -C output
-}
-
-package() {
-	provides="gnome-settings-daemon=$pkgver-r$pkgrel"
-	DESTDIR="$pkgdir" meson install --no-rebuild -C output
-}
-
 dev() {
 	provides="gnome-settings-daemon-dev=$pkgver-r$pkgrel"
 	default_dev
 }
 
-lang() {
-	provides="gnome-settings-daemon-lang=$pkgver-r$pkgrel"
-	default_lang
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 sha512sums="