run apk simulate

fix build
fix ci
2024-05-08 16:28:00 +02:00 · 2024-05-08 13:39:58 +02:00 · 2024-05-08 13:28:54 +02:00 · 2024-05-08 12:59:00 +02:00 · 2024-05-07 10:56:11 -07:00 · 2024-05-07 20:43:45 +09:00
975 changed files with 31770 additions and 16088 deletions
@@ -16,8 +16,7 @@ import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging

-
-def get_package_version(args, package, revision, check=True):
+def get_package_contents(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
@@ -40,6 +39,15 @@ def get_package_version(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"]


@@ -112,6 +120,40 @@ 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,6 +59,11 @@ def get_upstream_branch():
        channels.cfg from master to retrieve the upstream branch.

        :returns: branch name, e.g. "v20.05" """
+
+    # Prefer gitlab CI target branch name if it's set (i.e. running in gitlab CI)
+    if target_branch := os.environ.get("CI_MERGE_REQUEST_TARGET_BRANCH_NAME"):
+        return target_branch
+
    global cache
    if "upstream_branch" in cache:
        return cache["upstream_branch"]
@@ -23,7 +23,6 @@ sh_files="
 	./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: 'pmbootstrap' is not a symlink to pmbootstrap.py")
+    print("ERROR: unable to find path to pmbootstrap.py. Try setting 'PMBOOTSTRAP_CMD'.")
    sys.exit(1)


@@ -61,14 +61,6 @@ 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):
    """
@@ -2,35 +2,34 @@

 # 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

-# 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
+# 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"

 # device documentation
 wiki:
  stage: lint
-  <<: *only-default
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - device/*/device-*/*
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - .ci/**/*
+        - .gitlab-ci.yml
+        - device/*/device-*/*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/wiki.sh
@@ -38,16 +37,12 @@ wiki:
 # testcases linting
 ruff:
  stage: lint
-  <<: *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"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - .ci/*
+        - .ci/*/*
+        - .gitlab-ci.yml
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/ruff.sh
@@ -55,8 +50,9 @@ 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
@@ -65,8 +61,9 @@ 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
@@ -74,7 +71,8 @@ editor-config:
 # aports checks (generic)
 pytest-commits:
  stage: lint
-  <<: *only-default
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/pytest.sh
@@ -90,23 +88,21 @@ 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
-  only:
-    refs:
-      - master
-      - merge_requests
-    changes:
-      - device/*/linux-*/config-*
-      - main/linux-*/config-*
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - device/*/linux-*/config-*
+        - main/linux-*/config-*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/kconfig.sh
@@ -115,9 +111,10 @@ kernel-kconfig:
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
  stage: lint
-  only:
-    - merge_requests
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
  before_script:
+    - *global_before_scripts
    - apk -q add python3
  script:
    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
@@ -126,8 +123,10 @@ mr-settings:
 # build changed aports
 .build:
  stage: build
-  <<: *only-default
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  before_script:
+    - *global_before_scripts
    - .ci/lib/gitlab_prepare_ci.sh
  after_script:
    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
@@ -2,10 +2,12 @@
 # Put groups like @sdm845-mainline into test_device.py:gitlab_groups.
 # Order lines alphabetically!

-device/*/*-amlogic-s905*/			@vitali64yt
+device/*/*-amlogic-s905*/			@funderscore
 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
@@ -17,6 +19,9 @@ 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
@@ -36,7 +41,7 @@ device/*/*-samsung-grandmax/			@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-gt510/			@TravMurav
 device/*/*-samsung-gt58/			@TravMurav
 device/*/*-samsung-serranove/			@Minecrell
-device/*/*-videostrong-kii-pro/			@vitali64yt
+device/*/*-videostrong-kii-pro/			@funderscore
 device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
 device/*/*-xiaomi-beryllium/			@joelselvaraj
 device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
@@ -47,7 +52,9 @@ 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
@@ -64,6 +71,7 @@ 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
@@ -79,7 +87,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/		@vitali64yt @exkc
+device/*/linux-postmarketos-amlogic/		@funderscore @exkc
 device/*/linux-postmarketos-exynos4/		@Newbyte @ThiagaoPlusPlus
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
 device/*/linux-postmarketos-grate/		@clamor95 @jenneron @jethrob
@@ -108,7 +116,8 @@ device/*/u-boot-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/u-boot-pinebookpro/			@QC8086
 device/*/u-boot-pinephone/			@Arnavion @PsychoGame
 device/*/wl1251-cal/				@Danct12
+main/gnome-software-plugin-pmos/	@andrisas
 main/postmarketos-ui-plasma-mobile/		@bshah
-main/postmarketos-update-depthcharge-kernel/	@jenneron
+main/postmarketos-upgrader-dbus/	@andrisas
 main/shutdown-clear-rtc-wakealarm/		@Arnavion
 main/ttyescape/					@calebccff
@@ -9,42 +9,49 @@ branch_aports=master
 mirrordir_alpine=edge

 [v23.12]
+announcement=https://postmarketos.org/blog/2023/12/18/v23.12-release/
 description=Latest release / Recommended for best stability
 branch_pmaports=v23.12
 branch_aports=3.19-stable
 mirrordir_alpine=v3.19

 [v23.06]
+announcement=https://postmarketos.org/blog/2023/06/07/v23.06-release/
 description=Old release (unsupported)
 branch_pmaports=v23.06
 branch_aports=3.18-stable
 mirrordir_alpine=v3.18

 [v22.12]
+announcement=https://postmarketos.org/blog/2022/12/18/v22.12-release/
 description=Old release (unsupported)
 branch_pmaports=v22.12
 branch_aports=3.17-stable
 mirrordir_alpine=v3.17

 [v22.06]
+announcement=https://postmarketos.org/blog/2022/06/12/v22.06-release/
 description=Old release (unsupported)
 branch_pmaports=v22.06
 branch_aports=3.16-stable
 mirrordir_alpine=v3.16

 [v21.12]
+announcement=https://postmarketos.org/blog/2021/12/29/v21.12-release/
 description=Old release (unsupported)
 branch_pmaports=v21.12
 branch_aports=3.15-stable
 mirrordir_alpine=v3.15

 [v21.06]
+announcement=https://postmarketos.org/blog/2021/07/04/v21.06-release/
 description=Old release (unsupported)
 branch_pmaports=v21.06
 branch_aports=3.14-stable
 mirrordir_alpine=v3.14

 [v21.03]
+announcement=https://postmarketos.org/blog/2021/03/31/v21.03-release/
 description=Old release (unsupported)
 branch_pmaports=v21.03
 branch_aports=3.13-stable
@@ -8,7 +8,7 @@ fi

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

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

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

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

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

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

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

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

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

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

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

 sha512sums="
-2337e5db9d3502b56f1166f0648a15f2264d207e717dfbd0c8bbb9de4546dee069dbc2b55f2c7c48bfee062d7ca17b56e97b6eaa725af0479ab49e2cb5f178a3  grub-efi-2.12-r2-x86-edge.apk
+4bd0750236a556ad833c27892a55624a324e8ec7cadb0b7287cabd3a9cdded836357ae959aea7ba828be8727b86c6ed4844a1572b68ad3ce3f3e6f913e43ae72  grub-efi-2.12-r3-x86-edge.apk
 "
@@ -0,0 +1,70 @@
+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
+
@@ -0,0 +1,20 @@
+# 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
+"
@@ -1,41 +0,0 @@
-# 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
-"
@@ -1,90 +0,0 @@
-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"
-	]
-}
@@ -1,24 +0,0 @@
-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"
-]
@@ -1,86 +0,0 @@
-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"
-
-			]
-		}
-	}
-}
@@ -1,31 +0,0 @@
-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=1
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ depends="
 	mesa-vulkan-freedreno
 	mkbootimg
 	postmarketos-base
