systemd/apk-tools: update

Switch to the version which is in the upstream MR: https://gitlab.alpinelinux.org/alpine/apk-tools/-/merge_requests/155 Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
systemd/kjournald: new aport (MR 4919)
2024-03-21 22:43:24 +00:00 · 2024-03-21 22:43:24 +00:00 · 2024-03-21 22:43:24 +00:00 · 2024-03-21 22:43:24 +00:00 · 2024-03-21 22:43:23 +00:00 · 2024-03-21 22:43:23 +00:00
922 changed files with 5714 additions and 36548 deletions
@@ -15,9 +15,6 @@ import pmb.helpers.pmaports

 def build_strict(packages, arch):
    common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["config", "mirrors_postmarketos",
-                            "http://mirror.postmarketos.org/postmarketos/staging/systemd/"])
-    common.run_pmbootstrap(["config", "systemd", "always"])
    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
                            "--strict", "--force",
                            "--arch", arch, ] + list(packages))
@@ -16,7 +16,8 @@ import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging

-def get_package_contents(args, package, revision, check=True):
+
+def get_package_version(args, package, revision, check=True):
    # Redirect stderr to /dev/null, so git doesn't complain about files not
    # existing in upstream branch for new packages
    stderr = None
@@ -39,15 +40,6 @@ def get_package_contents(args, package, revision, check=True):
            handle.write(apkbuild_content)
        parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)

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


@@ -120,40 +112,6 @@ def check_versions(args, packages):
                print(f"- {package}: {head} (HEAD) (new package)")
            continue

-        # Check pkgver follows expected format for device packages
-        pkgver = head.rpartition('-r')[0]
-        if package.startswith('device-') and not pkgver.isdigit():
-            print(f" - {package}: invalid pkgver \"{pkgver}\""
-                  "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-            error = True
-
-        # Additional checks for device packages
-        if package.startswith('device-'):
-            head_parsed = get_package_contents(args, package, "HEAD", False)
-            upstream_parsed = get_package_contents(args, package, commit, False)
-
-            # checksums did not change
-            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
-                # Check that pkgver did not change
-                if head_parsed["pkgver"] != upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should not change when package source checksums did not change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # We do not check for a bumped pkgrel, because not everything
-                # needs it, e.g: pmb_recommends
-            # checksums changed
-            else:
-                # Check that pkgrel was reset to 0
-                if head_parsed["pkgrel"] != "0":
-                    print(f" - {package}: pkgrel should be 0 when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # Check that pkgver was changed
-                if head_parsed["pkgver"] == upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should change when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-
        # Compare head and upstream versions
        result = pmb.parse.version.compare(head, upstream)
        if result != 1:
@@ -106,7 +106,7 @@ def main():
    # Ask to adjust the wiki
    if error:
        print("*** Wiki check failed!")
-        print("Thank you for porting postmarketOS to a new device! \\o/")
+        print("Thank you for porting postmarketOS to a new device! \o/")
        print("")
        print("Now it's time to add some documentation:")
        print("1) Create a device specific wiki page as described here:")
@@ -59,9 +59,30 @@ def get_upstream_branch():
        channels.cfg from master to retrieve the upstream branch.

        :returns: branch name, e.g. "v20.05" """
+    global cache
+    if "upstream_branch" in cache:
+        return cache["upstream_branch"]

-    # HACK for master_staging_systemd branch
-    return "master_staging_systemd"
+    # Get channel (e.g. "stable") from pmaports.cfg
+    # https://postmarketos.org/pmaports.cfg
+    pmaports_dir = get_pmaports_dir()
+    pmaports_cfg = configparser.ConfigParser()
+    pmaports_cfg.read(f"{pmaports_dir}/pmaports.cfg")
+    channel = pmaports_cfg["pmaports"]["channel"]
+
+    # Get branch_pmaports (e.g. "v20.05") from channels.cfg
+    # https://postmarketos.org/channels.cfg
+    channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"])
+    channels_cfg = configparser.ConfigParser()
+    channels_cfg.read_string(channels_cfg_str)
+    assert channel in channels_cfg, \
+        f"Channel '{channel}' from pmaports.cfg in your branch is unknown." \
+        " This appears to be an old branch, consider recreating your change" \
+        " on top of master."
+
+    ret = channels_cfg[channel]["branch_pmaports"]
+    cache["upstream_branch"] = ret
+    return ret


 def get_changed_files(removed=True):
@@ -20,8 +20,10 @@ sh_files="
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
+	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
+	./main/postmarketos-update-kernel/update-kernel.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./main/msm-firmware-loader/*.post-install
@@ -34,7 +34,7 @@ def path_pmbootstrap():
            return directory

    # Symlink not set up properly
-    print("ERROR: unable to find path to pmbootstrap.py. Try setting 'PMBOOTSTRAP_CMD'.")
+    print("ERROR: 'pmbootstrap' is not a symlink to pmbootstrap.py")
    sys.exit(1)


@@ -61,6 +61,14 @@ def test_aports_device(args):
        if "!archcheck" not in apkbuild["options"]:
            raise RuntimeError("!archcheck missing in options= line: " + path)

+        if deviceinfo["flash_kernel_on_update"] == "true" \
+                and "postmarketos-update-kernel" not in apkbuild["depends"]:
+            raise RuntimeError(
+                "Deviceinfo indicates this device supports automatic kernel"
+                " flashing on update, but doesn't depend on"
+                " 'postmarketos-update-kernel'. Please add the missing"
+                " dependency.")
+

 def test_aports_device_kernel(args):
    """
@@ -10,7 +10,6 @@ expected_directories = [
    "device/main",
    "device/testing",
    "device/unmaintained",
-    "extra-repos/systemd",
    "main",
    "modem",
    "non-free",
@@ -20,9 +20,6 @@ def test_aports_kernel(args):
        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")
@@ -12,8 +12,3 @@ 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
@@ -2,34 +2,35 @@

 # global settings
 image: alpine:edge
-before_script: &global_before_scripts
-  - apk upgrade -U
 after_script:
  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
  - lint
  - build

-# This defines the rules for when a pipeline should run.
-workflow:
-  rules:
-    # Don't run branch pipeline if an MR is open (only the MR pipeline will run)
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
-      when: never
-    # Run for merge requests
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    # Run scheduled pipeline for autoupdate
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+# defaults for "only"
+# We need to run the CI jobs in a "merge request specific context", if CI is
+# running in a merge request. Otherwise the environment variable that holds the
+# merge request ID is not available. This means, we must set the "only"
+# variable accordingly - and if we only do it for one job, all other jobs will
+# not get executed. So have the defaults here, and use them in all jobs that
+# should run on both the master branch, and in merge requests.
+# https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
+.only-default: &only-default
+  only:
+    - master
+    - merge_requests
+    - tags

 # device documentation
 wiki:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/**/*
-        - .gitlab-ci.yml
-        - device/*/device-*/*
+  <<: *only-default
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - device/*/device-*/*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/wiki.sh
@@ -37,12 +38,16 @@ wiki:
 # testcases linting
 ruff:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/*
-        - .ci/*/*
-        - .gitlab-ci.yml
+  <<: *only-default
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - .ci/*
+      - .ci/*/*
+      - .gitlab-ci.yml
+  before_script:
+    - "echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/ruff.sh
@@ -50,9 +55,8 @@ ruff:
 # shellcheck and various grep checks
 shellcheck-grep:
  stage: lint
+  <<: *only-default
  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
@@ -61,9 +65,8 @@ shellcheck-grep:

 editor-config:
  stage: lint
+  <<: *only-default
  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
@@ -71,8 +74,7 @@ editor-config:
 # aports checks (generic)
 pytest-commits:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  <<: *only-default
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/pytest.sh
@@ -88,21 +90,23 @@ pytest-commits:
 # 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
+  only:
+    - merge_requests
  allow_failure: true

 # kernel kconfig check
 kernel-kconfig:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - device/*/linux-*/config-*
-        - main/linux-*/config-*
+  only:
+    refs:
+      - master
+      - merge_requests
+    changes:
+      - device/*/linux-*/config-*
+      - main/linux-*/config-*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/kconfig.sh
@@ -111,10 +115,9 @@ kernel-kconfig:
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  only:
+    - merge_requests
  before_script:
-    - *global_before_scripts
    - apk -q add python3
  script:
    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
@@ -123,10 +126,8 @@ mr-settings:
 # build changed aports
 .build:
  stage: build
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  <<: *only-default
  before_script:
-    - *global_before_scripts
    - .ci/lib/gitlab_prepare_ci.sh
  after_script:
    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
@@ -141,6 +142,11 @@ build-x86_64:
  script:
    - .ci/build-x86_64.sh

+build-x86:
+  extends: .build
+  script:
+    - .ci/build-x86.sh
+
 build-aarch64:
  extends: .build
  script:
@@ -150,3 +156,13 @@ build-armv7:
  extends: .build
  script:
    - .ci/build-armv7.sh
+
+build-armhf:
+  extends: .build
+  script:
+    - .ci/build-armhf.sh
+
+build-riscv64:
+  extends: .build
+  script:
+    - .ci/build-riscv64.sh
@@ -2,12 +2,10 @@
 # Put groups like @sdm845-mainline into test_device.py:gitlab_groups.
 # Order lines alphabetically!

-device/*/*-amlogic-s905*/			@funderscore
+device/*/*-amlogic-s905*/			@vitali64yt
 device/*/*-arrow-db410c/			@Minecrell
 device/*/*-asus-me176c/				@Minecrell
-device/*/*-ayn-odin/				@jenneron
 device/*/*-bq-paella/				@Minecrell
-device/*/*-bq-tenshi/				@fossdd
 device/*/*-google-gru/				@jenneron
 device/*/*-google-kukui/			@jenneron @binarycraft
 device/*/*-google-oak/				@jenneron @adamthiede
@@ -19,9 +17,6 @@ device/*/*-htc-m8qlul/				@Newbyte
 device/*/*-lenovo-21bx/				@craftyguy
 device/*/*-lenovo-a6000/			@jenneron @Minecrell
 device/*/*-lenovo-a6010/			@jenneron @Minecrell
-device/*/*-librecomputer-lafrite/		@funderscore
-device/*/*-librecomputer-lepotato/		@funderscore
-device/*/*-librecomputer-solitude/		@Newbyte @funderscore
 device/*/*-motorola-harpia/			@Minecrell
 device/*/*-nokia-n900/				@sicelo @Danct12
 device/*/*-pine64-pinebookpro/			@QC8086
@@ -41,7 +36,7 @@ device/*/*-samsung-grandmax/			@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-gt510/			@TravMurav
 device/*/*-samsung-gt58/			@TravMurav
 device/*/*-samsung-serranove/			@Minecrell
-device/*/*-videostrong-kii-pro/			@funderscore
+device/*/*-videostrong-kii-pro/			@vitali64yt
 device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
 device/*/*-xiaomi-beryllium/			@joelselvaraj
 device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
@@ -52,9 +47,7 @@ device/*/*-xiaomi-tissot/			@jiaxyga @barni2000
 device/*/*-xiaomi-vince/			@M0Rf30
 device/*/*-xiaomi-wt88047/			@Minecrell
 device/*/*-xiaomi-ysl/				@barni2000
-device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
 device/*/device-fairphone-*/			@z3ntu
-device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
 device/*/device-google-nyan-big/		@jenneron
 device/*/device-google-nyan-blaze/		@jenneron
 device/*/device-google-peach-pi/		@jenneron
@@ -71,7 +64,6 @@ device/*/device-oneplus-fajita/			@calebccff
 device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
 device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
 device/*/device-qemu-riscv64/			@Minecrell @z3ntu
-device/*/device-qualcomm-sdm845/		@calebccff
 device/*/device-samsung-chagallwifi/		@Grimler
 device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
 device/*/device-samsung-j5y17lte/	@andrisas
@@ -87,7 +79,7 @@ device/*/linux-google-nyan/			@jenneron
 device/*/linux-google-veyron/			@jenneron
 device/*/linux-huawei-plank/			@gtrxAC
 device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
-device/*/linux-postmarketos-amlogic/		@funderscore @exkc
+device/*/linux-postmarketos-amlogic/		@vitali64yt @exkc
 device/*/linux-postmarketos-exynos4/		@Newbyte @ThiagaoPlusPlus
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
 device/*/linux-postmarketos-grate/		@clamor95 @jenneron @jethrob
@@ -117,5 +109,6 @@ device/*/u-boot-pinebookpro/			@QC8086
 device/*/u-boot-pinephone/			@Arnavion @PsychoGame
 device/*/wl1251-cal/				@Danct12
 main/postmarketos-ui-plasma-mobile/		@bshah
+main/postmarketos-update-depthcharge-kernel/	@jenneron
 main/shutdown-clear-rtc-wakealarm/		@Arnavion
 main/ttyescape/					@calebccff
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=26
+pkgrel=21

 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-0f5f1eb32691016183d9a3011c5643f70a1cdc9f49b1ffefce732cff960cfea4d0db1670564fff5504654bb2f07857e62e5dd076fb40d2c361c441854e5d5e5c  busybox-static-1.36.1-r26-aarch64-edge.apk
+0a234d00087f85ba8b21d014c38535947ae087df94c18a174717452c91f732489d258394bf616fecae94259e1c932edcf8ea1dcf4aacf6eb803064e3b3587a78  busybox-static-1.36.1-r21-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=26
+pkgrel=21

 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-ad4db0c989c1a4773f75411c2749bcc8d25756d20396cdb6bfa59bd5ed14164928c602e9833101e584b28490971f6d43973a9c7de9c544693aef40dbe183cabc  busybox-static-1.36.1-r26-armhf-edge.apk
+0f8c600ff2fe1a176503e44924dfdd7520615b3be8e5e84b5fa869c543d43ee7a5307cdf7b8b46effbf8f393682566fa76a9368bcb228e4b44d800ef7c01b888  busybox-static-1.36.1-r21-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=26
+pkgrel=21

 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-f6664d29ecb22e396133116210d792e101fa552b4f4d2295de19af460830bbb151a2d3c4a7b7bbe1596d7b3ed85042f10dae49d78ae4e6ac053ed565f9043c01  busybox-static-1.36.1-r26-armv7-edge.apk
+441ff2d84e385408671c34f891dbe245a3b3c16668f6c985786067fad093c0d218e85695c0604d3f8364b750ff7e7eb4ee00af089ed198d419300b2d4e3edf61  busybox-static-1.36.1-r21-armv7-edge.apk
 "
@@ -3,7 +3,7 @@

 pkgname=grub-efi-x86
 pkgver=2.12
-pkgrel=3
+pkgrel=2

 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -22,5 +22,5 @@ package() {
 }

 sha512sums="
-4bd0750236a556ad833c27892a55624a324e8ec7cadb0b7287cabd3a9cdded836357ae959aea7ba828be8727b86c6ed4844a1572b68ad3ce3f3e6f913e43ae72  grub-efi-2.12-r3-x86-edge.apk
+2337e5db9d3502b56f1166f0648a15f2264d207e717dfbd0c8bbb9de4546dee069dbc2b55f2c7c48bfee062d7ca17b56e97b6eaa725af0479ab49e2cb5f178a3  grub-efi-2.12-r2-x86-edge.apk
 "
@@ -1,70 +0,0 @@
-From 3810f128e9ecf04cf07d243cd377fcb6046cfd73 Mon Sep 17 00:00:00 2001
-From: Newbyte <newbyte@postmarketos.org>
-Date: Tue, 30 Apr 2024 17:57:20 +0200
-Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
-
-Taken from
-linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
-and adapted for the Exynos 4412 vendor sources.
---
- arch/arm/boot/bootp/init.S            | 2 +-
- arch/arm/boot/compressed/big-endian.S | 2 +-
- arch/arm/boot/compressed/head.S       | 2 +-
- arch/arm/mm/proc-v7.S                 | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
-index 78b50807516..868eeeaaa46 100644
--- a/arch/arm/boot/bootp/init.S
-+++ b/arch/arm/boot/bootp/init.S
-@@ -16,7 +16,7 @@
-  *  size immediately following the kernel, we could build this into
-  *  a binary blob, and concatenate the zImage using the cat command.
-  */
-		.section .start,#alloc,#execinstr
-+		.section .start, "ax"
- 		.type	_start, #function
- 		.globl	_start
- 
-diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
-index 25ab26f1c6f..f22428e275f 100644
--- a/arch/arm/boot/compressed/big-endian.S
-+++ b/arch/arm/boot/compressed/big-endian.S
-@@ -5,7 +5,7 @@
-  *  Author: Nicolas Pitre
-  */
- 
-	.section ".start", #alloc, #execinstr
-+	.section ".start", "ax"
- 
- 	mrc	p15, 0, r0, c1, c0, 0	@ read control reg
- 	orr	r0, r0, #(1 << 7)	@ enable big endian mode
-diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
-index 63cfa2e9236..3cd67aa3855 100644
--- a/arch/arm/boot/compressed/head.S
-+++ b/arch/arm/boot/compressed/head.S
-@@ -112,7 +112,7 @@
- #endif
- 		.endm
- 
-		.section ".start", #alloc, #execinstr
-+		.section ".start", "ax"
- /*
-  * sort out different calling conventions
-  */
-diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
-index e1687990af9..a479702f198 100644
--- a/arch/arm/mm/proc-v7.S
-+++ b/arch/arm/mm/proc-v7.S
-@@ -519,7 +519,7 @@ __v7_setup_stack:
- 	string	cpu_elf_name, "v7"
- 	.align
- 
-	.section ".proc.info.init", #alloc, #execinstr
-+	.section ".proc.info.init", "ax"
- 
- 	/*
- 	 * Standard v7 proc info content
-- 
-2.44.0
-
@@ -1,20 +0,0 @@
-# Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
-pkgname=alsa-ucm-conf-cros
-pkgver=0.5
-pkgrel=0
-pkgdesc="ALSA UCM configuration for Chrome OS devices"
-url="https://github.com/WeirdTreeThing/alsa-ucm-conf-cros"
-arch="noarch"
-depends="alsa-ucm-conf"
-replaces="alsa-ucm-conf alsa-ucm-conf-google-kukui"
-license="BSD-3-Clause"
-options="!check"
-source="$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
-
-package() {
-	mkdir -p "$pkgdir"/usr/share/alsa/
-	cp -r ucm2 "$pkgdir"/usr/share/alsa
-}
-sha512sums="
-844f23b640bbdbcef83f9cc11444ee80bfc83095d7917f5c12c2e3b99f120fd014c74c91deae02ec0f2210115270e518977fdef77dca5a3ab5d8df53e5ec62b1  alsa-ucm-conf-cros-0.5.tar.gz
-"
@@ -0,0 +1,41 @@
+# Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
+# Co-Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=alsa-ucm-conf-google-kukui
+pkgver=2
+pkgrel=0
+pkgdesc="ALSA Use Case Manager configuration for Google Kukui Chromebooks"
+url="https://alsa-project.org"
+arch="aarch64"
+license="BSD-3-Clause"
+source="
+	mt8183_da7219_HiFi.conf
+	mt8183_da7219_rt1015p.conf
+	mt8183_mt6358_HiFi.conf
+	mt8183_mt6358_ts3a227_max98357.conf
+"
+options="!check" # no tests
+depends="alsa-ucm-conf"
+replaces="alsa-ucm-conf"
+
+package() {
+	install -Dm644 mt8183_da7219_HiFi.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_da7219_r/HiFi.conf
+	install -Dm644 mt8183_da7219_rt1015p.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_da7219_r/mt8183_da7219_rt1015p.conf
+	install -Dm644 mt8183_mt6358_HiFi.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t/HiFi.conf
+	install -Dm644 mt8183_mt6358_ts3a227_max98357.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t/mt8183_mt6358_ts3a227_max98357.conf
+
+	ln -s /usr/share/alsa/ucm2/conf.d/mt8183_da7219_r \
+		"$pkgdir"/usr/share/alsa/ucm2/mt8183_da7219_r
+	ln -s /usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t \
+		"$pkgdir"/usr/share/alsa/ucm2/mt8183_mt6358_t
+}
+
+sha512sums="
+9755c2eaf4bc28a9f3734b6778550ebd77bbee8f6aa353642bc5a35d68e009a17b05d9b09f1c62fe592eb16a2d342e3d2abcda98f2c53142bd4905e4a883a88b  mt8183_da7219_HiFi.conf
+13ffff0471c29d4e624ba7089d8df811f6578bebc4a9da2e8e82e247430fd41dbc95204fdf1891cfb76f1d90303fcdb8501ecf47b8ca40c7429066bf2ff1379b  mt8183_da7219_rt1015p.conf
+3656cb0cc76994aab39bd0d0cfe283339bce0689448612f74a0d09a30b19516950132456945096a13bd5700d0e7f868c413e268ced810046ec70252ca8b07603  mt8183_mt6358_HiFi.conf
+171e9e3376e5bd56e133a5b19309f60f6326f052922064e6f95c53b4345ea12cc205adde7305a7bd840722a29b7fb393c71d2b39e60952b0979ecc2e5ec03efa  mt8183_mt6358_ts3a227_max98357.conf
+"
@@ -0,0 +1,90 @@
+SectionDevice."Speaker" {
+	Comment "Speaker"
+
+	Value {
+		PlaybackPCM "hw:${CardId},0"
+	}
+	EnableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+		cset "name='Speakers Switch' 1"
+	]
+	DisableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 0"
+		cset "name='I2S3_CH2 DL1_CH2' 0"
+		cset "name='Speakers Switch' 0"
+	]
+}
+
+SectionDevice."Headphones" {
+	Comment "Headphones"
+
+	Value {
+		PlaybackPCM "hw:${CardId},0"
+	}
+	EnableSequence [
+		cset "name='Playback Digital Switch' 1"
+		cset "name='Headphone Switch' 1"
+		cset "name='ST Mixer Out FilterL Out FilterL Switch' 1"
+		cset "name='Mixer Out FilterL DACL Switch' 1"
+		cset "name='ST Mixer Out FilterR Out FilterR Switch' 1"
+		cset "name='Mixer Out FilterR DACR Switch' 1"
+		cset "name='Out DACL Mux' DAIL"
+		cset "name='Out DACR Mux' DAIR"
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='Playback Digital Switch' 0"
+		cset "name='Headphone Switch' 0"
+		cset "name='ST Mixer Out FilterL Out FilterL Switch' 0"
+		cset "name='Mixer Out FilterL DACL Switch' 0"
+		cset "name='ST Mixer Out FilterR Out FilterR Switch' 0"
+		cset "name='Mixer Out FilterR DACR Switch' 0"
+		cset "name='I2S3_CH1 DL1_CH1' 0"
+		cset "name='I2S3_CH2 DL1_CH2' 0"
+	]
+}
+
+SectionDevice."Mic" {
+	Comment "Internal Microphone"
+
+	Value {
+		CapturePCM "hw:${CardId},5"
+	}
+	EnableSequence [
+		cset "name='MTKAIF_DMIC' 1"
+		cset "name='Mt6358 Mic Type Mux' 2"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='MTKAIF_DMIC' 0"
+		cset "name='Mt6358 Mic Type Mux' 0"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
+	]
+}
+
+SectionDevice."Headset" {
+	Comment "Headset Microphone"
+
+	Value {
+		CapturePCM "hw:${CardId},5"
+	}
+	EnableSequence [
+		cset "name='Capture Digital Switch' 1"
+		cset "name='Mixin Switch' 1"
+		cset "name='Mic Switch' 1"
+		cset "name='Mixer In Mic Switch' 1"
+		cset "name='Out DAIL Mux' ADC"
+		cset "name='UL3_CH1 I2S2_CH1' 1"
+	]
+	DisableSequence [
+		cset "name='Capture Digital Switch' 0"
+		cset "name='Mixin Switch' 0"
+		cset "name='Mic Switch' 0"
+		cset "name='Mixer In Mic Switch' 0"
+		cset "name='UL3_CH1 I2S2_CH1' 0"
+	]
+}
@@ -0,0 +1,24 @@
+Syntax 6
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Default"
+}
+
+BootSequence [
+	# Speaker
+	cset "name='I2S3_CH1 DL1_CH1' 1"
+	cset "name='I2S3_CH2 DL1_CH2' 1"
+	cset "name='Speakers Switch' 1"
+
+	# Internal Mic
+	cset "name='MTKAIF_DMIC' 1"
+	cset "name='Mt6358 Mic Type Mux' 2"
+	cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+	cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+
+	# Headset
+	cset "name='Headphone Volume' 56"
+	cset "name='Capture Digital Volume' 113"
+	cset "name='Mic Volume' 3"
+]
@@ -0,0 +1,86 @@
+SectionDevice."Speaker" {
+	Comment "Speaker"
+
+	Value {
+		PlaybackPCM "hw:${CardId},0"
+	}
+	EnableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 0"
+		cset "name='I2S3_CH2 DL1_CH2' 0"
+	]
+}
+
+SectionDevice."Mic" {
+	Comment "Internal Microphone"
+
+	Value {
+		CapturePCM "hw:${CardId},5"
+	}
+	EnableSequence [
+		cset "name='MTKAIF_DMIC' 1"
+		cset "name='Mic Type Mux' 2"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='MTKAIF_DMIC' 0"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
+	]
+}
+
+If.krane {
+	Condition {
+		Type String
+		Haystack "${sys:firmware/devicetree/base/compatible}"
+		Needle "google,krane"
+	}
+	False {
+		SectionDevice."Headphones" {
+			Comment "Headphones"
+
+			Value {
+				PlaybackPCM "hw:${CardId},0"
+			}
+			EnableSequence [
+				cset "name='ADDA_DL_CH1 DL1_CH1' 1"
+                		cset "name='ADDA_DL_CH2 DL1_CH2' 1"
+                		cset "name='HPL Mux' 2"
+                		cset "name='HPR Mux' 2"
+			]
+			DisableSequence [
+				cset "name='ADDA_DL_CH1 DL1_CH1' 0"
+                		cset "name='ADDA_DL_CH2 DL1_CH2' 0"
+                		cset "name='HPL Mux' 0"
+                		cset "name='HPR Mux' 0"
+			]
+		}
+
+		SectionDevice."Headset" {
+			Comment "Headset Microphone"
+
+			Value {
+				CapturePCM "hw:${CardId},5"
+			}
+			EnableSequence [
+				cset "name='PGA L Mux' 2"
+                		cset "name='ADC L Mux' 2"
+                		cset "name='Mic Type Mux' 1"
+                		cset "name='PGA Volume' 4"
+                		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+			]
+			DisableSequence [
+				cset "name='PGA L Mux' 0"
+		                cset "name='ADC L Mux' 0"
+		                cset "name='Mic Type Mux' 0"
+                		cset "name='PGA Volume' 0"
+		                cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+
+			]
+		}
+	}
+}
@@ -0,0 +1,31 @@
+Syntax 6
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Default"
+}
+
+BootSequence [
+	# Speakers
+	cset "name='I2S3_CH1 DL1_CH1' 1"
+	cset "name='I2S3_CH2 DL1_CH2' 1"
+
+	# Headphones
+	cset "name='Headphone Volume' 17"
+	cset "name='ADDA_DL_CH1 DL1_CH1' 0"
+	cset "name='ADDA_DL_CH2 DL1_CH2' 0"
+	cset "name='HPL Mux' 0"
+	cset "name='HPR Mux' 0"
+
+	# Internal Mic
+	cset "name='MTKAIF_DMIC' 1" 
+	cset "name='Mic Type Mux' 2"
+	cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+	cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+
+	# Headset Mic
+	cset "name='PGA L Mux' 0"
+	cset "name='ADC L Mux' 0"
+	cset "name='PGA Volume' 0"
+	cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+]
@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=2
-pkgrel=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	mesa-vulkan-freedreno
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	qbootctl
 	qbootctl-openrc
 	swclock-offset
@@ -51,7 +52,6 @@ nonfree_firmware() {
 		firmware-fairphone-fp4-ipa
 		firmware-fairphone-fp4-modem
 		firmware-fairphone-fp4-wlan
-		firmware-qcom-adreno-a630
 		linux-firmware-ath10k
 		msm-modem
 		msm-modem-uim-selection
@@ -3,7 +3,7 @@
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=5
-pkgrel=7
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	linux-postmarketos-rockchip
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 	soc-rockchip-rk3399
 "
 makedepends="devicepkg-dev"
@@ -3,17 +3,18 @@
 pkgname=device-google-kukui
 pkgdesc="Google Kukui Chromebooks"
 pkgver=6
-pkgrel=6
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf-cros
+	alsa-ucm-conf-google-kukui
 	depthcharge-tools
 	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
@@ -4,7 +4,7 @@
 pkgname=device-google-oak
 pkgdesc="Google Oak Chromebooks"
 pkgver=4
-pkgrel=6
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	linux-postmarketos-mediatek-mt8173
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
@@ -3,7 +3,7 @@
 pkgname=device-google-peach-pit
 pkgdesc="Samsung Chromebook 2 (11.6 inch)"
 pkgver=6
-pkgrel=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,7 +14,7 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-initramfs-minimal
+	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="
@@ -3,7 +3,7 @@
 pkgname=device-google-snow
 pkgdesc="Samsung Chromebook"
 pkgver=6
-pkgrel=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,7 +14,7 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-initramfs-minimal
+	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="
@@ -3,7 +3,7 @@
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
 pkgver=1
-pkgrel=5
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	linux-postmarketos-qcom-sc7180
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 	soc-qcom-sc7180
 "
 makedepends="devicepkg-dev"
@@ -3,7 +3,7 @@
 pkgname=device-google-veyron
 pkgdesc="Google Veyron Chromebooks"
 pkgver=5
-pkgrel=6
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,6 +14,7 @@ depends="
 	linux-google-veyron
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 "
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 makedepends="devicepkg-dev"
@@ -5,16 +5,16 @@
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
 pkgver=7
-pkgrel=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf-cros
 	depthcharge-tools
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 	systemd-boot
 	"
 makedepends="devicepkg-dev"
@@ -25,7 +25,6 @@ subpackages="
 	"
 source="deviceinfo modules-initfs"
 _pmb_recommends="
-	linux-firmware-rtw88
 	oem-intel
 	oem-amd
 "
@@ -2,20 +2,20 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=24
+pkgver=10.1
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-postmarketos-omap u-boot-tools kbd kbd-bkeymaps
-	ofono alsa-utils linux-firmware-ti-connectivity wl1251-cal wl1251-cal-openrc"
+depends="postmarketos-base linux-postmarketos-omap u-boot-tools kbd kbd-bkeymaps ofono alsa-utils"
 makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
 install="$pkgname.pre-upgrade $pkgname.post-install"
 subpackages="
 	$pkgname-x11
 	$pkgname-xkeyboard-config:xkeyboard_config
 	$pkgname-i3wm
+	$pkgname-nonfree-firmware:nonfree_firmware
 "
 source="
 	10-initfs-keymap.files
@@ -45,11 +45,10 @@ source="
 	modem-load.conf
 	modem-opts.conf
 	modules.blocklist
+	n900-wlan-data.initd
 	pointercal
-	proxishot.sh
 	uboot-script.cmd
 	udev/10-nokia-modem.rules
-	udev/80-feedbackd-twl4030.rules
 	udev/90-touchscreen-dev.rules
 	upower.conf
 	x11-keymap
@@ -94,8 +93,13 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-touchscreen-dev.rules
 	install -D -m644 "$srcdir"/10-nokia-modem.rules \
 		"$pkgdir"/etc/udev/rules.d/10-nokia-modem.rules
-	install -Dm644 "$srcdir"/80-feedbackd-twl4030.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/80-feedbackd-twl4030.rules
+
+	# ACPI
+	mkdir "$pkgdir"/etc/acpi
+	install -D -m755 "$srcdir"/acpi_handler.sh \
+		"$pkgdir"/etc/acpi/handler.sh
+	install -D -m644 "$srcdir"/acpi.map \
+		"$pkgdir"/etc/acpi.map

 	# Keymap
 	install -D -m644 "$srcdir"/keymaps/rx51_us.bmap.gz \
@@ -126,20 +130,13 @@ package() {

 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
-	depends="xset xinput scrot"
-	mkdir "$pkgdir"/etc/acpi
-	install -D -m755 "$srcdir"/acpi_handler.sh \
-		"$pkgdir"/etc/acpi/handler.sh
-	install -D -m644 "$srcdir"/acpi.map \
-		"$pkgdir"/etc/acpi.map
+	depends="xset xinput"
 	install -D -m644 "$srcdir"/40-xkb.conf \
 		"$subpkgdir"/etc/X11/xorg.conf.d/40-xkb.conf
 	install -D -m644 "$srcdir"/xorg.conf \
 		"$subpkgdir"/etc/X11/xorg.conf.d/11-n900.conf
 	install -Dm755 "$srcdir"/lock.sh \
 		"$pkgdir"/usr/bin/lock.sh
-	install -Dm755 "$srcdir"/proxishot.sh \
-		"$pkgdir"/usr/bin/proxishot.sh
 }

 xkeyboard_config() {
@@ -151,7 +148,7 @@ xkeyboard_config() {

 i3wm() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
-	depends="unclutter-xfixes i3blocks rxvt-unicode upower brightnessctl"
+	depends="unclutter-xfixes i3blocks rxvt-unicode upower"
 	install -D -m644 "$srcdir"/i3wm.conf \
 		"$subpkgdir"/etc/skel/.config/i3/config
 	install -D -m644 "$srcdir"/i3blocks.conf \
@@ -177,11 +174,20 @@ upower() {
 		"$subpkgdir"/etc/UPower/UPower.conf
 }

+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="linux-firmware-ti-connectivity wl1251-cal"
+	install="$subpkgname.post-install"
+	triggers="$subpkgname.trigger=/lib/firmware/ti-connectivity"
+
+	install -Dm755 "$srcdir/n900-wlan-data.initd" "$subpkgdir/etc/init.d/n900-wlan-data"
+}
+
 sha512sums="
 6b475c12eca8563be48c562a1cb4ad8ca6a05d70fc54b21288b2dd7435a80a6f53351aa870db96d5bbecf1b1c5cb00dfe35f5066e6d3fd0ad0369e66aeef5a21  10-initfs-keymap.files
 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh
-2e6c324c2a0627fb37ee2feff249d6c828116a9c1a32d572481dddc12648c98b726eb3a475838398742f76a60e3f2249d7707502360473b8bf2e794bf22f57ce  acpi.map
-ff51909873160c2d4c6f0c0119b6d4a02751df29f571b8596b4bc8b04ce2541913c11a583b0e5dabd43f240752a8131da45db0ddff194860f4c11198599686a1  acpi_handler.sh
+b3612348af1465c6dc21ce30153fc7e2cce3ae7f9bf9ff34d5a560e173e174275c1701dd7c45337fa56caaadb252b9494bddf997a698d665d3a8c01cde6955c7  acpi.map
+ac2f8a50280f7d5f8c5ce3ab50d00f1a4c8c1415890347542c684b6e24874a23d57a8f48c62451c46466996decc58276d737bdb892f8b284881d3760948b09bb  acpi_handler.sh
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
@@ -189,7 +195,7 @@ e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b11
 2463008d270ed09342f15b51f24ea455bd884021f95397991b85616b6840a6608d91cd1fc43186094f5c3d1bd25e88c16aa9ead07b018aea3d93cd2359bba0b1  deviceinfo
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
 826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f  i3blocks.conf
-506accabcf9fb3e2a270228ea53fdcb57f51092d6e7126a631af8eed697cd882cc805b19cf255422284bec12c928b58219d173a4a790d784db5335a059b6bb4f  i3wm.conf
+e06ae2ba1c8c8d3fd76c5d2fa6480561d5221c616d7ff50ed590e2cdbbc1dd0cb8232ee5cde43b79ec059876f49c1d1ae182bd016805a4e90b6331ce75bf4426  i3wm.conf
 0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8  protip_shell.sh
 6c6a70667f37807089adbb343c09d1f62d47b8e6c9c0a54f44790b822f8bff3dccae73341ef736b799fd6740bbd6e1f48e6e122c2e08520f71f6ad7434a47d2c  battery-bq27200
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar
@@ -201,15 +207,14 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 6e4e8b10a41d0957968736f5d780f14c7070b03913d80859cb07180e9cec9a36bbc9c639748765e48962772640974f5491627520cc36bd3d6c9d01748f9ddaff  rx51_ptes.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
-6cb3ad1253ceb682d5241e6661a4313cb88b16cbf855f45513b7320584cab062e6c6f472b4ba89ccf76c66493ea76dc3a7bed516b403e324a6fa5657621c7a09  lock.sh
+caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f  lock.sh
 157b27feebcfddf800a1ffd8c6e369d2b58e5db25b1a44b4443dada8d9fe74abb91d036b9f0e97769bbafbdc72020b5637313682c6932fe7b0bddb9ebebbad42  modem-load.conf
 695feac7f69a0ec8c5e007cdb651adcc3492f1c6236e7fd183edec2a5e25cb957d3ace630ea5fdb87fd703e35ac368f1d097c2f881ecb52c9cfd433564db2a6c  modem-opts.conf
-862ebc7cd2d7a1b3d41b10701b8418308c89eb0732eb99c42ec1091d48e08db9421727f67a3272b7309549798d59afb1b8d7d2fa48d1447b208fcb2329472d4d  modules.blocklist
+72b1554929843990a7665fdf1e45f7ef304fc45d3fa3b1082dcb9dd6cb9d3e9f6799659a8e2fdbd24a809319654543d1c20a0528856002c3de319d5546e2af8b  modules.blocklist
+b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66  n900-wlan-data.initd
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
-134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
 239a54ae5c5effb53ccf4d658652c0462da57604b16b77a63627a17caa171caf82e3d1769f9c5afea8756415acbbf3b73db9b57715fce6c70ea3f29e5c6ac84a  uboot-script.cmd
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
-03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 d46adf47194c02b434cb46751003e67ee008d60978458e69b1f59dc709a7135a70f542918c29e359ba8308bdeda58a21e8efa446d06625511af05403db90e455  upower.conf
 c7837e6688f09c7d650ac7479b8881d4bad709480a71a1dea8b5bba4f4215d6b48a3aebd3f58923bbd48813559478d4ef137dcc9838d321722e141f0aa6a6085  x11-keymap
@@ -1,12 +1,15 @@
 # FORMAT: "<EV_XXX>" <type> "<input.h name>" <keycode> <value> <script under /etc/acpi>
 # hint: "evtest /dev/input/eventX" is very helpful!

-"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 0 CAM_LID_OPEN
-"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 1 CAM_LID_CLOSE
+"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 1 CAM_LID_OPEN
+"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 0 CAM_LID_CLOSE

 "EV_SW" 0x05 "SW_KEYPAD_SLIDE" 10 1 KP_SLIDE_OPEN
 "EV_SW" 0x05 "SW_KEYPAD_SLIDE" 10 0 KP_SLIDE_CLOSE

+"EV_SW" 0x05 "SW_FRONT_PROXIMITY" 11 1 FRNT_PRXY_ON
+"EV_SW" 0x05 "SW_FRONT_PROXIMITY" 11 0 FRNT_PRXY_OFF
+
 "EV_KEY" 0x01 "KEY_SCREENLOCK" 152 0 SCRNLCK_UP
 "EV_KEY" 0x01 "KEY_SCREENLOCK" 152 1 SCRNLCK_DWN

@@ -16,9 +19,15 @@
 "EV_KEY" 0x01 "KEY_CAMERA_FOCUS" 528 0 CAM_FOCUS_UP
 "EV_KEY" 0x01 "KEY_CAMERA_FOCUS" 528 1 CAM_FOCUS_DWN

+"EV_KEY" 0x01 "KEY_POWER" 116 0 PWR_BTN_UP
+"EV_KEY" 0x01 "KEY_POWER" 116 1 PWR_BTN_DWN
+
 "EV_SW" 0x05 "SW_HEADPHONE_INSERT" 2 1 HEADPHONE_INSERT
 "EV_SW" 0x05 "SW_HEADPHONE_INSERT" 2 0 HEADPHONE_REMOVE
 "EV_SW" 0x05 "SW_MICROPHONE_INSERT" 2 1 MICROPHONE_INSERT
 "EV_SW" 0x05 "SW_MICROPHONE_INSERT" 2 0 MICROPHONE_REMOVE
 "EV_SW" 0x05 "SW_VIDEOOUT_INSERT" 2 1 VIDEOOUT_INSERT
 "EV_SW" 0x05 "SW_VIDEOOUT_INSERT" 2 0 VIDEOOUT_REMOVE
+
+"EV_KEY" 0x01 "KEY_VOLUMEUP" 66 1 VOL_UP
+"EV_KEY" 0x01 "KEY_VOLUMEDOWN" 65 1 VOL_DWN
@@ -1,6 +1,5 @@
 #!/bin/ash

-user=$( getent passwd 10000 | cut -d: -f1 )
 cmd=$( echo $0 | awk '{i=split($0,a,"/"); print a[i]}' )

 function adjust_keypad_bl {
@@ -11,15 +10,13 @@ function adjust_keypad_bl {

 case $cmd in
 	KP_SLIDE_OPEN)
-		adjust_keypad_bl 63
-		su $user -c 'DISPLAY=:0.0 /usr/bin/xset dpms force on'
-		su $user -c 'DISPLAY=:0.0 /usr/bin/xinput enable "TSC2005 touchscreen"'
+		adjust_keypad_bl 255
 		;;
 	KP_SLIDE_CLOSE)
 		adjust_keypad_bl 0
 		;;
 	CAM_BTN_DWN)
-		USER_USER="$user" /usr/bin/proxishot.sh
+		echo "Not implemented yet"
 		;;
 	CAM_BTN_UP)
 		echo "Not implemented yet"
@@ -36,32 +33,58 @@ case $cmd in
 	CAM_LID_OPEN)
 		echo "Not implemented yet"
 		;;
+	FRNT_PRXY_OFF)
+		echo "Not implemented yet"
+		;;
+	FRNT_PRXY_ON)
+		echo "Not implemented yet"
+		;;
+	KP_SLIDE_CLOSE)
+		echo "Not implemented yet"
+		;;
+	KP_SLIDE_OPEN)
+		echo "Not implemented yet"
+		;;
 	SCRNLCK_DWN)
-		su $user -c "DISPLAY=:0 /usr/bin/lock.sh"
+		echo "Not implemented yet"
 		;;
 	SCRNLCK_UP)
 		echo "Not implemented yet"
 		;;
-	HEADPHONE_INSERT)
-		alsactl restore -f /var/lib/alsa/asound.state.headset
-		;;
-	HEADPHONE_REMOVE)
-		alsactl restore -f /var/lib/alsa/asound.state.speakers
-		;;
-	MICROPHONE_INSERT)
-		echo "Not implemented yet"
-		;;
-	MICROPHONE_REMOVE)
-		echo "Not implemented yet"
-		;;
-	VIDEOOUT_INSERT)
-		echo "Not implemented yet"
-		;;
-	VIDEOOUT_REMOVE)
-		echo "Not implemented yet"
-		;;
+		HEADPHONE_INSERT)
+				alsactl restore -f /var/lib/alsa/asound.state.headset
+				;;
+		HEADPHONE_REMOVE)
+				alsactl restore -f /var/lib/alsa/asound.state.speakers
+				;;
+		MICROPHONE_INSERT)
+				echo "Not implemented yet"
+				;;
+		MICROPHONE_REMOVE)
+				echo "Not implemented yet"
+				;;
+		PWR_BTN_DWN)
+				echo "Not implemented yet"
+				;;
+		PWR_BTN_UP)
+				echo "Not implemented yet"
+				;;
+		VIDEOOUT_INSERT)
+				echo "Not implemented yet"
+				;;
+		VIDEOOUT_REMOVE)
+				echo "Not implemented yet"
+				;;
+		VOL_DWN)
+				echo "Not implemented yet"
+				;;
+		VOL_UP)
+				echo "Not implemented yet"
+				;;
 	*)
 		echo "Unknown event"
 		exit 1
 		;;
 esac
+
+
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rc-update add n900-wlan-data boot
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ -f /lib/firmware/ti-connectivity/wl1251-nvs.bin ] && n900-update-wl1251
+
+exit 0
@@ -60,6 +60,9 @@ mode "command" {
 # Enter command mode
 bindsym Shift+space mode "command"

+# This is the slidey button on the side
+bindsym XF86ScreenSaver exec --no-startup-id lock.sh
+
 # Pressing the power button offers reboot, shutdown, or suspend choice
 bindsym XF86PowerOff exec --no-startup-id i3-nagbar \
        -m 'Choose Power Button Action:' \
@@ -67,13 +70,6 @@ bindsym XF86PowerOff exec --no-startup-id i3-nagbar \
        -B 'Suspend' 'loginctl suspend' \
        -B 'Shutdown' 'loginctl poweroff'

-bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set PCM 5%+
-bindsym XF86AudioLowerVolume exec --no-startup-id amixer set PCM 5%-
-
-# Adjust display brightness using Shift + Volume buttons in 10% steps
-bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id brightnessctl --quiet --class=backlight set +10%
-bindsym Shift+XF86AudioLowerVolume exec --no-startup-id brightnessctl --quiet --class=backlight set 10%-
-
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
@@ -91,7 +87,4 @@ bar {

 # Hide mouse cursor
 exec --no-startup-id unclutter-xfixes --fork
-# Do not handle gpio_key events as they are handled by acpid
-exec --no-startup-id xinput disable gpio_keys
-# Turn display off after 2 minutes of idle
-exec --no-startup-id xset dpms 0 0 120
+
@@ -1,17 +1,14 @@
 #!/bin/sh

-display=off
-if xset q | grep -iq "monitor is on"; then
-	display=on
+FILE=~/.screenoff
+if [ -f $FILE ]; then
+	xinput set-prop 8 "Device Enabled" 1
+	xset dpms force on
+	rm "$FILE"
+else
+	xinput set-prop 8 "Device Enabled" 0
+	# Turn screen off twice (sometimes it does not work on first run)
+	xset dpms force off
+	xset dpms force off
+	touch "$FILE"
 fi
-
-case "$display" in
-	off)
-		xinput enable "TSC2005 touchscreen"
-		xset dpms force on
-		;;
-	on)
-		xinput disable "TSC2005 touchscreen"
-		xset dpms force off
-		;;
-esac
@@ -7,6 +7,3 @@ blacklist omap3_isp
 blacklist hci_nokia
 blacklist hci_uart
 blacklist ehci_omap
-# do not autoload leds_gpio used by the debug leds, since it is now initialized
-# in ON state, interfering with the keyboard backlight
-blacklist leds_gpio
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+description="Update N900 WLAN calibration data"
+
+depend()
+{
+	before modules
+	after localmount
+}
+
+start()
+{
+	if [ ! -f /var/lib/n900_cal/done ]
+	then
+		n900-update-wl1251
+		mkdir -p /var/lib/n900_cal
+		touch /var/lib/n900_cal/done
+	fi
+
+	eend $?
+}
@@ -1,12 +0,0 @@
-#!/bin/sh
-# Take a screenshot if the proximity sensor is covered.
-# NB: pass the user's username in USER_USER environment variable when calling
-# this script.
-/usr/bin/evtest --query /dev/input/by-path/platform-gpio_keys-event \
-	EV_SW SW_FRONT_PROXIMITY
-# return value of `10` means the sensor is in the set state, i.e.
-# proximity = near. see `man 1 evtest`
-if [ "$?" = "10" ]; then
-	su "$USER_USER" -c "/bin/mkdir -p ~/Screenshots"
-	su "$USER_USER" -c 'cd ~/Screenshots && DISPLAY=:0 /usr/bin/scrot "%Y-%m-%d_%H-%M-%S.png"'
-fi
@@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ATTRS{name}=="twl4030:vibrator", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
@@ -6,8 +6,8 @@

 pkgname=device-nvidia-tegra-armv7
 pkgdesc="NVIDIA Tegra ARMv7"
-pkgver=2
-pkgrel=0
+pkgver=1.2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -3,8 +3,8 @@

 pkgname=device-odroid-xu4
 pkgdesc="ODROID XU4"
-pkgver=1
-pkgrel=0
+pkgver=0.2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=13
-pkgrel=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
@@ -42,6 +43,7 @@ nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
 	depends="
 		firmware-oneplus-sdm845>=9
+		firmware-oneplus-sdm845-initramfs
 		hexagonrpcd
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem
@@ -4,7 +4,7 @@
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=13
-pkgrel=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
@@ -42,6 +43,7 @@ nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
 	depends="
 		firmware-oneplus-sdm845>=9
+		firmware-oneplus-sdm845-initramfs
 		hexagonrpcd
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem
@@ -3,12 +3,12 @@
 pkgname=device-samsung-espresso10
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
 pkgver=1
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-omap mkbootimg"
+depends="postmarketos-base postmarketos-update-kernel linux-postmarketos-omap mkbootimg"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -4,12 +4,12 @@
 pkgname=device-samsung-espresso7
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
 pkgver=1
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-omap mkbootimg"
+depends="postmarketos-base postmarketos-update-kernel linux-postmarketos-omap mkbootimg"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -2,8 +2,8 @@
 # Maintainer: Newbyte <newbyte@disroot.org>
 pkgname=device-samsung-m0
 pkgdesc="Samsung Galaxy S III"
-pkgver=7
-pkgrel=1
+pkgver=6.3
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-exynos4
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	soc-samsung-exynos4412-haptics
 	"
 makedepends="devicepkg-dev"
@@ -4,7 +4,7 @@
 pkgname=device-samsung-manta
 pkgdesc="Google Nexus 10"
 pkgver=7
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-exynos5
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 "
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -5,7 +5,7 @@
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
 pkgver=14
-pkgrel=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
@@ -44,6 +45,7 @@ nonfree_firmware() {
 	pkgdesc="Modem, GPU and WiFi Firmware, also needed for osk-sdl"
 	depends="
 		firmware-shift-sdm845>=20230815-r2
+		firmware-shift-sdm845-initramfs
 		hexagonrpcd
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem
@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
 pkgver=10
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,6 +14,7 @@ depends="
 	mkbootimg
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
+	postmarketos-update-kernel
 "
 makedepends="devicepkg-dev"
 subpackages="
@@ -1,5 +0,0 @@
-SUBSYSTEM=="input", ENV{DEVNAME}=="/dev/input/event1", \
-ATTRS{name}=="Goodix Capacitive TouchScreen", \
-ENV{WL_CALIBRATION}="4.00 0.00 0.00 0.00 1.80 0.00", \
-ENV{LIBINPUT_CALIBRATION_MATRIX}="4.00 0.00 0 0.00 1.80 0", \
-ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1"
@@ -2,32 +2,26 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
-pkgver=11
+pkgver=9
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	firmware-qcom-adreno-a530
-	firmware-xiaomi-daisy
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
-	msm-firmware-loader
 	postmarketos-base
-	qbootctl
 	soc-qcom-msm8953
-	soc-qcom-msm8953-initramfs
-	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
-subpackages="$pkgname-fake-goodix:fake_goodix"
-
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
 source="
 	deviceinfo
 	modules-initfs
-	90-device-xiaomi-daisy.rules
 "

 build() {
@@ -38,13 +32,19 @@ package() {
 	devicepkg_package $startdir $pkgname
 }

-fake_goodix() {
-	pkgdesc="Calibration data for replacement goodix touch controllers"
-	install -Dm644 90-device-xiaomi-daisy.rules -t "$subpkgdir/etc/udev/rules.d/"
+nonfree_firmware() {
+	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware"
+	depends="
+		firmware-xiaomi-daisy
+		msm-firmware-loader
+		qbootctl
+		soc-qcom-msm8953-initramfs
+		soc-qcom-msm8953-modem
+	"
+	mkdir "$subpkgdir"
 }

 sha512sums="
-493e74847984e51c4f788f1272351571411ba21dea6c3ad1fd2d669271e197bd6f55a8720e97c00480a30dd2803515384fe55362c90c5800fe8ef51f6c7c5521  deviceinfo
+8c5980c1da9e5bc91f11bb8056ac9a225cb84a90a42a964dc0dc2966220c105683081055fdcb1caa8c198019d8373d8c5fe27155429c17814d34075d5f961aa4  deviceinfo
 7202f0a55dfe43348940412fc38e59c855594b070db8742419feadb2299086d5810107201a228b7137b7cc7a97c94afac95d81c0cd65c52f31dbcb619b0a4279  modules-initfs
-a2608b01b7b6e2dade694af355ff4f0f26cad49cf54bc332c77eb75d19fdc985f7f996fedb72753de447be0391deabf5fcea52406791d1e6e0d165703b63f145  90-device-xiaomi-daisy.rules
 "
@@ -24,7 +24,6 @@ deviceinfo_swap_size_recommended="1024"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
@@ -2,26 +2,22 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-markw
 pkgdesc="Xiaomi Redmi 4 Prime"
-pkgver=6
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	firmware-qcom-adreno-a530
-	firmware-xiaomi-markw
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
-	msm-firmware-loader
 	postmarketos-base
 	soc-qcom-msm8953
-	soc-qcom-msm8953-initramfs
-	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -31,7 +27,18 @@ package() {
 	devicepkg_package $startdir $pkgname
 }

+nonfree_firmware() {
+	pkgdesc="WiFi, Bluetooth, Modem, Display and GPU Firmware"
+	depends="
+		firmware-xiaomi-markw
+		msm-firmware-loader
+		soc-qcom-msm8953-initramfs
+		soc-qcom-msm8953-modem
+	"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
-045c326d054120720b4971b10fc367fbb96b95621e6e1b5d453b8fbd90191bc7040adfda11215975d0e117487ca3882149fbee94bfd75b68896eb8b94578a68d  deviceinfo
+0d393f07e551058781a67c096b1ad7f252c78e801a2da8752f893f4ea7c24f7aa65bc69f9c80c7be53e615269a7028eb151e7bc3fe79f0c260a4d28e97f10e7d  deviceinfo
 0cba88d7ede62dc7c47feefb27d10e58e4c93498bec97cd274a1d10c4f16dff06c5472ed555170e0392a57c9269cc50bf550523f41bf1ba6c600af533302574b  modules-initfs
 "
@@ -23,7 +23,6 @@ deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
@@ -1,26 +1,22 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=device-xiaomi-mido
 pkgdesc="Xiaomi Redmi Note 4X"
-pkgver=7
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	firmware-qcom-adreno-a530
-	firmware-xiaomi-mido
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
-	msm-firmware-loader
 	postmarketos-base
 	soc-qcom-msm8953
-	soc-qcom-msm8953-initramfs
-	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -30,7 +26,19 @@ package() {
 	devicepkg_package $startdir $pkgname
 }

+nonfree_firmware() {
+	pkgdesc="Proprietary firmware"
+	depends="
+		firmware-xiaomi-mido
+		linux-firmware-qcom
+		msm-firmware-loader
+		soc-qcom-msm8953-initramfs
+		soc-qcom-msm8953-modem
+	"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
-815d228250a6783e02fa4107526bc2eae5428c05e48ed77a651980f00917a44e6bcecdac7835ad4a24320d4be2c510e2879a45a2b06accc3217d97d7bbf32e9e  deviceinfo
+cdca8edd4ccb13c0198493dcf14e43a2acf8eaddc1dcfba6eb895485b172c7315ab389011fdf9bb54b68a4fb82c31d9a7b50caa566d1aa992a347facb49758b4  deviceinfo
 9f534c76689728c3fa699ac8c854ca82815d5158a3675a70ef879ddbf140460977187dc3c1a799dadd0ab53d5a08b6275a1594a7b976eda983f3e78b2738a8be  modules-initfs
 "
@@ -23,7 +23,6 @@ deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=11
+pkgrel=10
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,6 +14,7 @@ depends="
 	mesa-egl
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	soc-qcom-msm8996
 	soc-qcom-msm8996-ucm
 	"
@@ -4,27 +4,22 @@

 pkgname=device-xiaomi-tissot
 pkgdesc="Xiaomi Mi A1"
-pkgver=7
-pkgrel=0
+pkgver=6
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	firmware-qcom-adreno-a530
-	firmware-xiaomi-tissot
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
-	msm-firmware-loader
 	postmarketos-base
-	qbootctl
 	soc-qcom-msm8953
-	soc-qcom-msm8953-initramfs
-	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -34,7 +29,19 @@ package() {
 	devicepkg_package $startdir $pkgname
 }

+nonfree_firmware() {
+	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware"
+	depends="
+		firmware-xiaomi-tissot
+		msm-firmware-loader
+		qbootctl
+		soc-qcom-msm8953-initramfs
+		soc-qcom-msm8953-modem
+	"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
-aed10dce67aa863073d5978d7ad47683ffdc7118cffc96c670b914c8dd423c79ee4cebd4878836e44cc6f2b62f67c7cfb7d7f28664bfc8b0f6499c982b0ead4c  deviceinfo
+e94d5aeae51c697d4483dc1d7a5eb4980a37ad3dec693ddd8f7b829ed5583a200254b393d0337b3180e36289cb4eba60a6667bd3cf08d2c994a03ac3092d22df  deviceinfo
 4284d7c184f364d81a06de962808cb240b713cda11381ddcec5acdfbb4d4962922b64b2f2675ab463961c0510352211ec439a6b9e4ebdc47bf73980133e9626a  modules-initfs
 "
@@ -21,7 +21,6 @@ deviceinfo_swap_size_recommended="512"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=null"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
@@ -2,25 +2,21 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-vince
 pkgdesc="Xiaomi Redmi 5 Plus"
-pkgver=13
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	firmware-qcom-adreno-a530
-	firmware-xiaomi-vince
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
-	msm-firmware-loader
 	postmarketos-base
 	soc-qcom-msm8953
-	soc-qcom-msm8953-initramfs
-	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	modules-initfs
@@ -34,7 +30,18 @@ package() {
 	devicepkg_package $startdir $pkgname
 }

+nonfree_firmware() {
+	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware"
+	depends="
+		firmware-xiaomi-vince
+		msm-firmware-loader
+		soc-qcom-msm8953-initramfs
+		soc-qcom-msm8953-modem
+	"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
-e8cc57aa54f3564baf44e2d813a3573d999354ec81732de2a97ac7f0ebb32827c54ef1d4bb4e1149109c426cc1b4faad379b3bd16d0a72ef8f9be532f93ae7f8  deviceinfo
+b39437cc3b8cfa2b6aed96bc540404e7623b2a101737708f0f32ed41ec33aa56cc51d267ddfd834e81d3bbc901f4ab82664f3c54ac8281277364a656e22ef421  deviceinfo
 69cfc8db6ea497576085e1b5861c766b5c6cfbd493e4d66aa0bfa29a0e80eeaeb8a465c4841c6a7959796f5a2325e621d60f2c35ccb0741d7934ab310abe807f  modules-initfs
 "
@@ -27,7 +27,6 @@ deviceinfo_getty="ttyMSM0;115200"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
@@ -2,26 +2,22 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-ysl
 pkgdesc="Xiaomi Redmi S2/Y2"
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	firmware-qcom-adreno-a530
-	firmware-xiaomi-ysl
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
-	msm-firmware-loader
 	postmarketos-base
 	soc-qcom-msm8953
-	soc-qcom-msm8953-initramfs
-	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -31,7 +27,18 @@ package() {
 	devicepkg_package $startdir $pkgname
 }

+nonfree_firmware() {
+	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware"
+	depends="
+		firmware-xiaomi-ysl
+		msm-firmware-loader
+		soc-qcom-msm8953-initramfs
+		soc-qcom-msm8953-modem
+	"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
-559dbc06a031cd4b2b5f8dd612ea647313eeed6170eb97d26332f75daf7f41613c8f759aa64f2e5c70adabdb44ff9a5f60fe02869ad8f80a9b15cfca9d673d59  deviceinfo
+b80c6f67c97d4ed3292a4f68fefea75e2944125232a1862c2088e3806f37a43043e193341d7d81abd59ad2fea9d696af04ae576acdc21a6125e925570cbaafa7  deviceinfo
 b5e4f6dec04a9a7d7231a62d8b60e17a9a5265768eb80050225c0f57b8188ec108d8b7155ccb70ba95201906b653d19ef33a0ff04072da040b0242d7032b103d  modules-initfs
 "
@@ -22,7 +22,6 @@ deviceinfo_screen_height="1440"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=null"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
@@ -1,23 +0,0 @@
-# Maintainer: Clayton Craft <clayton@craftyguy.net>
-pkgname=firmware-b43xx
-pkgver=6.30.163.46
-pkgrel=0
-pkgdesc="Firmware for Broadcom B43xx WiFi chipsets"
-url="https://www.lwfinger.com/b43-firmware/"
-arch="x86_64"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-source="$pkgname-$pkgver.tar.bz2::https://www.lwfinger.com/b43-firmware/broadcom-wl-$pkgver.tar.bz2"
-makedepends="b43-fwcutter"
-builddir="$srcdir"
-
-package() {
-	mkdir -p "$pkgdir"/lib/firmware/postmarketos
-	b43-fwcutter \
-		-w "$pkgdir"/lib/firmware/postmarketos/ \
-		broadcom-wl-"$pkgver".wl_apsta.o
-}
-
-sha512sums="
-0144894fbbb5e8ebab6c423d9bd0f3249be94f2f468a50b8bf721a3b17f1f6e57467c79e87abc8d136bfc92e701ed046885fead892e9a73efa5217d710311ae9  firmware-b43xx-6.30.163.46.tar.bz2
-"
@@ -0,0 +1,3 @@
+/lib/firmware/qcom/a630_gmu.bin
+/lib/firmware/qcom/a630_sqe.fw
+/lib/firmware/qcom/sdm845/oneplus6/a630_zap.mbn
@@ -2,7 +2,7 @@

 pkgname=firmware-oneplus-sdm845
 pkgver=9
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware for OnePlus 6 / 6T"
 url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845"
 arch="aarch64"
@@ -13,13 +13,15 @@ options="!check !strip !archcheck !tracedeps textrels pmb:cross-native"
 _version="dc9c77f220d104d7224c03fcbfc419a03a58765e"
 _board2_commit="fc750b3f1bda29c08cfe9329eb781c0ae3608456"

-source="$pkgname-$_version.tar.gz::$url/-/archive/$_version/$pkgname-$_version.tar.gz
+source="$pkgname.tar.gz::$url/-/archive/$_version/$pkgname-$_version.tar.gz
 	firmware.files
 	sensor.files
+	30-gpu-firmware.files
 	board-2.bin::https://gitlab.com/dylanvanassche/ath10k-firmware/-/raw/$_board2_commit/linux-firmware/board-2.bin
 	30-oneplus-sdm845-firmware-ci.files
 "
 subpackages="
+	$pkgname-initramfs:firmware_initramfs
 	$pkgname-pmtest
 	$pkgname-sensors:firmware_sensors
 "
@@ -35,6 +37,16 @@ package() {
 		"$pkgdir"/lib/firmware/postmarketos/ath10k/WCN3990/hw1.0/board-2.bin
 }

+firmware_initramfs() {
+	pkgdesc="Files to be included in the initramfs to support osk-sdl"
+	depends="$pkgname"
+	install_if="$pkgname-nonfree-firmware"
+	mkdir "$subpkgdir"
+
+	install -Dm644 "$srcdir/30-gpu-firmware.files" \
+		"$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files"
+}
+
 pmtest() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci"

@@ -57,9 +69,10 @@ firmware_sensors() {
 }

 sha512sums="
-d14b22434016cb12b8c04a3e7ac186451d77b92284e926a2771d958960d4da8ffb10cb9db555a200babcedd7be3379d2840882d19c26edc88805eee943310c2f  firmware-oneplus-sdm845-dc9c77f220d104d7224c03fcbfc419a03a58765e.tar.gz
+d14b22434016cb12b8c04a3e7ac186451d77b92284e926a2771d958960d4da8ffb10cb9db555a200babcedd7be3379d2840882d19c26edc88805eee943310c2f  firmware-oneplus-sdm845.tar.gz
 23e4ea891f688bf5669e4b8479aab06b56c5478429b759c22fa417e1ad09cb413e55856140b456c6b676b8920ecec40aa0215d8fd61a23ac2c5c02240552f247  firmware.files
 4e5c4f55d4b084c6c21810b93a63a75ad86dd04cd1c079497bd2387f8bd0a411053ca1e894974af8bfda77ddc79c92a6669550be3a48fbef01cf797b54d6cb67  sensor.files
+bc6c329bf6bb9622320ab610f4f5fb944129e276855a4cf5646cb29a553f4c47cd9a4ef4305cbcd94a991471bc109b8f615cefd6871be99bf6a457fe0fa5aa19  30-gpu-firmware.files
 a8eaab63f467553a65789a316d6f58cc15b0ad9bf3f698e6dbe51efa841db7f62a69d0c24b69da4f36de4a01dc29b723911d9cf17f925d3ce1170cbfa6b16029  board-2.bin
 d6a81ab4697e763eebf2b428e8a63dbdd0a44743691d9277e9d3c7de26dbcbddaea1928a6cfa5509f8f41506d8812022f200ec47f87d28e05af77302683ffcf4  30-oneplus-sdm845-firmware-ci.files
 "
@@ -1,5 +1,5 @@
 pkgname=firmware-samsung-midas
-pkgver=6.1
+pkgver=6.0
 pkgrel=0
 pkgdesc="Samsung Galaxy Midas board firmware (m0, m3, t0lte, ...)"
 _commit="fdd8c44568a148c22fbf008de822ff4e27992da1"
@@ -10,8 +10,6 @@ _androguide_commit="d5a8735a6ad1fff3091f100383ac004f411d7528"
 _androguide_url="https://raw.githubusercontent.com/Androguide/android_vendor_samsung"
 _vendor_bsp_uboot_commit="246091921433dd11c211a306f042d949ada38924"
 _vendor_bsp_uboot_url="https://github.com/dmarszk/exynos4_uboot"
-_gr8nole_url="https://raw.githubusercontent.com/gr8nole/proprietary_vendor_samsung"
-_gr8nole_commit="38ea48dbc6a683874aaf3376b63fc97ff3823459"
 arch="armv7"
 license="proprietary"
 replaces="firmware-samsung-m0"
@@ -25,9 +23,6 @@ source="
 	bcm4334.hcd-$_commit::$url/raw/$_commit/smdk4412-common/proprietary/bin/bcm4334.hcd
 	brcmfmac4334-sdio.samsung,i9300-$_armbian_commit.txt::$_armbian_url/raw/$_armbian_commit/brcm/brcmfmac4334-sdio.rockchip%2Crk3318-box.txt
 	brcmfmac4334-sdio.samsung,i9305-$_androguide_commit.txt::$_androguide_url/$_androguide_commit/smdk4412-common/proprietary/system/etc/wifi/nvram_net.txt
-	brcmfmac4334-sdio.samsung,t310-$_gr8nole_commit.txt::$_gr8nole_url/$_gr8nole_commit/lt01wifi/proprietary/system/etc/wifi/nvram_net.txt
-	brcmfmac4334-sdio.samsung,t311-$_gr8nole_commit.txt::$_gr8nole_url/$_gr8nole_commit/lt013g/proprietary/system/etc/wifi/nvram_net.txt
-	brcmfmac4334-sdio.samsung,t315-$_gr8nole_commit.txt::$_gr8nole_url/$_gr8nole_commit/lt01lte/proprietary/system/etc/wifi/nvram_net.txt
 	"
 options="!check !strip !archcheck !spdx !tracedeps pmb:cross-native"

@@ -59,21 +54,10 @@ wifi() {
 		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9300.txt
 	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,i9305-$_androguide_commit.txt \
 		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9305.txt
-	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,t310-$_gr8nole_commit.txt \
-		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t310.txt
-	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,t311-$_gr8nole_commit.txt \
-		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t311.txt
-	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,t315-$_gr8nole_commit.txt \
-		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t315.txt
 	ln -s /lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9305.txt \
 		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,n710x.txt
 	ln -s /lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9300.txt \
 		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,n8010.txt
-
-	for _device in "samsung,t310" "samsung,t311" "samsung,t315"; do
-		ln -s /lib/firmware/brcm/brcmfmac4334-sdio.bin \
-			"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.$_device.bin
-	done
 }

 sha512sums="
@@ -81,7 +65,4 @@ sha512sums="
 cbed1dc60829161c7ac9649dcae67fc45204c1a25e8de320ad3bc4e9d5cae573fb8a4745f91355fa96d2d3d4124a9e707341fc5bd1b22705cb2efb16831e029f  bcm4334.hcd-fdd8c44568a148c22fbf008de822ff4e27992da1
 d5c83e1dcd67630e186ab484d150ca5c0af12810de62a46ec6e525b50dabf64a75f1231ef8d7c1d102fb76389210fdb952975460179ca767acd0ffdd869907d7  brcmfmac4334-sdio.samsung,i9300-5ff122ef309a1ddabb4bf7f37c8347c43b314a61.txt
 146aefcccd23d63e434bd7f7d0ac6d5975ad25e44362da10bc583ab9e38b18c53f6ce18890c9790ee88fbb8f6358085bb615d0595388ca43a322f7c819614049  brcmfmac4334-sdio.samsung,i9305-d5a8735a6ad1fff3091f100383ac004f411d7528.txt
-1359b10a0cd043f02fa939e827e24aaa35cf03eee5e5a78f83437899c86e78d5b973b36a61535211bab5dd7e6d210065c1f81addd716caaac147fbfc6c70bac2  brcmfmac4334-sdio.samsung,t310-38ea48dbc6a683874aaf3376b63fc97ff3823459.txt
-81b722b2d5eb3446606a7b10001aeed7af8a8139379c8525d5ddd990a5b10dd3e2103c498d65c0e31cbda7bafc0988dc25b2d227b20dcdf88c5dc57eaa771956  brcmfmac4334-sdio.samsung,t311-38ea48dbc6a683874aaf3376b63fc97ff3823459.txt
-547780ac164b4a7a989965b1561fb318ae30187d2ad45ec0add001c037f2a732abcc73acf8be6f0aee55d28eccb89b992f7d30acd9872d1998682d9110eec09e  brcmfmac4334-sdio.samsung,t315-38ea48dbc6a683874aaf3376b63fc97ff3823459.txt
 "
@@ -0,0 +1,3 @@
+/lib/firmware/qcom/a630_gmu.bin
+/lib/firmware/qcom/a630_sqe.fw
+/lib/firmware/qcom/sdm845/axolotl/a630_zap.mbn
@@ -2,7 +2,7 @@

 pkgname=firmware-shift-sdm845
 pkgver=20230815
-pkgrel=3
+pkgrel=2
 pkgdesc="Firmware for SHIFT sdm845 devices"
 url="https://gitlab.com/sdm845-mainline/firmware-shift-sdm845"
 arch="aarch64"
@@ -20,9 +20,11 @@ _board2_commit="fc750b3f1bda29c08cfe9329eb781c0ae3608456"
 source="$pkgname.tar.gz::$url/-/archive/$_version/$pkgname-$_version.tar.gz
 	firmware.files
 	sensors.files
+	30-gpu-firmware.files
 	30-shift-sdm845-firmware-ci.files
 	board-2.bin::https://gitlab.com/dylanvanassche/ath10k-firmware/-/raw/$_board2_commit/linux-firmware/board-2.bin"
 subpackages="
+	$pkgname-initramfs:firmware_initramfs
 	$pkgname-pmtest
 	$pkgname-sensors:firmware_sensors
 "
@@ -40,6 +42,16 @@ package() {
 		"$pkgdir"/lib/firmware/postmarketos/ath10k/WCN3990/hw1.0/board-2.bin
 }

+firmware_initramfs() {
+	pkgdesc="Files to be included in the initramfs to support osk-sdl"
+	depends="$pkgname"
+	install_if="$pkgname-nonfree-firmware"
+	mkdir "$subpkgdir"
+
+	install -Dm644 "$srcdir/30-gpu-firmware.files" \
+		"$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files"
+}
+
 pmtest() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci"

@@ -65,6 +77,7 @@ sha512sums="
 72cbbbc2d1ea2698ee25e554cdb099729c059a01ab21efe66d2dd60c7aff7b138ec1b4dc1b5b86e5d69a87ef2950b614f36089e919c9436881cc2a3fbe384d55  firmware-shift-sdm845.tar.gz
 2f1087a2133d5dbdaad94927be9e88acdceb6873eab731b76b295b5248e5a91c3e9e6498b4400fc7219ba378ca4362448b882ccd87d2e73ae5fbf0fd613277ba  firmware.files
 be1aa0e7d1a5689d2f6b85d6244d0a2ec0729b92d3a165fc5162f039849ee2da49b311a4713cd11924ee70933dacb88c879b805504bb89709f10807d89207a15  sensors.files
+8695a37da5578fdae506f373131ce9481be3db1a86f329c19893e7360b9cb0fadd47b0b1318b2e74702c5e76a9be022f58610940ad17becab49788689f6ca3f8  30-gpu-firmware.files
 97756b554cc0f91a69f511496663a012287517ec5853167246fe59c4deeb1cbf1eb352ec267bd0ad897e3f30547d2ad2818e70b597d9dfec26db45efca85b3f2  30-shift-sdm845-firmware-ci.files
 a8eaab63f467553a65789a316d6f58cc15b0ad9bf3f698e6dbe51efa841db7f62a69d0c24b69da4f36de4a01dc29b723911d9cf17f925d3ce1170cbfa6b16029  board-2.bin
 "
@@ -1,7 +1,7 @@
 # Maintainer: Alejandro Tafalla <alikates@dnyon.com>
 pkgname=firmware-xiaomi-daisy
 pkgver=2
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware files for Xiaomi Mi A2 Lite"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -12,12 +12,14 @@ source="$pkgname-$_commit.tar.gz::https://github.com/alikates/firmware-xiaomi-da
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 builddir="$srcdir/firmware-xiaomi-daisy-$_commit/gpu"

-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware"

 package() {
 	# GPU firmwares
-	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
-	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a530_pfp.fw -t "$pkgdir/$_fwdir/qcom"
+	install -Dm644 a530_pm4.fw -t "$pkgdir/$_fwdir/qcom"
 }

 sha512sums="
@@ -2,7 +2,7 @@

 pkgname=firmware-xiaomi-markw
 pkgver=2
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware files for Xiaomi Redmi 4 Prime (markw)"
 url="https://gitlab.com/vipaoL/firmware-xiaomi-markw"
 arch="aarch64"
@@ -13,12 +13,14 @@ _commit="8cc7f7d9e56aa9fa0193403b694115d759eafaf2"

 source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware"

 package() {
 	# GPU firmwares
-	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
-	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a530_pfp.fw -t "$pkgdir/$_fwdir/qcom"
+	install -Dm644 a530_pm4.fw -t "$pkgdir/$_fwdir/qcom"
 }

 sha512sums="
@@ -3,7 +3,7 @@

 pkgname=firmware-xiaomi-tissot
 pkgver=2
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware files for Xiaomi Mi A1"
 url="https://gitlab.com/jiaxyga/firmware-xiaomi-tissot"
 arch="aarch64"
@@ -14,12 +14,14 @@ _commit="bf686895224cae33c2130932b4a5914fea415287"

 source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware"

 package() {
 	# GPU firmwares
-	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
-	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a530_pfp.fw -t "$pkgdir/$_fwdir/qcom"
+	install -Dm644 a530_pm4.fw -t "$pkgdir/$_fwdir/qcom"
 }

 sha512sums="
@@ -1,7 +1,7 @@
 # Maintainer: m0rf30 <morf3089@gmail.com>
 pkgname=firmware-xiaomi-vince
 pkgver=4
-pkgrel=1
+pkgrel=0
 _commit="9acb58a25d66314700eeea15c69c4571154f19cc"
 pkgdesc="Firmware files for Xiaomi Redmi 5 Plus"
 url="https://postmarketos.org"
@@ -10,12 +10,14 @@ license="proprietary"
 source="vince-fw-$_commit.tar.gz::https://github.com/M0Rf30/postmarketos-vendor-xiaomi-vince/archive/$_commit.tar.gz"
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 builddir="$srcdir/postmarketos-vendor-xiaomi-vince-$_commit/gpu"
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware"

 package() {
 	# GPU firmwares
-	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
-	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a530_pfp.fw -t "$pkgdir/$_fwdir/qcom"
+	install -Dm644 a530_pm4.fw -t "$pkgdir/$_fwdir/qcom"
 }

 sha512sums="
@@ -1,7 +1,7 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=firmware-xiaomi-ysl
 pkgver=3
-pkgrel=1
+pkgrel=0
 pkgdesc="Firmware files for Xiaomi Redmi S2/Y2"
 url="https://gitlab.com/barni2000/$pkgname"
 arch="aarch64"
@@ -13,12 +13,14 @@ _commit="ccfd274b825aec2d80e834b16499a6d9ba96c3f5"
 source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"

-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware"

 package() {
 	# GPU Firmware files
-	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
-	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a530_pfp.fw -t "$pkgdir/$_fwdir/qcom"
+	install -Dm644 a530_pm4.fw -t "$pkgdir/$_fwdir/qcom"
 }

 sha512sums="
@@ -4,7 +4,7 @@

 pkgname=linux-postmarketos-exynos4
 pkgver=6.7.6
-pkgrel=2
+pkgrel=1
 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices"
 arch="armv7"
 _carch="arm"
@@ -42,7 +42,6 @@ source="
 	$_config
 	initramfs.list
 	init
-	tab3-limit-memory.patch
 "
 builddir="$srcdir/linux-$_tag"

@@ -84,5 +83,4 @@ sha512sums="
 ee4cec8100ebe1d85bd18ba0ba5bdf9746f1fb7a7cb6dff0d8f6782d03f51e5d87f0d05a388ff641c276db7857e729ceb900bf33061d079e97cf6e7b43dd5027  config-postmarketos-exynos4.armv7
 aaff0332b90e1f9f62de1128cace934717336e54ab09de46477369fa808302482d97334e43a85ee8597c1bcab64d3484750103559fea2ce8cd51776156bf7591  initramfs.list
 09f1f214a24300696809727a7b04378887c06ca6f40803ca51a12bf2176a360b2eb8632139d6a0722094e05cb2038bdb04018a1e3d33fc2697674552ade03bee  init
-aea665e80dee318ec3be23d3f28b88e87eb551d2756e14d896781a0861a4387920f6969990eb171e8c7d6f86c36cef63a89337d63bfee7e44b9de7a8efb36c73  tab3-limit-memory.patch
 "
@@ -1,36 +0,0 @@
-From 57ae04aa40be1e83e2da2fdf92de749f694ea5f8 Mon Sep 17 00:00:00 2001
-From: Artur Weber <aweber.kernel@gmail.com>
-Date: Sat, 17 Feb 2024 12:34:46 +0100
-Link: https://gitlab.com/exynos4-mainline/linux/-/merge_requests/13
-Subject: [PATCH] ARM: dts: exynos4212-tab3: Limit usable memory range
-
-The stock bootloader on the Samsung Galaxy Tab 3 8.0 provides an
-incorrect available memory range over ATAG_MEM. Limit the usable
-memory in the DTS to prevent it from doing so, without having to
-disable ATAG support.
-
-Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
---
- arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
-index 87a1317f9220..996cd5cb0c07 100644
--- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
-+++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
-@@ -45,6 +45,12 @@ chosen {
- 		/* Default S-BOOT bootloader loads initramfs here */
- 		linux,initrd-start = <0x42000000>;
- 		linux,initrd-end = <0x42800000>;
-+
-+		/*
-+		 * S-BOOT provides incorrect memory size in bootloader;
-+		 * override it here
-+		 */
-+		linux,usable-memory-range = <0x40000000 0x3fc00000>;
- 	};
- 
- 	firmware@204f000 {
-- 
-2.44.0
-
@@ -1,7 +1,7 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.8.7
+pkgver=6.8.1
 pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
@@ -68,8 +68,8 @@ package() {
 }

 sha512sums="
-2d580d354029832e0d93401c9ef016b5dc0bcd5b5b06ccadf6fa79eb033d5af0ba29e1beca8f7a2e79bbe966d29dfd39246c8b63c8df20b756e1d484cbc8cec1  linux-6.8.7.tar.xz
-66483855d22952d9fcfe5dea0315a7d99c924b303d834fb28d62254422ea4a34f39b16e01443e21d6e7f3c77b3807f9d23ce5ea443e238a2d4a12773a46aef11  config-postmarketos-mediatek-mt8173.aarch64
+255921dd12f1043a4db38b5435b34773267c592f6712815c0851f1e0add71131fb00fd00746200eabdad29ba5b6e38a768da9c048da47fb5aa59d8eaef7d236e  linux-6.8.1.tar.xz
+c3152989faaefee3fc0883870691629a0f762506c40fc2ff0383302587fafc9dbd7a3e8d5bd2316a126abd20a3f9cef2cfdcf05732c1b205c377beb67a9ff8b7  config-postmarketos-mediatek-mt8173.aarch64
 4b499c1fbf53631cffd6fa7299643dc744e0e2187f71804664b02f05296162b42e3f76aa0d8c688cecb43a8bcd41ec92991c98287951292260237b828dcca710  fix-mmc1-speed.patch
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 caf48ac0f77661153ee94c7de4931baca135a69a97e93f01ad8f276b4a9944e077d7214c117450943cca07990c773661f79718cb0c2ff7c5789c93d37afb26de  fix-spi-nor-max-frequency.patch
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.8.7 Kernel Configuration
+# Linux/arm64 6.8.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
@@ -11,8 +11,6 @@ CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
@@ -1513,6 +1511,7 @@ CONFIG_BT_BNEP=m
 # CONFIG_BT_BNEP_MC_FILTER is not set
 # CONFIG_BT_BNEP_PROTO_FILTER is not set
 CONFIG_BT_HIDP=m
+# CONFIG_BT_HS is not set
 # CONFIG_BT_LE is not set
 CONFIG_BT_LEDS=y
 # CONFIG_BT_MSFTEXT is not set
@@ -1,7 +1,7 @@
 # Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8183
-pkgver=6.6.25
+pkgver=6.6.16
 pkgrel=0
 pkgdesc="Mainline kernel for mediatek mt8183"
 arch="aarch64"
@@ -88,7 +88,7 @@ package() {


 sha512sums="
-1f1c31a104aa399cd7fd67c0e73c5037e95112e544b00ad70a2a809b52d9d190c303e3f946d67d805125181004fe7de500ff2069dcacad94f6b56bfb8f180f6a  linux-6.6.25.tar.xz
+3823a776f8e4aefdec75dce7c959adcb038ab0776d8d7e60fb79626d2d9410c0a334df71b1cd10499ed9ba82d7e50cec415c3f2b821b33f53171ca00b1a3b7f1  linux-6.6.16.tar.xz
 669a1bbf8707ec9294da83336673fbb55061a2eed0c6ddb2613da3ae4fa9b0e2bdbdd91ad166694173e3540ea934b2f3bf27d5f9659a6952de806765eed9b824  arm64-dts-mediatek-mt8183-Add-missing-GPU-clocks.patch
 027fee259454764e47ffee7100dba7cb9f0741a156ba3d1b47815a0beb6b4ea6cccba885f93b068923ff88047fa82a3d937d3808d0199f1de85cf553068a9ba7  arm64-dts-mediatek-mt8183-Add-missing-syscon-power-d.patch
 40246a8da036dc6c21592efd6625a4be22d6f524b067854f17f5671f5f3b134ed1c63a8c03a15a55e9b45b7d8d1a9b63833b86f38a6f5863e02cc8ddbf70fa57  arm64-dts-mediatek-mt8183-Add-video-encoder-decoder.patch
@@ -103,5 +103,5 @@ e9a128a8ddd98c6c8957ba45186afa2ea8ebeac83d4f2db3ff9ee8a5dd8027af90868c334a7b456b
 d74da1231181835bec82015da1b3f5b08a1fe9c3c35dd712e285891094d94d9427ceac75d32f74be3a635e17d93ad82b37adf97db8176efc91aed17535023fc2  mt8183-fix-bluetooth.patch
 9e64ef057ecd9bb23b0b0e830007c50ea9c481f64f460d063e9f64735d70d5a4bcf87d9148aa5cc90963ccd5860fe4a9e6f25556a902332b95ef48537d6ee045  Revert-ASoC-mediatek-mt8183-da7219-max98357-Map-miss.patch
 9b8707de42635734031495da055c5860addeb656051540f1a14404b10aa8b501168d8b0e274b37bce989db3bc050e9beef722189556f6d782b92cc907731488d  mt8183-kukui-jacuzzi-fennel14-rt1015p-sound.patch
-93cb166f30714f8ce813367f454110f5da4414ea26c86d0f072187b52ddb7e42e877c590a6aa5e6c07a597a49c631af84ac6843b47203474872211b92cd1524a  config-postmarketos-mediatek-mt8183.aarch64
+0a384eaf25c652891bce2d8cf94ffa43340ee56482ba6c2d98a092eecc5e8af2ef872aefe15ad7e1c33f0488a9d5e57bef2a27560063bbb28e00f49f78ad51b9  config-postmarketos-mediatek-mt8183.aarch64
 "
@@ -1,19 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.25 Kernel Configuration
+# Linux/arm64 6.6.16 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_AS_VERSION=24100
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24200
+CONFIG_LD_VERSION=24100
 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
@@ -162,7 +161,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_GCC10_NO_ARRAY_BOUNDS=y
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
@@ -1513,6 +1512,7 @@ CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
+# CONFIG_BT_HS is not set
 # CONFIG_BT_LE is not set
 CONFIG_BT_LEDS=y
 # CONFIG_BT_MSFTEXT is not set
@@ -8,7 +8,7 @@ pkgver=6.6
 # When making kernel config changes please also submit a PR to
 # https://github.com/msm8916-mainline/linux/blob/master/kernel/configs/pmos.config
 # since the kernel config is regenerated on upgrades and all changes will be lost!
-pkgrel=3
+pkgrel=2
 pkgdesc="Mainline kernel fork for Qualcomm MSM8909/MSM8916/MSM8939 devices"
 arch="aarch64 armv7"
 url="https://github.com/msm8916-mainline/linux"
@@ -16,7 +16,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps
 	pmb:cross-native
 	pmb:kconfigcheck-community
-	pmb:kconfigcheck-uefi
 "
 makedepends="
 	bison
@@ -59,26 +58,7 @@ build() {

 package() {
 	mkdir -p "$pkgdir"/boot
-
-	_install_targets="modules_install dtbs_install"
-
-	if [ -e "$builddir/arch/$_carch/boot/vmlinuz.efi" ]; then
-		# ZBOOT EFI decompressor for EFI booting
-		install -Dm644 "$builddir/arch/$_carch/boot/vmlinuz.efi" \
-			"$pkgdir/boot/linux.efi"
-
-		# Old GZIP'd kernel image for boot.img compatibility
-		install -Dm644 "$builddir/arch/$_carch/boot/vmlinuz" \
-			"$pkgdir/boot/vmlinuz"
-	elif [ "$_carch" = "arm64" ]; then
-		echo "WARNING: CONFIG_ZBOOT not enabled!"
-		install -Dm644 "$builddir/arch/$_carch/boot/Image.gz" \
-			"$pkgdir/boot/vmlinuz"
-	else
-		_install_targets="zinstall modules_install dtbs_install"
-	fi
-
-	make $_install_targets \
+	make zinstall modules_install dtbs_install \
 		ARCH="$_carch" \
 		INSTALL_PATH="$pkgdir"/boot \
 		INSTALL_MOD_PATH="$pkgdir" \
@@ -92,6 +72,6 @@ package() {

 sha512sums="
 5fbbdf333412667e0a0e38dcc7e83f640bd5a1e0b07e1c7786ff3e18f17b9cdec088936263d68986b3869ee305cfcecdf22970134ca8fb8d2a2769874a5a4676  linux-postmarketos-qcom-msm8916-v6.6-msm8916.tar.gz
-b3457e63ea4be7b856b2fe1947cbd07ec196dda9d9c99fc2dbda1968161fcdad19e83a3285a735276be8111e22bcef59d59e89322de87cfd8999bc133e64d4cd  config-postmarketos-qcom-msm8916.aarch64
-ab89af02ad93998e2b8388ae0edd6cd1816d4403b57cc05c45b9f23b0efeeeb17a041bcbc00960d77758aab22d4914d1daba21f3607fd676291ca0999b157613  config-postmarketos-qcom-msm8916.armv7
+865abc449620fad2dd522fb4e552aa4c98d1e7adfd9f32702c1194b66355b7adb9f9fd383b435a098ddaafe3f39256e2fa60224bee4a68b823d1d26eb1e06de9  config-postmarketos-qcom-msm8916.aarch64
+f8fd19f9a1e6cf1604b9ea9a2f219b140c4d78b52f937e825177c62a6425e122f02e39f5268b5d0ee2b17a5a862b674d6aa66f749bf53f953ee89865dc08811a  config-postmarketos-qcom-msm8916.armv7
 "
@@ -2,14 +2,14 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.6.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_AS_VERSION=24100
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24200
+CONFIG_LD_VERSION=24100
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -29,18 +29,6 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION="-msm8916"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_HAVE_KERNEL_ZSTD=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-# CONFIG_KERNEL_ZSTD is not set
 CONFIG_DEFAULT_INIT=""
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SYSVIPC=y
@@ -508,9 +496,7 @@ CONFIG_STACKPROTECTOR_PER_TASK=y
 # Boot options
 #
 CONFIG_CMDLINE=""
-CONFIG_EFI_STUB=y
-CONFIG_EFI=y
-CONFIG_DMI=y
+# CONFIG_EFI is not set
 # end of Boot options

 #
@@ -584,8 +570,6 @@ CONFIG_ARM_QCOM_CPUFREQ_NVMEM=y
 # end of CPU Frequency scaling
 # end of CPU Power Management

-CONFIG_ARCH_SUPPORTS_ACPI=y
-# CONFIG_ACPI is not set
 CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
@@ -705,7 +689,6 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 CONFIG_HAVE_ARCH_COMPILER_H=y
 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_HAVE_PREEMPT_DYNAMIC=y
@@ -1569,36 +1552,10 @@ CONFIG_ARM_CCI400_COMMON=y
 # end of ARM System Control and Management Interface Protocol

 # CONFIG_ARM_SCPI_PROTOCOL is not set
-CONFIG_DMIID=y
-# CONFIG_DMI_SYSFS is not set
 CONFIG_QCOM_SCM=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-CONFIG_SYSFB=y
-# CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_ARM_FFA_TRANSPORT is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=y
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB=y
-CONFIG_EFI_ZBOOT=y
-CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-# CONFIG_EFI_BOOTLOADER_CONTROL is not set
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_EFI_DISABLE_PCI_DMA is not set
-CONFIG_EFI_EARLYCON=y
-# CONFIG_EFI_DISABLE_RUNTIME is not set
-# CONFIG_EFI_COCO_SECRET is not set
-# end of EFI (Extensible Firmware Interface) Support
-
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_HAVE_ARM_SMCCC=y
@@ -3753,7 +3710,6 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 #
 CONFIG_FB=y
 # CONFIG_FB_ARMCLCD is not set
-CONFIG_FB_EFI=y
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_SMSCUFX is not set
@@ -3766,9 +3722,6 @@ CONFIG_FB_CORE=y
 CONFIG_FB_NOTIFY=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_DEVICE=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
@@ -3776,7 +3729,6 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
-CONFIG_FB_IOMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
 # CONFIG_FB_MODE_HELPERS is not set
@@ -4740,7 +4692,6 @@ CONFIG_RTC_I2C_AND_SPI=y
 # CONFIG_RTC_DRV_DS1685_FAMILY is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_EFI is not set
 # CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_M48T35 is not set
@@ -5979,7 +5930,6 @@ CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=m
 # end of Pseudo filesystems

 CONFIG_MISC_FILESYSTEMS=y
@@ -6117,7 +6067,6 @@ CONFIG_KEY_DH_OPERATIONS=y
 # CONFIG_HARDENED_USERCOPY is not set
 # CONFIG_FORTIFY_SOURCE is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,bpf"

@@ -6541,7 +6490,6 @@ CONFIG_CLZ_TAB=y
 CONFIG_MPILIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_VDSO_TIME_NS=y
@@ -2,14 +2,14 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 6.6.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_AS_VERSION=24100
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24200
+CONFIG_LD_VERSION=24100
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -489,9 +489,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE=""
 CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
 CONFIG_AUTO_ZRELADDR=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI=y
-CONFIG_DMI=y
+# CONFIG_EFI is not set
 # end of Boot options

 #
@@ -1481,35 +1479,11 @@ CONFIG_ARM_CCI400_COMMON=y
 # end of ARM System Control and Management Interface Protocol

 # CONFIG_ARM_SCPI_PROTOCOL is not set
-CONFIG_DMIID=y
-# CONFIG_DMI_SYSFS is not set
 # CONFIG_FW_CFG_SYSFS is not set
 CONFIG_QCOM_SCM=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-CONFIG_SYSFB=y
-# CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_TRUSTED_FOUNDATIONS is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=y
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB=y
-CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-# CONFIG_EFI_BOOTLOADER_CONTROL is not set
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_EFI_DISABLE_PCI_DMA is not set
-# CONFIG_EFI_DISABLE_RUNTIME is not set
-# CONFIG_EFI_COCO_SECRET is not set
-# end of EFI (Extensible Firmware Interface) Support
-
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
 CONFIG_HAVE_ARM_SMCCC=y
@@ -3652,7 +3626,6 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 #
 CONFIG_FB=y
 # CONFIG_FB_ARMCLCD is not set
-CONFIG_FB_EFI=y
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_SMSCUFX is not set
@@ -3665,9 +3638,6 @@ CONFIG_FB_CORE=y
 CONFIG_FB_NOTIFY=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_DEVICE=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
@@ -3675,7 +3645,6 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
-CONFIG_FB_IOMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
 # CONFIG_FB_MODE_HELPERS is not set
@@ -4642,7 +4611,6 @@ CONFIG_RTC_I2C_AND_SPI=y
 # CONFIG_RTC_DRV_DS1685_FAMILY is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_EFI is not set
 # CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_M48T35 is not set
@@ -5811,7 +5779,6 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_TMPFS_QUOTA is not set
 CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=m
 # end of Pseudo filesystems

 CONFIG_MISC_FILESYSTEMS=y
@@ -6349,7 +6316,6 @@ CONFIG_CLZ_TAB=y
 CONFIG_MPILIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_VDSO_32=y
@@ -4,7 +4,7 @@

 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
-pkgver=6.8.2
+pkgver=6.7.9
 pkgrel=0
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
@@ -60,6 +60,6 @@ package() {
 }

 sha512sums="
-8681cb70498797b4e53fa6a083355cf8a5e862733b5d8e89fcb0040691db15ec8af166c367f549e4191c7268336ccb18a0e24a07dfd899b764f2c93bfb8b70d8  linux-postmarketos-qcom-msm8953-v6.8.2-r0.tar.gz
-11a1fee4eb92ae00b458b425bd9769ddeff5eec0309a652fd36bf784b2fabe33e4ab1793a0d6512c92164c9560fda3371333ed641f1b4ce025396a143de64a9e  config-postmarketos-qcom-msm8953.aarch64
+900036c6c771a6da5ae70baf34cb2959d136ff10cca44c5303ea163174fbef9444cd567def6ac45be08455c6fa74828bcfb32d646bdc806c96ccae1c213cee0b  linux-postmarketos-qcom-msm8953-v6.7.9-r0.tar.gz
+9fd465c9d3532ff7ff1ca2ac445cf1ea6080176d17dae5cce6a0510536dc5af175c00640af13fc09f5ecb6bf1f094dd0c62387642bc90805b0008ef5c650f9a0  config-postmarketos-qcom-msm8953.aarch64
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.8.2 Kernel Configuration
+# Linux/arm64 6.7.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
@@ -158,10 +158,8 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_GCC10_NO_ARRAY_BOUNDS=y
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
-CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
-CONFIG_CC_NO_STRINGOP_OVERFLOW=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -240,14 +238,14 @@ CONFIG_AIO=y
 CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
-CONFIG_KCMP=y
-CONFIG_RSEQ=y
-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_KCMP=y
+CONFIG_RSEQ=y
+CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_GUEST_PERF_EVENTS=y

@@ -610,13 +608,15 @@ CONFIG_ARM_QCOM_CPUFREQ_NVMEM=y
 # end of CPU Frequency scaling
 # end of CPU Power Management

+CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_HAVE_KVM=y
-CONFIG_KVM_COMMON=y
 CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
 CONFIG_HAVE_KVM_IRQ_ROUTING=y
 CONFIG_HAVE_KVM_DIRTY_RING=y
 CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y
 CONFIG_NEED_KVM_DIRTY_RING_WITH_BITMAP=y
+CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_MMIO=y
 CONFIG_HAVE_KVM_MSI=y
 CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
@@ -626,7 +626,6 @@ CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
 CONFIG_KVM_XFER_TO_GUEST_WORK=y
 CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
-CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 # CONFIG_NVHE_EL2_DEBUG is not set
@@ -737,7 +736,6 @@ CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
 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

 #
 # GCOV-based kernel profiling
@@ -780,7 +778,6 @@ 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
@@ -854,8 +851,9 @@ CONFIG_ZSMALLOC=m
 CONFIG_ZSMALLOC_CHAIN_SIZE=8

 #
-# Slab allocator options
+# SLAB allocator options
 #
+# CONFIG_SLAB_DEPRECATED is not set
 CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
@@ -863,7 +861,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
-# end of Slab allocator options
+# end of SLAB allocator options

 # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
 # CONFIG_COMPAT_BRK is not set
@@ -900,7 +898,6 @@ CONFIG_ARCH_WANTS_THP_SWAP=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
 CONFIG_THP_SWAP=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
@@ -1296,6 +1293,7 @@ CONFIG_NF_DEFRAG_IPV6=m
 # CONFIG_NF_TABLES_BRIDGE is not set
 # CONFIG_NF_CONNTRACK_BRIDGE is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BPFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -1458,6 +1456,7 @@ CONFIG_BT_BREDR=y
 # CONFIG_BT_RFCOMM is not set
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
+# CONFIG_BT_HS is not set
 CONFIG_BT_LE=y
 CONFIG_BT_LE_L2CAP_ECRED=y
 CONFIG_BT_LEDS=y
@@ -1623,7 +1622,6 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_DEVICES=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
@@ -1714,7 +1712,6 @@ CONFIG_ZRAM=m
 CONFIG_ZRAM_DEF_COMP_LZ4=y
 CONFIG_ZRAM_DEF_COMP="lz4"
 # CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_MULTI_COMP is not set
 CONFIG_BLK_DEV_LOOP=y
@@ -1761,7 +1758,6 @@ CONFIG_QCOM_COINCELL=y
 # CONFIG_HISI_HIKEY_USB is not set
 # CONFIG_OPEN_DICE is not set
 # CONFIG_VCPU_STALL_DETECTOR is not set
-# CONFIG_NSM is not set
 # CONFIG_C2PORT is not set

 #
@@ -1839,10 +1835,13 @@ CONFIG_SCSI_LOWLEVEL=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_BITMAP_FILE=y
+# CONFIG_MD_LINEAR is not set
 # CONFIG_MD_RAID0 is not set
 # CONFIG_MD_RAID1 is not set
 # CONFIG_MD_RAID10 is not set
 # CONFIG_MD_RAID456 is not set
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_MD_FAULTY is not set
 # CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
@@ -2047,7 +2046,6 @@ CONFIG_SMSC_PHY=m
 # CONFIG_DP83867_PHY is not set
 # CONFIG_DP83869_PHY is not set
 # CONFIG_DP83TD510_PHY is not set
-# CONFIG_DP83TG720_PHY is not set
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_XILINX_GMII2RGMII is not set
 # CONFIG_MICREL_KS8995MA is not set
@@ -2137,9 +2135,9 @@ CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH10K is not set
 CONFIG_WCN36XX=m
 CONFIG_WCN36XX_DEBUGFS=y
-# CONFIG_ATH11K is not set
 # CONFIG_WLAN_VENDOR_ATMEL is not set
 # CONFIG_WLAN_VENDOR_BROADCOM is not set
+# CONFIG_WLAN_VENDOR_CISCO is not set
 # CONFIG_WLAN_VENDOR_INTEL is not set
 # CONFIG_WLAN_VENDOR_INTERSIL is not set
 # CONFIG_WLAN_VENDOR_MARVELL is not set
@@ -2156,6 +2154,7 @@ CONFIG_WLAN_VENDOR_SILABS=y
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
 # CONFIG_MAC80211_HWSIM is not set
 # CONFIG_VIRT_WIFI is not set
 # CONFIG_WAN is not set
@@ -2662,7 +2661,6 @@ CONFIG_PINCTRL_MSM8953=y
 # CONFIG_PINCTRL_SDM670 is not set
 # CONFIG_PINCTRL_SDM845 is not set
 # CONFIG_PINCTRL_SDX75 is not set
-# CONFIG_PINCTRL_SM4450 is not set
 # CONFIG_PINCTRL_SM6115 is not set
 # CONFIG_PINCTRL_SM6125 is not set
 # CONFIG_PINCTRL_SM6350 is not set
@@ -2673,8 +2671,6 @@ CONFIG_PINCTRL_MSM8953=y
 # CONFIG_PINCTRL_SM8350 is not set
 # CONFIG_PINCTRL_SM8450 is not set
 # CONFIG_PINCTRL_SM8550 is not set
-# CONFIG_PINCTRL_SM8650 is not set
-# CONFIG_PINCTRL_X1E80100 is not set
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 CONFIG_PINCTRL_LPASS_LPI=m
@@ -2685,7 +2681,6 @@ CONFIG_PINCTRL_LPASS_LPI=m
 # CONFIG_PINCTRL_SM8450_LPASS_LPI is not set
 # CONFIG_PINCTRL_SC8280XP_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8550_LPASS_LPI is not set
-# CONFIG_PINCTRL_SM8650_LPASS_LPI is not set

 #
 # Renesas pinctrl drivers
@@ -2844,7 +2839,6 @@ CONFIG_BATTERY_QCOM_FG=y
 CONFIG_THERMAL=y
 # CONFIG_THERMAL_NETLINK is not set
 # CONFIG_THERMAL_STATISTICS is not set
-# CONFIG_THERMAL_DEBUGFS is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_OF=y
 # CONFIG_THERMAL_WRITABLE_TRIPS is not set
@@ -3010,7 +3004,6 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_NETLINK_EVENTS is not set
 # CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
@@ -3330,10 +3323,7 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 #
 CONFIG_VIDEO_IR_I2C=m
 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_GC2145 is not set
 # CONFIG_VIDEO_HI556 is not set
 CONFIG_VIDEO_SR556=m
 # CONFIG_VIDEO_HI846 is not set
@@ -3379,7 +3369,6 @@ CONFIG_VIDEO_OV5670=m
 CONFIG_VIDEO_OV5675=m
 # CONFIG_VIDEO_OV5693 is not set
 CONFIG_VIDEO_OV5695=m
-# CONFIG_VIDEO_OV64A40 is not set
 # CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV7251 is not set
 # CONFIG_VIDEO_OV7640 is not set
@@ -3403,12 +3392,6 @@ CONFIG_VIDEO_S5K2XX=m
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set

-#
-# Camera ISPs
-#
-# CONFIG_VIDEO_THP7312 is not set
-# end of Camera ISPs
-
 #
 # Lens drivers
 #
@@ -3472,7 +3455,6 @@ CONFIG_DRM_DISPLAY_HELPER=m
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_EXEC=m
 CONFIG_DRM_SCHED=m

 #
@@ -3534,7 +3516,6 @@ CONFIG_DRM_PANEL_EDP=m
 # 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_ILI9881C is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
@@ -3591,7 +3572,6 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
@@ -3730,13 +3710,14 @@ CONFIG_DRM_LONTIUM_LT8912B=m
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_SSD130X is not set
-# CONFIG_DRM_POWERVR is not set
+# CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m

 #
 # Frame buffer Devices
 #
 CONFIG_FB=y
+# CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_SMSCUFX is not set
@@ -3755,8 +3736,9 @@ CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYSMEM_FOPS=y
+CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
 # CONFIG_FB_MODE_HELPERS is not set
@@ -3777,7 +3759,6 @@ CONFIG_BACKLIGHT_QCOM_WLED=y
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_MP3309C is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
@@ -4255,7 +4236,6 @@ CONFIG_HID_MULTITOUCH=m
 # CONFIG_HID_ZYDACRON is not set
 # CONFIG_HID_SENSOR_HUB is not set
 # CONFIG_HID_ALPS is not set
-# CONFIG_HID_MCP2200 is not set
 # CONFIG_HID_MCP2221 is not set
 # end of Special HID drivers

@@ -4578,7 +4558,6 @@ CONFIG_TYPEC=m
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
 # CONFIG_TYPEC_MUX_NB7VPQ904M is not set
 # CONFIG_TYPEC_MUX_PTN36502 is not set
-# CONFIG_TYPEC_MUX_WCD939X_USBSS is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support

 #
@@ -4759,7 +4738,6 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX31335 is not set
 # CONFIG_RTC_DRV_MAX77686 is not set
 # CONFIG_RTC_DRV_NCT3018Y is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
@@ -4894,7 +4872,6 @@ CONFIG_SYNC_FILE=y

 # CONFIG_UIO is not set
 # CONFIG_VFIO is not set
-CONFIG_IRQ_BYPASS_MANAGER=y
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO=y
@@ -5020,7 +4997,6 @@ CONFIG_COMMON_CLK=y
 CONFIG_QCOM_GDSC=y
 CONFIG_QCOM_RPMCC=y
 CONFIG_COMMON_CLK_QCOM=y
-# CONFIG_CLK_X1E80100_GCC is not set
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CLK_APCS_MSM8916 is not set
@@ -5054,7 +5030,6 @@ CONFIG_MSM_GCC_8953=y
 # CONFIG_QCS_GCC_404 is not set
 # CONFIG_SC_CAMCC_7180 is not set
 # CONFIG_SC_CAMCC_7280 is not set
-# CONFIG_SC_CAMCC_8280XP is not set
 # CONFIG_SC_DISPCC_7180 is not set
 # CONFIG_SC_DISPCC_7280 is not set
 # CONFIG_SC_DISPCC_8280XP is not set
@@ -5081,7 +5056,6 @@ CONFIG_SC_GCC_7280=y
 # CONFIG_QCS_TURING_404 is not set
 # CONFIG_QCS_Q6SSTOP_404 is not set
 # CONFIG_QDU_GCC_1000 is not set
-# CONFIG_QDU_ECPRICC_1000 is not set
 # CONFIG_SDM_GCC_845 is not set
 # CONFIG_SDM_GPUCC_845 is not set
 # CONFIG_SDM_VIDEOCC_845 is not set
@@ -5092,7 +5066,6 @@ CONFIG_SC_GCC_7280=y
 # CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_CAMCC_8450 is not set
 # CONFIG_SM_CAMCC_8550 is not set
-# CONFIG_SM_DISPCC_8650 is not set
 # CONFIG_SM_GCC_4450 is not set
 # CONFIG_SM_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
@@ -5104,7 +5077,6 @@ CONFIG_SC_GCC_7280=y
 # CONFIG_SM_GCC_8350 is not set
 # CONFIG_SM_GCC_8450 is not set
 # CONFIG_SM_GCC_8550 is not set
-# CONFIG_SM_GCC_8650 is not set
 # CONFIG_SM_GPUCC_6115 is not set
 # CONFIG_SM_GPUCC_6125 is not set
 # CONFIG_SM_GPUCC_6375 is not set
@@ -5114,9 +5086,7 @@ CONFIG_SC_GCC_7280=y
 # CONFIG_SM_GPUCC_8350 is not set
 # CONFIG_SM_GPUCC_8450 is not set
 # CONFIG_SM_GPUCC_8550 is not set
-# CONFIG_SM_GPUCC_8650 is not set
 # CONFIG_SM_TCSRCC_8550 is not set
-# CONFIG_SM_TCSRCC_8650 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
 # CONFIG_SM_VIDEOCC_8250 is not set
 # CONFIG_SM_VIDEOCC_8350 is not set
@@ -5422,7 +5392,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 #
 # CONFIG_AD4130 is not set
 # CONFIG_AD7091R5 is not set
-# CONFIG_AD7091R8 is not set
 # CONFIG_AD7124 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
@@ -5462,7 +5431,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_MAX11410 is not set
 # CONFIG_MAX1241 is not set
 # CONFIG_MAX1363 is not set
-# CONFIG_MAX34408 is not set
 CONFIG_MAX9611=m
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
@@ -5529,7 +5497,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 #
 # Chemical Sensors
 #
-# CONFIG_AOSONG_AGS02MA is not set
 # CONFIG_ATLAS_PH_SENSOR is not set
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
@@ -5599,7 +5566,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4728 is not set
-# CONFIG_MCP4821 is not set
 # CONFIG_MCP4922 is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
@@ -5679,7 +5645,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_DHT11 is not set
 # CONFIG_HDC100X is not set
 # CONFIG_HDC2010 is not set
-# CONFIG_HDC3020 is not set
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
@@ -5696,8 +5661,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_BMI160=m
 CONFIG_BMI160_I2C=m
 # CONFIG_BMI160_SPI is not set
-# CONFIG_BMI323_I2C is not set
-# CONFIG_BMI323_SPI is not set
 # CONFIG_BOSCH_BNO055_SERIAL is not set
 # CONFIG_BOSCH_BNO055_I2C is not set
 # CONFIG_FXOS8700_I2C is not set
@@ -5735,12 +5698,10 @@ CONFIG_IIO_ST_LSM6DSX_SPI=m
 # CONFIG_SENSORS_ISL29018 is not set
 # CONFIG_SENSORS_ISL29028 is not set
 # CONFIG_ISL29125 is not set
-# CONFIG_ISL76682 is not set
 # CONFIG_JSA1212 is not set
 # CONFIG_ROHM_BU27008 is not set
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_RPR0521 is not set
-# CONFIG_LTR390 is not set
 CONFIG_LTR501=m
 CONFIG_LTRF216A=m
 # CONFIG_LV0104CS is not set
@@ -5766,7 +5727,6 @@ CONFIG_LTRF216A=m
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
 # CONFIG_VEML6070 is not set
-# CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
 # CONFIG_ZOPT2201 is not set
 # end of Light sensors
@@ -5845,7 +5805,6 @@ CONFIG_YAMAHA_YAS530=m
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
 # CONFIG_HP03 is not set
-# CONFIG_HSC030PA is not set
 # CONFIG_ICP10100 is not set
 # CONFIG_MPL115_I2C is not set
 # CONFIG_MPL115_SPI is not set
@@ -5899,7 +5858,6 @@ CONFIG_YAMAHA_YAS530=m
 # CONFIG_MAXIM_THERMOCOUPLE is not set
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
-# CONFIG_MLX90635 is not set
 # CONFIG_TMP006 is not set
 # CONFIG_TMP007 is not set
 # CONFIG_TMP117 is not set
@@ -5908,7 +5866,6 @@ CONFIG_YAMAHA_YAS530=m
 # CONFIG_MAX30208 is not set
 # CONFIG_MAX31856 is not set
 # CONFIG_MAX31865 is not set
-# CONFIG_MCP9600 is not set
 # end of Temperature sensors

 CONFIG_PWM=y
@@ -6017,7 +5974,6 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_LAYOUTS=y

 #
 # Layout Types
@@ -6055,7 +6011,6 @@ CONFIG_INTERCONNECT_QCOM_MSM8953=y
 # CONFIG_INTERCONNECT_QCOM_QCM2290 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 # CONFIG_INTERCONNECT_QCOM_SDM660 is not set
-# CONFIG_INTERCONNECT_QCOM_SM6115 is not set
 CONFIG_INTERCONNECT_QCOM_SMD_RPM=y
 CONFIG_INTERCONNECT_CLK=y
 # CONFIG_COUNTER is not set
@@ -6071,7 +6026,6 @@ CONFIG_INTERCONNECT_CLK=y
 CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_VALIDATE_FS_PARSER is not set
 CONFIG_FS_IOMAP=y
-CONFIG_FS_STACK=y
 CONFIG_BUFFER_HEAD=y
 CONFIG_LEGACY_DIRECT_IO=y
 CONFIG_EXT2_FS=y
@@ -6254,7 +6208,6 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
 CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_ROOT_NFS=y
-# CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
@@ -6491,12 +6444,14 @@ CONFIG_CRYPTO_SM4_GENERIC=m
 # CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
 CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_CFB is not set
 CONFIG_CRYPTO_CTR=m
 # CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_HCTR2 is not set
 # CONFIG_CRYPTO_KEYWRAP is not set
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_OFB is not set
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=y
 # end of Length-preserving ciphers and modes
@@ -6791,7 +6746,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
@@ -6804,7 +6758,6 @@ CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
-CONFIG_STACKDEPOT_MAX_FRAMES=64
 CONFIG_SBITMAP=y
 # CONFIG_LWQ_TEST is not set
 # end of Library routines
@@ -6839,7 +6792,7 @@ CONFIG_DEBUG_MISC=y
 # Compile-time checks and compiler options
 #
 CONFIG_DEBUG_INFO=y
-CONFIG_AS_HAS_NON_CONST_ULEB128=y
+CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
@@ -5,8 +5,8 @@

 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
-pkgver=6.9_rc4
-pkgrel=0
+pkgver=6.6.3
+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"

 _config="config-$_flavor.$arch"
-_tag="sdm845-6.9-rc4"
+_tag="sdm845-6.6.3-r3"

 # Source
 source="
@@ -64,8 +64,6 @@ package() {

 	mkdir -p "$pkgdir"/boot/dtbs/qcom
 	cp -r "$pkgdir"/boot/dtbs-tmp/qcom/sdm8* "$pkgdir"/boot/dtbs/qcom
-	cp -r "$pkgdir"/boot/dtbs-tmp/qcom/sm* "$pkgdir"/boot/dtbs/qcom
-	cp -r "$pkgdir"/boot/dtbs-tmp/qcom/qcm* "$pkgdir"/boot/dtbs/qcom
 	rm -rf "$pkgdir"/boot/dtbs-tmp

 	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
@@ -75,8 +73,8 @@ package() {
 }

 sha512sums="
-83225cedc55ba80d6170ea2ccc24ddf210be83388c926cf8376beed4431109c7682c31ed55548e7dbe416b8dc3267c144c288b297a73725096e3e3b70d988f8c  linux-sdm845-6.9-rc4.tar.gz
-89e3db1296135d75db567b9b76a1434d8e22bb172bfcdc2fc713807c245a1e1ba55321cbf1334f1ad6391fa892af8e92eca9947f5d7d162124e2413b80a88195  config-postmarketos-qcom-sdm845.aarch64
+621ee00668c8739503042074615e95949e55124f48c488de83bcce733fa4b140576f26ab37d47a886136f8167832751036905a18dbb7455649b146bb3dfb22cf  linux-sdm845-6.6.3-r3.tar.gz
+9393e50336d1b8767c67ffd347000d0191a3fa8645d77b0f8ec222cad837f8f3b2201e6bd1360d62218f5246eaea93f7bf76a7b2a4e0954360fd30291f5bb3a6  config-postmarketos-qcom-sdm845.aarch64
 e0ae8b9da09cd2552244cfbcd6a63272c766d082306573a679497ab0bd30a44dfa0023503a7628b7ea87238a62da13704de5e2a57952310c7866b770e5c474ad  0001-arm64-dts-qcom-sdm845-xiaomi-polaris-Enable-ath10k-h.patch
 d7c857500348a1420ccd1a255c667704e54ee88f5c563bcb92885aaa5a9b5dc5a87d12ab782822de523d01c63b277ff60b57cc5307a0663bf42ad7b69da3d1c5  0002-drm-panel-Enable-prepare_prev_first-flag-for-NT35596.patch
 "
@@ -2,7 +2,7 @@
 # Co-Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
-pkgver=21
+pkgver=20
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -10,7 +10,6 @@ arch="aarch64 armv7"
 options="!check !archcheck !tracedeps pmb:cross-native"
 depends="$pkgname-ucm swclock-offset"
 subpackages="
-	$pkgname-gpu
 	$pkgname-ucm
 	$pkgname-rproc-none:rproc_none
 	$pkgname-rproc-no-modem:rproc_no_modem
@@ -23,7 +22,6 @@ source="$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8916-mainline/alsa-u
 	q6voiced.conf
 	77-modem-samsung-msm8916.rules
 	90-feedbackd-pm8916.rules
-	adreno-a306-quirks.sh
 	"

 package() {
@@ -86,18 +84,9 @@ samsung_modem_workaround() {
 		"$subpkgdir"/lib/udev/rules.d/77-modem-samsung-msm8916.rules
 }

-gpu() {
-	pkgdesc="Various GPU workaround for Adreno a306"
-	install_if="$pkgname=$pkgver-r$pkgrel mesa-dri-gallium"
-
-	install -Dm755 "$srcdir"/adreno-a306-quirks.sh \
-		"$subpkgdir"/etc/profile.d/adreno-a306-quirks.sh
-}
-
 sha512sums="
 eee73ae7895fb6772b35a190956d17642d08af47a0fa5dfd022052c5b30c99cf9649215aef161ddcc21fac236f2a1435ab906462c7458b4e99e405b6cb6ef5f8  soc-qcom-msm8916-3deea2860ab680c3e790442dbdf578fef152e639.tar.gz
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 bcebc36ec62140f4620d462be2b95858adae380e5d74f6b9c9b956fb76a6541f39749f4dcec6ac3c39b868dbfed6fac7a34ba357510532a3df2d39f7ea818d55  77-modem-samsung-msm8916.rules
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8916.rules
-ff143f0f8654bba26087439e206b62c9f8e25f945fa299ba1b7504316f7398a0622404f2415e915ce1c96809ed9a5e93fc16ddcb2bafe410f35466510dc2d51d  adreno-a306-quirks.sh
 "
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# New GTK renderer crashes a306.
-export GSK_RENDERER=gl
@@ -1,7 +1,7 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=soc-qcom-msm8953
 pkgdesc="Common package for Qualcomm MSM8953 devices"
-pkgver=8
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -9,7 +9,6 @@ arch="aarch64"
 options="!check !archcheck !tracedeps pmb:cross-native"
 depends="$pkgname-ucm swclock-offset"
 subpackages="
-	$pkgname-gpu
 	$pkgname-initramfs
 	$pkgname-modem
 	$pkgname-ucm
@@ -21,7 +20,6 @@ source="
 	90-feedbackd-pm8xxx-vib.rules
 	q6voiced.conf
 	00-firmware.files
-	adreno-a506-quirks.sh
 "

 package() {
@@ -55,18 +53,9 @@ modem() {
 	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

-gpu() {
-	pkgdesc="Various GPU workarounds for Adreno a506"
-	install_if="$pkgname=$pkgver-r$pkgrel mesa-dri-gallium"
-
-	install -Dm644 "$srcdir"/adreno-a506-quirks.sh \
-		"$subpkgdir"/etc/profile.d/adreno-a506-quirks.sh
-}
-
 sha512sums="
 775ce08c1c7aebdc1347e57391cabedba7999fd91978c4b09b83c5a0394b83f771cb5333845d3845409cc3d9aaeedcfdff99579cc212f06508fe6e429eb30eb2  soc-qcom-msm8953-17f080f0762db6d7ef06a066c2ecff92095b0185.tar.gz
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8xxx-vib.rules
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 23cff3b1796fc61fb494cf6ad7e25ca968dd6eb55ccd17d303c354d7a1638b25d7f152feb973b130d74cfcea2cb6aed45dfe3843ae491ffad1440fcf35389284  00-firmware.files
-d546c99ca8d406b4e2e3901a417e4e461314a38f2f01c48525e44ca524ad57af7bfc280f416bda90573b0bfb1cca27d45cb0a0ed44e999ef8d406a380d1fdbb2  adreno-a506-quirks.sh
 "
@@ -1,8 +0,0 @@
-# Various GPU workarounds for Adreno a506
-
-# The 'ngl' GTK renderer, which is now used by default, has worse
-# performance and is somewhat more prone to crashes. Use the 'gl'
-# renderer until these issues have been sorted out.
-#
-# https://gitlab.gnome.org/GNOME/gtk/-/issues/6576
-export GSK_RENDERER=gl
@@ -22,17 +22,17 @@ table.insert(alsa_monitor.rules,
 -- Disable suspend for Voice Call devices
 table.insert(alsa_monitor.rules,
  {
-    matches = {
-      {
-        { "node.name", "matches", "alsa_output.*.Voice_Call*__sink" },
-      },
-      {
-        { "node.name", "matches", "alsa_input.*.Voice_Call*__source" },
-      },
-    },
-    apply_properties = {
-      ["audio.format"] = "S16LE",
+	matches = {
+	  {
+	    { "node.name", "matches", "alsa_output.*.Voice_Call*__sink" },
+	  },
+	  {
+		{ "node.name", "matches", "alsa_input.*.Voice_Call*__source" },
+	  },
+	},
+	apply_properties = {
+	  ["audio.format"] = "S16LE",
      ["session.suspend-timeout-seconds"] = 0,
-    },
+	},
  }
 )
@@ -2,7 +2,7 @@
 # Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=20
+pkgver=18
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -23,7 +23,7 @@ subpackages="
 	$pkgname-wireplumber
 "

-_ucm_commit="34a4ee28abe70a5719e4a895333d0796c13ecd16"
+_ucm_commit="c5a680c08b39d4a665479c9bd30481a137b60cc4"
 source="
 	10-initramfs-sdm845.files
 	51-qcom-sdm845.lua
@@ -129,10 +129,10 @@ wireplumber() {

 sha512sums="
 56845726c5e7b685953f96c381404181ad9b70ea7dbfe5a3d963fb6f15821addaead43a65c9b140cb938c2d45173cfb5421816bd36024fd7e1b8555e0b32622f  10-initramfs-sdm845.files
-022852b33ba4dd76684cc7e6df5ce04830631f80382f293e96101663856bad746c17c2ca9cd0ceacf28e2c03d8ce367165b8bd2affc69db3dcbb3a5411bd1926  51-qcom-sdm845.lua
+a2eed80c1aa6bc2225aacd95888dbda7f13171008bf6433e1152be7b5148d03cad7bc1de081c64a3131e9fac12f75984f22be92e0f6162d524ce4c2db3bb82ba  51-qcom-sdm845.lua
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
-530571ef0afc7ba239f8dbb7b8cc4ca2a73dff0df958e67a76b2e9a5724a5d2a12f045e9679325f07e379ef798de8ada43d6ce4ce5018281c67670a301851409  alsa-ucm-conf-34a4ee28abe70a5719e4a895333d0796c13ecd16.tar.gz
+2094e0e24d82262becdf411d52078939aaf215b8a13eecead564e715891fa2c5cae38353347aa17fe41d58baa53a2819fbf065871aa1c49296e3b53b983e7526  alsa-ucm-conf-c5a680c08b39d4a665479c9bd30481a137b60cc4.tar.gz
 6fb4c0bd8b7ed534d855a6732ccff783960e3cfa0e0cc7effcbb93afa00798dec15361a37a3200081bc114c8d266b7a0851cc4e819ad36eabdb47a50c72620d9  call_audio_idle_suspend_workaround.confd
 5a58475b6e2ee1d655f3f23d8dc19e1cb2f32f1dfff3b9a9337d9c5baad1ec24bfaec0fb9cc03f00e5a291bee27c6b8bffbc65157e2bee5d65ef6d1adcb0910b  call_audio_idle_suspend_workaround.initd
 aa5cdb138a3cdd0b15d2bbb60c7f67ae0280ddc7d0488cfe2fc44680095a43c1cdacc54d70a689f2117538e9bf1e42758d8c3ac542c9cb8e8dc6d6f3161b7577  call_audio_idle_suspend_workaround.sh
@@ -1,17 +1,14 @@
 # Maintainer: Dang Huynh <danct12@disroot.org>
 pkgname=wl1251-cal
 pkgver=1.2
-pkgrel=1
-pkgdesc="Retrieve wl1251 calibration data from a CAL partition and feed it to the driver"
+pkgrel=0
+pkgdesc="Retrieve WiFi data from CAL on the Nokia N900 and feed it to the driver"
 url="https://github.com/maemo-leste/wl1251-cal"
-arch="armv7"
+arch="all"
 license="LGPL-2.1-only"
 makedepends="linux-headers"
-subpackages="$pkgname-openrc"
-triggers="$pkgname.trigger=/lib/firmware/ti-connectivity"
 source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/wl1251-cal/archive/refs/tags/$pkgver.tar.gz
-	wl1251-cal.initd
-	calibrate-wl1251"
+	n900-update-wl1251"
 options="!check" # No tests

 build() {
@@ -20,17 +17,9 @@ build() {

 package() {
 	make install DESTDIR="$pkgdir"
-	install -Dm755 "$srcdir/calibrate-wl1251" "$pkgdir/usr/bin/calibrate-wl1251"
-	install -Dm755 "$srcdir"/wl1251-cal.initd "$pkgdir"/etc/init.d/wl1251-cal
+	install -Dm755 "$srcdir/n900-update-wl1251" "$pkgdir/usr/bin/n900-update-wl1251"
 }
-
-openrc() {
-	default_openrc
-	install="$subpkgname.post-install"
-}
-
 sha512sums="
 1a402553fc98fa8f2d81d34a548f96be91d13bdcb77ec8e9d8373732b27a6e908895f6044aef8e88dbcd9fa6fa04f0a3d62bed877be91ba6207f68440c3ce758  wl1251-cal-1.2.tar.gz
-1793a4d09ce3c4f2af7b7b4e171ed04e4d5e70d3e40f365ef169879d2431bd1f7abe8702a422efb4d86449a2800b53c531af7353d4e4c2563985c97030cbd99b  wl1251-cal.initd
-0d843727da4d2f3e2fe76ff80c68e67b85fa1e4797ba822d323f3b005df853ec5206c812a9e0caed96aff2bf5f353df79b20f1970c6382d90e02dc664411d0b4  calibrate-wl1251
+2cb484d8ab64198c97c61691151a19d26d57f340f85c70d39293e9428b5ac790bc1a6de5894a2a9a3886487f450fd09b21513add3f5fa776ac5289985e43c63a  n900-update-wl1251
 "
@@ -1,10 +1,10 @@
 #!/bin/sh -e

 if [ -e /in-pmbootstrap ]; then
-	echo "Skipping update of wl1251 calibration data (running in pmbootstrap)"
+	echo "Skipping update of N900 WLAN calibration data (running in pmbootstrap)"
 	exit 0
 fi

-echo "Updating wl1251 calibration data.."
+echo "Updating N900's WLAN calibration data.."
 wl1251-cal --nvs-loading=/dev/null --nvs-push-data=/lib/firmware/ti-connectivity/wl1251-nvs.bin
 echo "Done"
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update add wl1251-cal boot
Author	SHA1	Message	Date
Caleb Connolly	49715be416	systemd/apk-tools: update Switch to the version which is in the upstream MR: https://gitlab.alpinelinux.org/alpine/apk-tools/-/merge_requests/155 Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:24 +00:00
Bart Ribbers	e6e2d74466	systemd/kjournald: new aport (MR 4919)	2024-03-21 22:43:24 +00:00
Bart Ribbers	55e0b172c9	systemd/plasma*: add initial systemd Plasma packages (MR 4919)	2024-03-21 22:43:24 +00:00
Sam Day	0c895234cc	systemd-services: add phosh.service (MR 4904)	2024-03-21 22:43:24 +00:00
Oliver Smith	4e46807701	systemd/postmarketos-base-systemd: depend on systemd-services Add the dependency, so the systemd-services package gets built as part of the bootstrap. Otherwise no service files will be installed, as the individual service files get pulled in via install_if, and that only works if a binary package is available.	2024-03-21 22:43:23 +00:00
Alexander Martinz	484af5bfe8	systemd/systemd-services: add rtkit-daemon.service Taken upstream from https://github.com/heftig/rtkit/blob/master/rtkit-daemon.service.in Change-Id: I0ae6e1a70b961bafd52702a412a2cdcc12bb544a Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>	2024-03-21 22:43:23 +00:00
Caleb Connolly	5b5136e818	TEMP: main/postmarketos-mkinitfs: usrmerge fork There's some patches we didn't get upstreamed to mkinitfs yet, we need them for /usr merge compatibility. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:23 +00:00
Caleb Connolly	9ecd8c06d0	systemd/gnome-shell-mobile: add uclamp hack This is a hack to configure utilisation clamping for gnome-shell. It works by telling the scheduler that the gnome-shell process should run with a much higher performance level. This improve animation performance and general UI smoothness. A proper solution to have gnome-shell manage this itself is in the works upstream. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:23 +00:00
Caleb Connolly	10125ba32b	CHECK: systemd/xorg-server: new aport Maybe integrates with systemd. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:23 +00:00
Caleb Connolly	5fce7e0670	systemd/upower: new aport Integrates with systemd. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:23 +00:00
Caleb Connolly	c4d59b30c7	systemd/systemd-services: new aport A collection of systemd services. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:23 +00:00
Caleb Connolly	84370b4f9c	systemd/systemd: new aport Ah, the package of the hour! Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:23 +00:00
Caleb Connolly	12f4a79d49	systemd/postmarketos-base-systemd: new aport postmarketOS base package with systemd stuff.	2024-03-21 22:43:23 +00:00
Caleb Connolly	20099be843	systemd/polkit: new aport Integrates tightly with systemd. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:22 +00:00
Caleb Connolly	861688d95a	CHECK: systemd/networkmanager: new aport Can maybe drop and just package the service file. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:22 +00:00
Caleb Connolly	578e21a92b	systemd/mutter-mobile: new aport Integrates tightly with systemd. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:22 +00:00
Caleb Connolly	a7cc369c6d	systemd/multipath-tools: new aport Builds against systemd. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:22 +00:00
Caleb Connolly	cd43817f03	systemd/linux-pam-systemd: new aport integrates with systemd. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:22 +00:00
Caleb Connolly	3a96c352ad	systemd/gnome-shell-mobile: new aport Integrates tightly with systemd. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:22 +00:00
Caleb Connolly	061ac5a1a5	systemd/gnome-settings-daemon: new aport Integrates tightly with systemd Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:22 +00:00
Caleb Connolly	a8cfb637c6	systemd/gnome-session: new aport Integrates tightly with systemd Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:22 +00:00
Caleb Connolly	b2b11cce19	systemd/gnome-keyring: new aport Integrates tightly with systemd. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:22 +00:00
Caleb Connolly	6c9e38a1ef	systemd/gdm: new aport gdm integrates tightly with systemd, fork from aports to rebuild against systemd. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:21 +00:00
Caleb Connolly	4e2ff4ce52	systemd/dbus: new aport Fork dbus and rebuild it with systemd support. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:21 +00:00
Caleb Connolly	735c46c5be	systemd/apk-tools: new aport For systemd (and our own sanity) we need to do the /usr merge. This fork of apk-tools includes the logic to support alpine packages like tar which install the main tar binary to /bin and then a symlink to /usr/bin/... We should find a way to implement this in upstream apk-tools, and continue pushing Alpine to also adopt the merged /usr model. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:21 +00:00
Caleb Connolly	88ce52bde5	systemd/alpine-base: new aport alpine-base hard depends on openrc... Fork it to drop this. We should eventually upstream this by having alpine-base depend on a virtual pid1 or init-system subpackage which openrc and systemd can both provide. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:21 +00:00
Caleb Connolly	86604a0e71	systemd/accountsservice: new aport Forked from alpine to rebuild with systemd support. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:21 +00:00
Caleb Connolly	3ae9e31c4a	systemd/abuild: new aport Fork of abuild with a default_service implementation for generating -service subpackages. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:21 +00:00
Caleb Connolly	0b7afbc89d	temp/mutter-mobile: drop For systemd version Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:21 +00:00
Caleb Connolly	25f7ee7aa7	temp/gnome-shell-mobile: drop to be replaced with systemd version Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:21 +00:00
Caleb Connolly	4fb988bcee	main/postmarketos-dev: new aport This package is meant to encompass what an average developer would want from a postmarketOS image. We plan to provide -dev variants of some postmarketOS images for some devices for use by the Linux mobile developer community. These should include useful tools out of the box and provide a familiar shell and coreutils. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:21 +00:00
Caleb Connolly	25ae831c68	main/postmarketos-config-nftables: systemd support Apparently nftables-openrc doesn't get pulled in automatically? But we can't just depend on it now. Add our own -openrc subpackage with the correct install_if property to pull in nftables-openrc. The upstream nftables-openrc subpackage should be fixed (if it's broken). Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:20 +00:00
Caleb Connolly	4fc1e8d5a1	main/postmarketos-bootsplash: systemd support Install a kill-pbsplash systemd service which is configured to be started as part of the graphical-session user target. Additionally install an override so that if the display-manager service (aliases to gdm, sddm, etc) fails to start it will still kill pbsplash. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:20 +00:00
Caleb Connolly	8d7dacafb4	main/postmarketos-base-ui: support systemd Not sure if dropping the networkmanager-openrc dependency causes issues. Otherwise, make the elogind subpackage conflict with systemd-logind. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:20 +00:00
Oliver Smith	0acf34aa9e	main/postmarketos-ui-sxmo-*: set pmb:systemd-never Sxmo maintainers have decided to stay with OpenRC on postmarketOS. Set this option, so pmbootstrap doesn't even ask the user if they want to install Sxmo with systemd. The idea is that users don't end up reporting issues about this unsupported use case.	2024-03-21 22:43:20 +00:00
Caleb Connolly	f23ace4d8b	main/postmarketos-base-ui-gnome: split openrc depends to -openrc subpackage Allow this package to be used on systemd installs without pulling in a bunch of openrc services. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:20 +00:00
Bart Ribbers	35d6480437	main/postmarketos-ui-plasma-{mobile,desktop}: start with systemd (MR 4919) [ci:ignore-count]	2024-03-21 22:43:12 +00:00
Sam Day	6b4dfa8b07	postmarketos-ui-phosh: systemd support (MR 4904)	2024-03-21 22:31:24 +00:00
Oliver Smith	4116843606	pmaports.cfg: add repo:systemd section	2024-03-21 22:27:59 +00:00
Oliver Smith	b5c36f959c	main/postmarketos-ui-gnome-mobile: set pmb:systemd Let pmbootstrap install systemd along with postmarketos-ui-gnome-mobile, unless the user sets "never" for systemd in "pmbootstrap init".	2024-03-21 22:27:59 +00:00
				`@@ -1 +0,0 @@`
				`SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ATTRS{name}=="twl4030:vibrator", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"`