-	postmarketos-update-kernel
 	qbootctl
 	qbootctl-openrc
 	swclock-offset
@@ -52,6 +51,7 @@ 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
@@ -1,7 +1,8 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=12
+pkgver=13
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -21,12 +22,13 @@ install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-kernel-lts:kernel_lts
-	$pkgname-mesa
 "
 _pmb_recommends="
+	firmware-ath6kl
+	firmware-b43xx
 	linux-firmware
-	oem-intel
 	oem-amd
+	oem-intel
 "
 provides="device-tablet-x64uefi=$pkgver-r$pkgrel device-tablet-x86uefi=$pkgver-r$pkgrel"
 replaces="device-tablet-x64uefi device-tablet-x86uefi"
@@ -39,14 +41,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }

-mesa() {
-	install_if="$pkgname=$pkgver-r$pkgrel mesa-gl"
-	provides="device-tablet-x64uefi-mesa=$pkgver-r$pkgrel device-tablet-x86uefi-mesa=$pkgver-r$pkgrel"
-	replaces="device-tablet-x64uefi-mesa device-tablet-x86uefi-mesa"
-	depends="mesa-dri-gallium"
-	mkdir "$subpkgdir"
-}
-
 kernel_edge() {
 	pkgdesc="Alpine Edge kernel"
 	provides="device-tablet-x64uefi-kernel-edge=$pkgver-r$pkgrel device-tablet-x86uefi-kernel-edge=$pkgver-r$pkgrel"
@@ -64,6 +58,6 @@ kernel_lts() {
 }

 sha512sums="
-33f0450413c7b364390fdc715578b41389bced5ff69f04a2128155f5ad828ed0e1cc17a20b610eccf4bd99560e21be91e362faaa72e9decad4623f8669e8ab7a  deviceinfo
+e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb  deviceinfo
 cf9ad3e80b43aa799a8123289e3ab77f6a1c37cee3d48db737688b93afd4f1094db76008ec0f28358c35dd1e115c4fabf9452f9abee76481a2630f02e3ae0953  modules-initfs
 "
@@ -10,14 +10,15 @@ deviceinfo_year="1999"
 deviceinfo_arch="x86_64"

 # Device related
-deviceinfo_chassis="tablet"
-deviceinfo_keyboard="false"
+# 'desktop' type (which would include laptops) is probably the most common for
+# this generic device
+deviceinfo_chassis="desktop"
 deviceinfo_external_storage="true"
 deviceinfo_gpu_accelerated="true"

 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_kernel_cmdline="PMOS_FORCE_PARTITION_RESIZE"
+deviceinfo_kernel_cmdline="PMOS_FORCE_PARTITION_RESIZE quiet"
 deviceinfo_partition_type="gpt"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_generate_systemd_boot="true"
@@ -3,7 +3,7 @@
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=5
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ depends="
 	linux-postmarketos-rockchip
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
 	soc-rockchip-rk3399
 "
 makedepends="devicepkg-dev"
@@ -3,18 +3,17 @@
 pkgname=device-google-kukui
 pkgdesc="Google Kukui Chromebooks"
 pkgver=6
-pkgrel=4
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf-google-kukui
+	alsa-ucm-conf-cros
 	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=5
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ 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=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,7 +14,6 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="
@@ -3,7 +3,7 @@
 pkgname=device-google-snow
 pkgdesc="Samsung Chromebook"
 pkgver=6
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,7 +14,6 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="
@@ -3,7 +3,7 @@
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
 pkgver=1
-pkgrel=4
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ 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=5
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,7 +14,6 @@ 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=1
+pkgrel=3
 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,6 +25,7 @@ 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=10.1
+pkgver=24
 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"
+depends="postmarketos-base linux-postmarketos-omap u-boot-tools kbd kbd-bkeymaps
+	ofono alsa-utils linux-firmware-ti-connectivity wl1251-cal wl1251-cal-openrc"
 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,10 +45,11 @@ 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
@@ -93,13 +94,8 @@ 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
-
-	# 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
+	install -Dm644 "$srcdir"/80-feedbackd-twl4030.rules \
+		"$pkgdir"/usr/lib/udev/rules.d/80-feedbackd-twl4030.rules

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

 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
-	depends="xset xinput"
+	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
 	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() {
@@ -148,7 +151,7 @@ xkeyboard_config() {

 i3wm() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
-	depends="unclutter-xfixes i3blocks rxvt-unicode upower"
+	depends="unclutter-xfixes i3blocks rxvt-unicode upower brightnessctl"
 	install -D -m644 "$srcdir"/i3wm.conf \
 		"$subpkgdir"/etc/skel/.config/i3/config
 	install -D -m644 "$srcdir"/i3blocks.conf \
@@ -174,20 +177,11 @@ 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
-b3612348af1465c6dc21ce30153fc7e2cce3ae7f9bf9ff34d5a560e173e174275c1701dd7c45337fa56caaadb252b9494bddf997a698d665d3a8c01cde6955c7  acpi.map
-ac2f8a50280f7d5f8c5ce3ab50d00f1a4c8c1415890347542c684b6e24874a23d57a8f48c62451c46466996decc58276d737bdb892f8b284881d3760948b09bb  acpi_handler.sh
+2e6c324c2a0627fb37ee2feff249d6c828116a9c1a32d572481dddc12648c98b726eb3a475838398742f76a60e3f2249d7707502360473b8bf2e794bf22f57ce  acpi.map
+ff51909873160c2d4c6f0c0119b6d4a02751df29f571b8596b4bc8b04ce2541913c11a583b0e5dabd43f240752a8131da45db0ddff194860f4c11198599686a1  acpi_handler.sh
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
@@ -195,7 +189,7 @@ e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b11
 2463008d270ed09342f15b51f24ea455bd884021f95397991b85616b6840a6608d91cd1fc43186094f5c3d1bd25e88c16aa9ead07b018aea3d93cd2359bba0b1  deviceinfo
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
 826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f  i3blocks.conf
-e06ae2ba1c8c8d3fd76c5d2fa6480561d5221c616d7ff50ed590e2cdbbc1dd0cb8232ee5cde43b79ec059876f49c1d1ae182bd016805a4e90b6331ce75bf4426  i3wm.conf
+506accabcf9fb3e2a270228ea53fdcb57f51092d6e7126a631af8eed697cd882cc805b19cf255422284bec12c928b58219d173a4a790d784db5335a059b6bb4f  i3wm.conf
 0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8  protip_shell.sh
 6c6a70667f37807089adbb343c09d1f62d47b8e6c9c0a54f44790b822f8bff3dccae73341ef736b799fd6740bbd6e1f48e6e122c2e08520f71f6ad7434a47d2c  battery-bq27200
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar
@@ -207,14 +201,15 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 6e4e8b10a41d0957968736f5d780f14c7070b03913d80859cb07180e9cec9a36bbc9c639748765e48962772640974f5491627520cc36bd3d6c9d01748f9ddaff  rx51_ptes.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
-caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f  lock.sh
+6cb3ad1253ceb682d5241e6661a4313cb88b16cbf855f45513b7320584cab062e6c6f472b4ba89ccf76c66493ea76dc3a7bed516b403e324a6fa5657621c7a09  lock.sh
 157b27feebcfddf800a1ffd8c6e369d2b58e5db25b1a44b4443dada8d9fe74abb91d036b9f0e97769bbafbdc72020b5637313682c6932fe7b0bddb9ebebbad42  modem-load.conf
 695feac7f69a0ec8c5e007cdb651adcc3492f1c6236e7fd183edec2a5e25cb957d3ace630ea5fdb87fd703e35ac368f1d097c2f881ecb52c9cfd433564db2a6c  modem-opts.conf
-72b1554929843990a7665fdf1e45f7ef304fc45d3fa3b1082dcb9dd6cb9d3e9f6799659a8e2fdbd24a809319654543d1c20a0528856002c3de319d5546e2af8b  modules.blocklist
-b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66  n900-wlan-data.initd
+862ebc7cd2d7a1b3d41b10701b8418308c89eb0732eb99c42ec1091d48e08db9421727f67a3272b7309549798d59afb1b8d7d2fa48d1447b208fcb2329472d4d  modules.blocklist
 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,15 +1,12 @@
 # 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 1 CAM_LID_OPEN
-"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 0 CAM_LID_CLOSE
+"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_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

@@ -19,15 +16,9 @@
 "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,5 +1,6 @@
 #!/bin/ash

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

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

 case $cmd in
 	KP_SLIDE_OPEN)
-		adjust_keypad_bl 255
+		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"'
 		;;
 	KP_SLIDE_CLOSE)
 		adjust_keypad_bl 0
 		;;
 	CAM_BTN_DWN)
-		echo "Not implemented yet"
+		USER_USER="$user" /usr/bin/proxishot.sh
 		;;
 	CAM_BTN_UP)
 		echo "Not implemented yet"
@@ -33,58 +36,32 @@ 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)
-		echo "Not implemented yet"
+		su $user -c "DISPLAY=:0 /usr/bin/lock.sh"
 		;;
 	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"
-				;;
-		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"
-				;;
+	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"
+		;;
 	*)
 		echo "Unknown event"
 		exit 1
 		;;
 esac
-
-
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update add n900-wlan-data boot
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-[ -f /lib/firmware/ti-connectivity/wl1251-nvs.bin ] && n900-update-wl1251
-
-exit 0
@@ -60,9 +60,6 @@ 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:' \
@@ -70,6 +67,13 @@ 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 {
@@ -87,4 +91,7 @@ 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,14 +1,17 @@
 #!/bin/sh

-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"
+display=off
+if xset q | grep -iq "monitor is on"; then
+	display=on
 fi
+
+case "$display" in
+	off)
+		xinput enable "TSC2005 touchscreen"
+		xset dpms force on
+		;;
+	on)
+		xinput disable "TSC2005 touchscreen"
+		xset dpms force off
+		;;
+esac
@@ -7,3 +7,6 @@ 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
@@ -1,20 +0,0 @@
-#!/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 $?
-}
@@ -0,0 +1,12 @@
+#!/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
@@ -0,0 +1 @@
+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=1.2
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -3,8 +3,8 @@

 pkgname=device-odroid-xu4
 pkgdesc="ODROID XU4"
-pkgver=0.2
-pkgrel=3
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=13
-pkgrel=1
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,6 @@ depends="
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
-	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
@@ -43,7 +42,6 @@ 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=1
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,6 @@ depends="
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
-	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
@@ -43,7 +42,6 @@ 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=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base postmarketos-update-kernel linux-postmarketos-omap mkbootimg"
+depends="postmarketos-base 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=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base postmarketos-update-kernel linux-postmarketos-omap mkbootimg"
+depends="postmarketos-base 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=6.3
-pkgrel=3
+pkgver=7
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,7 +13,6 @@ 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=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,7 +13,6 @@ 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=1
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ depends="
 	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
-	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
@@ -45,7 +44,6 @@ 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=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,6 @@ depends="
 	mkbootimg
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
-	postmarketos-update-kernel
 "
 makedepends="devicepkg-dev"
 subpackages="
@@ -0,0 +1,5 @@
+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,26 +2,32 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
-pkgver=9
+pkgver=11
 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-nonfree-firmware:nonfree_firmware
-"
+subpackages="$pkgname-fake-goodix:fake_goodix"
+
 source="
 	deviceinfo
 	modules-initfs
+	90-device-xiaomi-daisy.rules
 "

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

-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"
+fake_goodix() {
+	pkgdesc="Calibration data for replacement goodix touch controllers"
+	install -Dm644 90-device-xiaomi-daisy.rules -t "$subpkgdir/etc/udev/rules.d/"
 }

 sha512sums="
-8c5980c1da9e5bc91f11bb8056ac9a225cb84a90a42a964dc0dc2966220c105683081055fdcb1caa8c198019d8373d8c5fe27155429c17814d34075d5f961aa4  deviceinfo
+493e74847984e51c4f788f1272351571411ba21dea6c3ad1fd2d669271e197bd6f55a8720e97c00480a30dd2803515384fe55362c90c5800fe8ef51f6c7c5521  deviceinfo
 7202f0a55dfe43348940412fc38e59c855594b070db8742419feadb2299086d5810107201a228b7137b7cc7a97c94afac95d81c0cd65c52f31dbcb619b0a4279  modules-initfs
+a2608b01b7b6e2dade694af355ff4f0f26cad49cf54bc332c77eb75d19fdc985f7f996fedb72753de447be0391deabf5fcea52406791d1e6e0d165703b63f145  90-device-xiaomi-daisy.rules
 "
@@ -24,6 +24,7 @@ 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,22 +2,26 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-markw
 pkgdesc="Xiaomi Redmi 4 Prime"
-pkgver=5
+pkgver=6
 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
@@ -27,18 +31,7 @@ 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="
-0d393f07e551058781a67c096b1ad7f252c78e801a2da8752f893f4ea7c24f7aa65bc69f9c80c7be53e615269a7028eb151e7bc3fe79f0c260a4d28e97f10e7d  deviceinfo
+045c326d054120720b4971b10fc367fbb96b95621e6e1b5d453b8fbd90191bc7040adfda11215975d0e117487ca3882149fbee94bfd75b68896eb8b94578a68d  deviceinfo
 0cba88d7ede62dc7c47feefb27d10e58e4c93498bec97cd274a1d10c4f16dff06c5472ed555170e0392a57c9269cc50bf550523f41bf1ba6c600af533302574b  modules-initfs
 "
@@ -23,6 +23,7 @@ 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,22 +1,26 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=device-xiaomi-mido
 pkgdesc="Xiaomi Redmi Note 4X"
-pkgver=6
+pkgver=7
 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
@@ -26,19 +30,7 @@ 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="
-cdca8edd4ccb13c0198493dcf14e43a2acf8eaddc1dcfba6eb895485b172c7315ab389011fdf9bb54b68a4fb82c31d9a7b50caa566d1aa992a347facb49758b4  deviceinfo
+815d228250a6783e02fa4107526bc2eae5428c05e48ed77a651980f00917a44e6bcecdac7835ad4a24320d4be2c510e2879a45a2b06accc3217d97d7bbf32e9e  deviceinfo
 9f534c76689728c3fa699ac8c854ca82815d5158a3675a70ef879ddbf140460977187dc3c1a799dadd0ab53d5a08b6275a1594a7b976eda983f3e78b2738a8be  modules-initfs
 "
@@ -23,6 +23,7 @@ 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=10
+pkgrel=11
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,6 @@ depends="
 	mesa-egl
 	mkbootimg
 	postmarketos-base
-	postmarketos-update-kernel
 	soc-qcom-msm8996
 	soc-qcom-msm8996-ucm
 	"
@@ -4,22 +4,27 @@

 pkgname=device-xiaomi-tissot
 pkgdesc="Xiaomi Mi A1"
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 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
@@ -29,19 +34,7 @@ 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="
-e94d5aeae51c697d4483dc1d7a5eb4980a37ad3dec693ddd8f7b829ed5583a200254b393d0337b3180e36289cb4eba60a6667bd3cf08d2c994a03ac3092d22df  deviceinfo
+aed10dce67aa863073d5978d7ad47683ffdc7118cffc96c670b914c8dd423c79ee4cebd4878836e44cc6f2b62f67c7cfb7d7f28664bfc8b0f6499c982b0ead4c  deviceinfo
 4284d7c184f364d81a06de962808cb240b713cda11381ddcec5acdfbb4d4962922b64b2f2675ab463961c0510352211ec439a6b9e4ebdc47bf73980133e9626a  modules-initfs
 "
@@ -21,6 +21,7 @@ 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,21 +2,25 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-vince
 pkgdesc="Xiaomi Redmi 5 Plus"
-pkgver=12
+pkgver=13
 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
@@ -30,18 +34,7 @@ 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="
-b39437cc3b8cfa2b6aed96bc540404e7623b2a101737708f0f32ed41ec33aa56cc51d267ddfd834e81d3bbc901f4ab82664f3c54ac8281277364a656e22ef421  deviceinfo
+e8cc57aa54f3564baf44e2d813a3573d999354ec81732de2a97ac7f0ebb32827c54ef1d4bb4e1149109c426cc1b4faad379b3bd16d0a72ef8f9be532f93ae7f8  deviceinfo
 69cfc8db6ea497576085e1b5861c766b5c6cfbd493e4d66aa0bfa29a0e80eeaeb8a465c4841c6a7959796f5a2325e621d60f2c35ccb0741d7934ab310abe807f  modules-initfs
 "
@@ -27,6 +27,7 @@ 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,22 +2,26 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-ysl
 pkgdesc="Xiaomi Redmi S2/Y2"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 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
@@ -27,18 +31,7 @@ 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="
-b80c6f67c97d4ed3292a4f68fefea75e2944125232a1862c2088e3806f37a43043e193341d7d81abd59ad2fea9d696af04ae576acdc21a6125e925570cbaafa7  deviceinfo
+559dbc06a031cd4b2b5f8dd612ea647313eeed6170eb97d26332f75daf7f41613c8f759aa64f2e5c70adabdb44ff9a5f60fe02869ad8f80a9b15cfca9d673d59  deviceinfo
 b5e4f6dec04a9a7d7231a62d8b60e17a9a5265768eb80050225c0f57b8188ec108d8b7155ccb70ba95201906b653d19ef33a0ff04072da040b0242d7032b103d  modules-initfs
 "
@@ -22,6 +22,7 @@ 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"
@@ -0,0 +1,23 @@
+# 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
+"
@@ -1,3 +0,0 @@
-/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=0
+pkgrel=1
 pkgdesc="Firmware for OnePlus 6 / 6T"
 url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845"
 arch="aarch64"
@@ -13,15 +13,13 @@ options="!check !strip !archcheck !tracedeps textrels pmb:cross-native"
 _version="dc9c77f220d104d7224c03fcbfc419a03a58765e"
 _board2_commit="fc750b3f1bda29c08cfe9329eb781c0ae3608456"

-source="$pkgname.tar.gz::$url/-/archive/$_version/$pkgname-$_version.tar.gz
+source="$pkgname-$_version.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
 "
@@ -37,16 +35,6 @@ 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"

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

 sha512sums="
-d14b22434016cb12b8c04a3e7ac186451d77b92284e926a2771d958960d4da8ffb10cb9db555a200babcedd7be3379d2840882d19c26edc88805eee943310c2f  firmware-oneplus-sdm845.tar.gz
+d14b22434016cb12b8c04a3e7ac186451d77b92284e926a2771d958960d4da8ffb10cb9db555a200babcedd7be3379d2840882d19c26edc88805eee943310c2f  firmware-oneplus-sdm845-dc9c77f220d104d7224c03fcbfc419a03a58765e.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.0
+pkgver=6.1
 pkgrel=0
 pkgdesc="Samsung Galaxy Midas board firmware (m0, m3, t0lte, ...)"
 _commit="fdd8c44568a148c22fbf008de822ff4e27992da1"
@@ -10,6 +10,8 @@ _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"
@@ -23,6 +25,9 @@ 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"

@@ -54,10 +59,21 @@ 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="
@@ -65,4 +81,7 @@ 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
 "
@@ -1,3 +0,0 @@
-/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=2
+pkgrel=3
 pkgdesc="Firmware for SHIFT sdm845 devices"
 url="https://gitlab.com/sdm845-mainline/firmware-shift-sdm845"
 arch="aarch64"
@@ -20,11 +20,9 @@ _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
 "
@@ -42,16 +40,6 @@ 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"

@@ -77,7 +65,6 @@ 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=0
+pkgrel=1
 pkgdesc="Firmware files for Xiaomi Mi A2 Lite"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -12,14 +12,12 @@ 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"
+_fwdir="/lib/firmware/postmarketos"

 package() {
 	# GPU firmwares
-	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"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
 }

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

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

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

 package() {
 	# GPU firmwares
-	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"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
 }

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

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

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

 package() {
 	# GPU firmwares
-	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"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
 }

 sha512sums="
@@ -1,7 +1,7 @@
 # Maintainer: m0rf30 <morf3089@gmail.com>
 pkgname=firmware-xiaomi-vince
 pkgver=4
-pkgrel=0
+pkgrel=1
 _commit="9acb58a25d66314700eeea15c69c4571154f19cc"
 pkgdesc="Firmware files for Xiaomi Redmi 5 Plus"
 url="https://postmarketos.org"
@@ -10,14 +10,12 @@ 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"
+_fwdir="/lib/firmware/postmarketos"

 package() {
 	# GPU firmwares
-	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"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
 }

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

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

 package() {
 	# GPU Firmware files
-	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"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
 }

 sha512sums="
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-google-veyron
 pkgver=6.1.39
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline kernel for Google Veyron devices"
 arch="armv7"
 _carch="arm"
@@ -68,7 +68,7 @@ package() {

 sha512sums="
 20d468ae89b57dda82d7c7b814c3d8b1b510e1623775b09a8a0b0a8a0431461e0a1d2df2bfa01f3102932c8eef91405546898b50ec3e6f30015098bb39722b41  linux-6.1.39.tar.xz
-d98eae420c1807588564b31f6f9146a3cfc03d6b726d8f79e55554f3bc51abc085c19c5322dbdfc5024a02f4a4396e4b2dff296fc73ba1cd1af472cfc4acb671  config-google-veyron.armv7
+612a00c4000142a3e2f262e3b44e17cef6f1a585184db808062b14f860636bf0bcb653fec59d482d5d658e63e337d6668ccb55a8abe7545fb40f44e158dc585e  config-google-veyron.armv7
 2912c675c1e07f7e91e2edcaa82738643907ed46614e4b871565930ff4ffece468d47db7905c2c081f936c020ea78db4a9d9f33b76c110125a0e68a1bd57f9fd  veyron.better_clock_selection_logic_and_dts_rate_list.patch
 b16da0e0b1da9f074a773300e954aa5e0da6c2113e20c0b594a7a4875e9addb10efcf5be694467fb00cd8d7c2e3cc83e6d7aac618047775dc0bb354245cf7c35  veyron.dts_allow_dedicating_npll_to_vop.patch
 b7bda162526abdb61c0223f1aac31893526d3d1d21d79ebd3e707be8d9b5dc464f6b4fa20b74444c44fda987352728433913f6f50b9b860c2621d11ae2306e1b  veyron.dts_do_dedicate_npll_to_vop.patch
@@ -165,7 +165,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 # CONFIG_CGROUP_RDMA is not set
@@ -3,7 +3,7 @@ pkgname=linux-pine64-pinephonepro
 pkgver=6.6.0
 _pkgver=6.6
 _tagdate=20231104-22589
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline kernel for the pinephone pro"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -72,5 +72,5 @@ package() {

 sha512sums="
 d59c410ecc1a824b7b9a38f36b224693812003320220a3464a648084152023ed8be48d0448eb8054cd2b1d42befd5e8958d3ad243e50138e1c9d0269ac2917ea  linux-ppp-6.6-20231104-22589.tar.gz
-c4379739957e56031b54b1d7641248a2b8d0f0cc923de4271842ba521753a6f8d391f84447fb597b3cfc1f6684c188b6d36e911ac659349c1b6a77a635d00d3f  config-pine64-pinephonepro.aarch64
+5fc12d916cd9027dd8c4dc80c8773c499bcbf23dbef4303ee39a8644cfdad1e70da82c94ad992ee91864dbdc23a44dfd9f86459d12b511b206ff659e599c5727  config-pine64-pinephonepro.aarch64
 "
@@ -188,7 +188,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -4,7 +4,7 @@

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

@@ -80,7 +81,8 @@ package() {

 sha512sums="
 705cd617d135900cb25c8b6da7177d507e6a179b521e04aeae18080995514cbd69381a21f942ebf4d8cee427e3c60d53e6a06ed918ddcaacc243ca585ef61c11  linux-postmarketos-exynos4-v6.7.6-exynos4.tar.bz2
-ee4cec8100ebe1d85bd18ba0ba5bdf9746f1fb7a7cb6dff0d8f6782d03f51e5d87f0d05a388ff641c276db7857e729ceb900bf33061d079e97cf6e7b43dd5027  config-postmarketos-exynos4.armv7
+c1ce78565a909eea2281d17e81c879c39e02149563ff12f661359e02eca37225a5a58d7c43021ab3d0a78bdadc46cf1c54ef655a4167cc96d80874a72e847904  config-postmarketos-exynos4.armv7
 aaff0332b90e1f9f62de1128cace934717336e54ab09de46477369fa808302482d97334e43a85ee8597c1bcab64d3484750103559fea2ce8cd51776156bf7591  initramfs.list
 09f1f214a24300696809727a7b04378887c06ca6f40803ca51a12bf2176a360b2eb8632139d6a0722094e05cb2038bdb04018a1e3d33fc2697674552ade03bee  init
+aea665e80dee318ec3be23d3f28b88e87eb551d2756e14d896781a0861a4387920f6969990eb171e8c7d6f86c36cef63a89337d63bfee7e44b9de7a8efb36c73  tab3-limit-memory.patch
 "
@@ -164,7 +164,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -0,0 +1,36 @@
+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
+
@@ -5,7 +5,7 @@

 pkgname=linux-postmarketos-exynos5
 pkgver=6.1.56
-pkgrel=3
+pkgrel=4
 pkgdesc="Mainline kernel fork for Samsung Exynos5 devices"
 arch="armv7"
 _carch="arm"
@@ -70,5 +70,5 @@ package() {

 sha512sums="
 28a5ad9ef1983acf20abde6643725d6ccbab9da4c11bd151ade2613fe22b9c3886f3aa00cfe18efd2945b96907ec315646d27c01717c4ad36b0ae809d9593b87  linux-postmarketos-exynos5-v6.1.56-exynos5-lts.tar.bz2
-ba0bad0df61f12312622946365dab1e319486fbe6c0af5dd26629bc35df5c91d148c2aec9b15aef5857d23ab758cc4f6ed7ed5753f159ed8c7d0f564a2a9a5dc  config-postmarketos-exynos5.armv7
+c70fb391795dec423927bf9175fb43eb067902cf6eca7db6aaa7dfa1d164ff6a0c0776ddd69663a68952a6ff71b0f6023d1f61f8e328de4c09ca5538bc2ee55f  config-postmarketos-exynos5.armv7
 "
@@ -173,7 +173,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
@@ -4,7 +4,7 @@

 pkgname=linux-postmarketos-grate
 pkgver=6.6.22
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with experimental patches for Tegra"
 arch="armv7"
 url="https://gitlab.com/grate-driver/linux"
@@ -49,5 +49,5 @@ package() {

 sha512sums="
 db25898c5c4103e12ace113de7f7eba91b41f94a4dae270c9424341e8f796a98dee8676d1d02b229b0c4b11cc79b31454a13f9f2b7b1277b5ca9bb7328d54a39  linux-postmarketos-grate-v6.6.22-lts.tar.bz2
-e65e2cbf8cb98b571e75c1eb6232b7af27218d5a81691bb15a31d14fef4177b18209415256799c84eef0edba27249b81ea4d42b095898ce68247e1e4101a739f  config-postmarketos-grate.armv7
+651bcf10d50f5ff0f20de03384a5a0e6318e0d2b8ad527e9a19e7e119ce06c5188bb772fbafc4f6d6c97188d24639eba8bcfd1dd10c2d6a6a24414f7d9aa0576  config-postmarketos-grate.armv7
 "
@@ -161,7 +161,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -1,8 +1,8 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.8.1
-pkgrel=0
+pkgver=6.8.7
+pkgrel=1
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -68,8 +68,8 @@ package() {
 }

 sha512sums="
-255921dd12f1043a4db38b5435b34773267c592f6712815c0851f1e0add71131fb00fd00746200eabdad29ba5b6e38a768da9c048da47fb5aa59d8eaef7d236e  linux-6.8.1.tar.xz
-c3152989faaefee3fc0883870691629a0f762506c40fc2ff0383302587fafc9dbd7a3e8d5bd2316a126abd20a3f9cef2cfdcf05732c1b205c377beb67a9ff8b7  config-postmarketos-mediatek-mt8173.aarch64
+2d580d354029832e0d93401c9ef016b5dc0bcd5b5b06ccadf6fa79eb033d5af0ba29e1beca8f7a2e79bbe966d29dfd39246c8b63c8df20b756e1d484cbc8cec1  linux-6.8.7.tar.xz
+cb83322851f274c9a8ac83a9ae23d6ab3d10ef3c7df1947def2e560848881c89e43cd5ba17309b937f6eeb30c9078b9880ba38cd478152a86f927a7276e242d7  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.1 Kernel Configuration
+# Linux/arm64 6.8.7 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
@@ -11,6 +11,8 @@ CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
@@ -178,7 +180,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -1511,7 +1513,6 @@ 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,8 +1,8 @@
 # Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8183
-pkgver=6.6.16
-pkgrel=0
+pkgver=6.6.25
+pkgrel=1
 pkgdesc="Mainline kernel for mediatek mt8183"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -88,7 +88,7 @@ package() {


 sha512sums="
-3823a776f8e4aefdec75dce7c959adcb038ab0776d8d7e60fb79626d2d9410c0a334df71b1cd10499ed9ba82d7e50cec415c3f2b821b33f53171ca00b1a3b7f1  linux-6.6.16.tar.xz
+1f1c31a104aa399cd7fd67c0e73c5037e95112e544b00ad70a2a809b52d9d190c303e3f946d67d805125181004fe7de500ff2069dcacad94f6b56bfb8f180f6a  linux-6.6.25.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
-0a384eaf25c652891bce2d8cf94ffa43340ee56482ba6c2d98a092eecc5e8af2ef872aefe15ad7e1c33f0488a9d5e57bef2a27560063bbb28e00f49f78ad51b9  config-postmarketos-mediatek-mt8183.aarch64
+b99d226ad93ee3d09ffedf028bccf2d0561709e3c8f55e1c2db77eb83ae14e4bf81c545e3c016e811f4f66e6216def18893a1a347940e6db4fe3bc1a1ecc36cd  config-postmarketos-mediatek-mt8183.aarch64
 "
@@ -1,18 +1,19 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.16 Kernel Configuration
+# Linux/arm64 6.6.25 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24100
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24100
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -161,7 +162,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_GCC11_NO_ARRAY_BOUNDS=y
+CONFIG_GCC10_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
@@ -176,7 +177,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -1512,7 +1513,6 @@ 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
@@ -4,7 +4,7 @@

 pkgname=linux-postmarketos-omap
 pkgver=6.8.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline kernel fork for OMAP devices"
 arch="armv7"
 url="https://kernel.org/"
@@ -77,7 +77,7 @@ package() {

 sha512sums="
 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068  linux-6.8.tar.xz
-52ab8d791c55845742e075573644c320bbcc2ea127d6290da0ca0f03dc646f8771dde5ef8271d35c4aa76a92bff49178183b41d02ba29a2fa248634a793229fc  config-postmarketos-omap.armv7
+f43db080d4a5aabeedec761c2f55cf6530b9fe1338524d520c83d34780e9a4597fa7fe9101d3ba5447aaad81560dbadb6ab8514680eef9013470f1a85ce3e40e  config-postmarketos-omap.armv7
 fe4307a6af41913a7e5d59288b563865116797d3272e0570faff4532e198831e764e0067f53afdd39e57665196ae44f05d554bbd7d55d556d4b2d3c9d2efd41f  0001-Add-TWL6032-dtsi.patch
 2c13c46b4db0d4a75c3aae3a46041fe43f841dc4ab3c7b08cd9db22a73c8355701d85c8c1e979aba93002b96d63ad3f1f8e46c15ecdde4391ea677b71dd17b45  0002-arm-dts-Add-common-dtsi-for-espresso.patch
 4efda42604f5a6d5f9d4ceb9f87aaa5ad81d9299b3cd8ae930aafa895df5041ff5ee2cf441bbf7fdd002a52df378ee08c0bde85657e5d2086404b9f08b3a742d  0003-arm-dts-Add-espresso7-support.patch
				`@@ -0,0 +1 @@`
				`SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ATTRS{name}=="twl4030:vibrator", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"`