linux-next: upgrade to next-20260619

Signed-off-by: bluebunny <bluebunny@postmarketos.org>

.ci/build-jobs.yaml.j2

@@ -1,4 +1,4 @@
-image: registry.alpinelinux.org/img/alpine:3.23
+image: registry.alpinelinux.org/img/alpine:3.24
 stages:
   - build
   - hardware tests

.gitignore

@@ -67,7 +67,7 @@ instance/
 
 # Documentation
 public
-docs/deviceinfo-reference.md
+docs/packaging/device-packages/deviceinfo-reference.md
 
 # PyBuilder
 target/

.gitlab/issue_templates/Out_of_date_community_kernels.md

@@ -1,5 +1,8 @@
 <!-- Use this template to notify community kernel maintainers that their
      kernels are out-of-date and start the timer for moving them to testing.
+
+     Please title the issue:
+     Current community kernels not meeting version requirement (yyyy-mm-dd)
 -->
 
 Hi, as per our
@@ -7,7 +10,7 @@ Hi, as per our
 devices in the community category may not use a kernel version older than 6
 months.
 
-As of today (dd-mm-yyyy), the following kernels do not meet this requirement:
+As of today (yyyy-mm-dd), the following kernels do not meet this requirement:
 
 * kernel-pkgname: kernel-pkgver, version-release-date (maintainers: @ ...)
 

.gitlab/issue_templates/Release_Infrastructure.md

@@ -8,14 +8,14 @@ Person in charge of the release (doesn't have to do all the work, but has to
 push it forward):
 <!-- Put your usename here and assign yourself to this issue -->
 
-### Preparation
+### 0. Preparation
 - [ ] Create the gitlab milestone for the release
 - [ ] Add this infrastructure issue to the milestone
 - [ ] Update the
       [timeline](https://docs.postmarketos.org/policies-and-processes/development/releases/current-timeline.html)
       for the next release
 
-### Pre-Build phase
+### 1. Pre-Build phase
 
 This phase is to get some extra time for building packages. The branch will be rebased once in the branch phase.
 
@@ -23,6 +23,8 @@ This phase is to get some extra time for building packages. The branch will be r
 
 - [ ] Alpine's main repository must be built and published
 - [ ] Alpine's community repository must be built and published
+      <small>Without this, bpo won't be able to build packages but steps before
+      that can be done already.</small>
 
 #### pmbootstrap: adjust config
 - [ ] Update `pmb/config/__init__.py:apk_tools_min_version`. This should be a
@@ -36,18 +38,21 @@ This phase is to get some extra time for building packages. The branch will be r
 - [ ] `git checkout -b vYY.MM main`
 - [ ] Create a `=== Branch vYY.MM from main ===` commit
   - Remove channels.cfg (should only be in main)
-  - Change `channel=edge` to `channel=vYY.MM` in pmaports.cfg
-  - Change `supported_arches` to `x86_64,aarch64,armv7` in pmaports.cfg
-  - Disable x86, armhf, riscv64 in .ci/build-jobs.yaml.j2 on the release branch
-    and delete `.ci/build-*` scripts for these arches
+  - Adjust `pmaports.cfg`: Change `channel=edge` to `channel=vYY.MM`
+  - Adjust `pmaports.cfg`: Change `supported_arches` to `x86_64,aarch64,armv7`
+  - Delete `.ci/build-*` scripts for other arches
+    <small>`pmbootstrap ci` reads these</small>
 - [ ] `git push`
-- [ ] '''protect the new release branch in gitlab''', so nobody can force-push to it
+- [ ] Ensure the branch is protected in the
+      [repository settings](https://gitlab.postmarketos.org/postmarketOS/pmaports/-/settings/repository)
 
 #### pmaports: update main branch
 - [ ] `git checkout main`
 - [ ] Add the new branch to
-  [channels.cfg](https://wiki.postmarketos.org/wiki/Channels.cfg_reference),
-  [like this](https://gitlab.postmarketos.org/postmarketOS/pmaports/-/commit/c43571ceaf9b8155519bc9fb760bdeccd96e7e9c)
+  [channels.cfg](https://wiki.postmarketos.org/wiki/Channels.cfg_reference):
+  - [Example](https://gitlab.postmarketos.org/postmarketOS/pmaports/-/commit/c43571ceaf9b8155519bc9fb760bdeccd96e7e9c)
+  - Check if you need to set `branch_aports=master` initially if the stable
+    branch does not exist yet.
 - [ ] `git push`
 
 #### pmaports: update os-release / remove packages / aportgen
@@ -61,13 +66,15 @@ This phase is to get some extra time for building packages. The branch will be r
   - `pmbootstrap config mirrors.pmaports none`
   - `pmbootstrap config mirrors.systemd none`
   - `pmbootstrap checksum postmarketos-base`
-  - `git commit`
+  - `git commit -s` (`Remove packages that we don't have in stable`)
 - [ ] Remove packages:
   - `cross/*-armhf` and other unsupported arches in cross dir (keep `gcc-x86` and `musl-dev-x86`, `systemd-boot-x86`)
-  - `main/postmarketos-ui-asteroid` (no smartwatches are useful on stable branches at the moment)
   - `gcc4*` and `gcc6*` from main and cross dirs
   - `device/downstream`, `device/archived`
-- [ ] Run `pmbootstrap aportgen` for packages in cross
+  - `extra-repos/systemd/postmarketos-repo-nightly`
+- [ ] Run `pmbootstrap aportgen` for packages in cross:
+  - `cd cross; PMB_APK_FORCE_MISSING_REPOSITORIES=1 pmbootstrap aportgen musl-* grub-efi-x86`
+  - `git commit -s` (`cross: regenerate for vYY.MM`)
 - [ ] `git push`
 
 #### bpo: adjust config
@@ -79,17 +86,19 @@ This phase is to get some extra time for building packages. The branch will be r
 - [ ] Roll it out/ask somebody who can do that
 - [ ] Restart bpo, it will start building `x86_64` packages
 
-#### bootstrap of binary packages
-- [ ] Fix failing `x86_64` packages (Remember: patches need to go through edge
-  first, then get backported to the stable branch!)
+#### Bootstrap of binary packages
+- [ ] Fix all failing `x86_64` packages (Remember: patches need to go through
+      edge first, then get backported to the stable branch!)
   - Try to get build fixes merged to edge quickly, ask for reviews in
     #postmarketos-devel, and consider merging trivial fixes right after they
     pass CI.
   - Devices in testing and archived categories that don't build: consider
     trying to fix them, or just delete them from the branch
-- [ ] Wait until all packages for `x86_64` are built and published
-- [ ] Fix up ARM packages too
-- [ ] Wait until all packages for ARM are built and published
+- [ ] Wait until all packages for `x86_64` (main repository, we don't need to
+      wait for the systemd repository before continuing) are built and
+      published
+- [ ] Enable arm repositories in the BPO config
+- [ ] Get all packages to build without errors
 
 #### Wallpaper poll
 - [ ] Team meeting: make a short list of 4 wallpapers from [the
@@ -125,11 +134,11 @@ This phase is to get some extra time for building packages. The branch will be r
 - [ ] Adjust CI of postmarketos-release-upgrade to test the new release too
   (`git grep` for the previous release to see what needs to be adjusted)
 
-### Update the wallpaper
+#### Update the wallpaper
 - [ ] Set the wallpaper that won in the poll in edge, backport this change to
   the stable release branch
 
-### Branch phase
+### 2. Branch phase
 
 #### Rebase on main
 - [ ] `git checkout vYY.MM`
@@ -140,8 +149,7 @@ This phase is to get some extra time for building packages. The branch will be r
 
 #### Update BPO config
 - [ ] Update bpo's images config to build images for the new branch for all
-  devices in community and main, except for:
-  - qemu-*
+  devices in community and main
 - [ ] bpo: configure the new branch to be not WIP anymore
 - [ ] Roll-out bpo changes
 
@@ -149,7 +157,12 @@ This phase is to get some extra time for building packages. The branch will be r
 - [ ] Ensure that a pmbootstrap release been made with the apk-tools min
   version change
 
-### Test phase
+#### aports stable branch set?
+* [ ] Check if a stable branch exists in `aports` for the new release, and that
+      it is being used in `channels.cfg` (might still be set to `master` if it
+      did not exist during the Pre-Branch phase).
+
+### 3. Test phase
 - [ ] Create an issue in pmaports with a checklist of devices and UIs in main
   and community (see previous issue for reference)
   - Tag the testers of each device and UI
@@ -164,7 +177,7 @@ This phase is to get some extra time for building packages. The branch will be r
   intended for the upcoming release
 - [ ] Add new version to the pmaports gitlab issue template (.gitlab dir)
 
-### Release phase
+### 4. Release phase
 - [ ] Did a reasonable amount of devices get tested? (we may consider dropping
   devices that were not tested)
 - [ ] Make sure all fixes are in

COMMITSTYLE.md

@@ -1,4 +1,4 @@
-# Policy for commits in pmaports
+# Commit Style
 
 This document defines policy for organising and titling commits for
 inclusion in pmaports.
@@ -16,9 +16,9 @@ target device.
 
 ## General policy
 
-We follow Alpine's aports commit style with some minor exceptions
-and additions. Alpine's commit style can be found here:
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/COMMITSTYLE.md
+We follow
+[Alpine's aports commit style](https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/COMMITSTYLE.md)
+with some minor exceptions and additions.
 
 ## Exceptions
 

README.md

@@ -10,7 +10,7 @@ Helpful resources:
 * [How to create a package](https://wiki.postmarketos.org/wiki/Create_a_package)
 * [APKBUILD reference](https://wiki.alpinelinux.org/wiki/APKBUILD_Reference)
 * [pmaports commit style](./COMMITSTYLE.md)
-* [Approval rules](docs/approval-rules.md)
+* [Approval rules](docs/merge-requests/approval-rules.md)
 * [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/)
 * [Alpine Linux package search](https://pkgs.alpinelinux.org/packages)
 * [postmarketOS package search](https://pkgs.postmarketos.org/packages)

cross/gcc-aarch64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=5
+pkgrel=6
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -179,7 +179,10 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
+if $_libgcc; then
+	depends="$depends libgcc-static$_target"
+	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
+fi
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -631,12 +634,17 @@ libgcc() {
 	depends=
 
 	amove usr/lib/libgcc_s.so.*
+	# Symlink for Clang to find the library. Gets overwritten by the real
+	# library if gcc is installed.
+	ln -s /usr/lib/libgcc_s.so.1 \
+		"$subpkgdir"/usr/lib/libgcc_s.so
 }
 
 libgccstatic() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
+	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a

cross/gcc-armhf/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=5
+pkgrel=6
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,7 +180,10 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
+if $_libgcc; then
+	depends="$depends libgcc-static$_target"
+	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
+fi
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -633,12 +636,17 @@ libgcc() {
 	depends=
 
 	amove usr/lib/libgcc_s.so.*
+	# Symlink for Clang to find the library. Gets overwritten by the real
+	# library if gcc is installed.
+	ln -s /usr/lib/libgcc_s.so.1 \
+		"$subpkgdir"/usr/lib/libgcc_s.so
 }
 
 libgccstatic() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
+	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a

cross/gcc-armv7/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=5
+pkgrel=6
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,7 +180,10 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
+if $_libgcc; then
+	depends="$depends libgcc-static$_target"
+	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
+fi
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -633,12 +636,17 @@ libgcc() {
 	depends=
 
 	amove usr/lib/libgcc_s.so.*
+	# Symlink for Clang to find the library. Gets overwritten by the real
+	# library if gcc is installed.
+	ln -s /usr/lib/libgcc_s.so.1 \
+		"$subpkgdir"/usr/lib/libgcc_s.so
 }
 
 libgccstatic() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
+	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a

cross/gcc-loongarch64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-loongarch64
-pkgrel=5
+pkgrel=6
 pkgdesc="Stage2 cross-compiler for loongarch64"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,7 +180,10 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
+if $_libgcc; then
+	depends="$depends libgcc-static$_target"
+	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
+fi
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -633,12 +636,17 @@ libgcc() {
 	depends=
 
 	amove usr/lib/libgcc_s.so.*
+	# Symlink for Clang to find the library. Gets overwritten by the real
+	# library if gcc is installed.
+	ln -s /usr/lib/libgcc_s.so.1 \
+		"$subpkgdir"/usr/lib/libgcc_s.so
 }
 
 libgccstatic() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
+	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a

cross/gcc-ppc64le/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-ppc64le
-pkgrel=5
+pkgrel=6
 pkgdesc="Stage2 cross-compiler for ppc64le"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,7 +180,10 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
+if $_libgcc; then
+	depends="$depends libgcc-static$_target"
+	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
+fi
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -633,12 +636,17 @@ libgcc() {
 	depends=
 
 	amove usr/lib/libgcc_s.so.*
+	# Symlink for Clang to find the library. Gets overwritten by the real
+	# library if gcc is installed.
+	ln -s /usr/lib/libgcc_s.so.1 \
+		"$subpkgdir"/usr/lib/libgcc_s.so
 }
 
 libgccstatic() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
+	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a

cross/gcc-riscv64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-riscv64
-pkgrel=5
+pkgrel=6
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,7 +180,10 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
+if $_libgcc; then
+	depends="$depends libgcc-static$_target"
+	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
+fi
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -633,12 +636,17 @@ libgcc() {
 	depends=
 
 	amove usr/lib/libgcc_s.so.*
+	# Symlink for Clang to find the library. Gets overwritten by the real
+	# library if gcc is installed.
+	ln -s /usr/lib/libgcc_s.so.1 \
+		"$subpkgdir"/usr/lib/libgcc_s.so
 }
 
 libgccstatic() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
+	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a

cross/gcc-x86/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-x86
-pkgrel=5
+pkgrel=6
 pkgdesc="Stage2 cross-compiler for x86"
 url="https://gcc.gnu.org"
 arch="aarch64 x86_64"
@@ -180,7 +180,10 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
+if $_libgcc; then
+	depends="$depends libgcc-static$_target"
+	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
+fi
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -633,12 +636,17 @@ libgcc() {
 	depends=
 
 	amove usr/lib/libgcc_s.so.*
+	# Symlink for Clang to find the library. Gets overwritten by the real
+	# library if gcc is installed.
+	ln -s /usr/lib/libgcc_s.so.1 \
+		"$subpkgdir"/usr/lib/libgcc_s.so
 }
 
 libgccstatic() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
+	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a

cross/gcc-x86_64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-x86_64
-pkgrel=5
+pkgrel=6
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="https://gcc.gnu.org"
 arch="aarch64"
@@ -179,7 +179,10 @@ esac
 
 # libatomic is a dependency for openvswitch
 $_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static:libgccstatic:$CTARGET_ARCH"
+if $_libgcc; then
+	depends="$depends libgcc-static$_target"
+	subpackages="$subpackages libgcc::$CTARGET_ARCH libgcc-static$_target:libgccstatic:$CTARGET_ARCH"
+fi
 $_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
 if $_libgomp; then
 	depends="$depends libgomp=$_gccrel"
@@ -631,12 +634,17 @@ libgcc() {
 	depends=
 
 	amove usr/lib/libgcc_s.so.*
+	# Symlink for Clang to find the library. Gets overwritten by the real
+	# library if gcc is installed.
+	ln -s /usr/lib/libgcc_s.so.1 \
+		"$subpkgdir"/usr/lib/libgcc_s.so
 }
 
 libgccstatic() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
+	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbegin.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtbeginS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/crtendS.o
 	amove usr/lib/gcc/"$CTARGET"/"$pkgver"/libgcc.a

device/community/alsa-ucm-conf-sdm845/APKBUILD

@@ -2,9 +2,9 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=alsa-ucm-conf-sdm845
 pkgver=2
-pkgrel=0
+pkgrel=1
 pkgdesc="ALSA UCM configuration for Qualcomm SDM845 devices"
-url="https://postmarketos.org"
+url="https://gitlab.com/sdm845-mainline/alsa-ucm-conf"
 arch="aarch64"
 license="BSD-3-Clause"
 provides="alsa-ucm-conf"

device/community/device-generic-ppc64le/APKBUILD

@@ -2,17 +2,16 @@
 # Co-Maintainer: Achill Gilgenast <achill@achill.org>
 # Co-Maintainer: famfo <famfo@famfo.xyz>
 maintainer="Aelin <aelin@postmarketos.org>"
-pkgname=device-qemu-ppc64le
-pkgver=7
-pkgrel=6
-pkgdesc="Simulated device in QEMU (ppc64le)"
+pkgname=device-generic-ppc64le
+pkgver=1
+pkgrel=0
+pkgdesc="Generic ppc64le system"
 url="https://postmarketos.org"
 arch="ppc64le"
 license="MIT"
 depends="
 	grub-ieee1275
 	postmarketos-base
-	postmarketos-qemu-common
 	"
 makedepends="devicepkg-dev"
 subpackages="
@@ -22,8 +21,9 @@ subpackages="
 	"
 
 source="
-	kernel-cmdline.conf
 	deviceinfo
+	kernel-cmdline.conf
+	modules-initfs
 	"
 options="!check !archcheck"
 
@@ -54,6 +54,7 @@ kernel_mainline() {
 }
 
 sha512sums="
+33f6ac29d19cd9a4a8d5e94a863044746d08b5fd92ec89ca6578d2812e091a23afd454e4689bee21b8e000344a456161b642320cdb0246da13f56a5f8f8c89df  deviceinfo
 875267ce79b89ab77b7caa86f34bb942019ec0a5390a0f0a5156faa316367a59545b395a564875d2b2c48b83ebcb67c12b27895905301ac34410389333284ebd  kernel-cmdline.conf
-4e8d60fe172dfd392075ecf533e06ecfa42925355b242b112045915a1b3e51ac0880daa23f7750a4f480bd0fb2b7ebab77b6e28292ec4cba015653383cc1824a  deviceinfo
+366ecd0c0cd37bef12de4cf01c540f4b25f67aef2555f34cf64e4c3618903f96d464444eb32bcf6d403f9ad8cd3a23be17a95b94f8e1c083629f8ee4322c9a4a  modules-initfs
 "

device/community/device-generic-ppc64le/deviceinfo

@@ -2,21 +2,18 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="QEMU ppc64le"
-deviceinfo_manufacturer="QEMU"
-deviceinfo_codename="qemu-ppc64le"
+deviceinfo_name="Generic ppc64le system"
+deviceinfo_manufacturer="Generic"
+deviceinfo_codename="generic-ppc64le"
 deviceinfo_year="2014"
 deviceinfo_arch="ppc64le"
 
 # Device related
 deviceinfo_drm="true"
-deviceinfo_chassis="vm"
 deviceinfo_external_storage="true"
-deviceinfo_screen_width="1024"
-deviceinfo_screen_height="768"
 deviceinfo_getty="hvc0;38400"
+deviceinfo_disable_dhcpd="true"
 
 # Bootloader related
-deviceinfo_disable_dhcpd="true"
 deviceinfo_create_prep_boot="true"
 deviceinfo_generate_grub_config="true"

device/community/device-generic-ppc64le/modules-initfs

@@ -0,0 +1,10 @@
+evdev
+hid-generic
+usbcore
+usbhid
+virtio-gpu
+virtio_blk
+virtio_input
+virtio_pci
+xhci-hcd
+xhci-pci

device/community/device-google-corsola/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Alicja Michalska <ellyqw@mainlining.org>"
 pkgname=device-google-corsola
 pkgdesc="Google Corsola Chromebooks"
-pkgver=10
+pkgver=11
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -62,6 +62,6 @@ nonfree_firmware() {
 sha512sums="
 e32163709d30881bd87576556c9c659bba62acbe85be797919d87f41b18042d15d85710153606b85b4907930ba965572b4f8f52fbdabc2788f36343a2af5ac79  deviceinfo
 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb  kernel-cmdline.conf
-56fdcaa7a610497ed1bddbbfc0850f895bcfd79173b2e7de4bcf196f69120e1b62680da2a0b74543f153cb3d2b84055e71e258e7df938913aff66dca47061d7a  modules-initfs
+915fd28a0f00a56e5f6093e3dbec9f310db690cf817efe0a03c6e3e5fc44eff038a84213ba7eacc73bb9238e6cd16947f9c0fbb6904465ece01eee471b204ac5  modules-initfs
 d33545d435755c2cca3b916d920464f3f711c6f09f48b68622f740f389c4faf95544467d9e3b418e562fadb8141ae37f2311166f228d5149434183736710567d  alsa-ucm-conf-b728563a07ebcd05545c60989412ae023b1dd06d.tar.gz
 "

device/community/device-google-corsola/modules-initfs

@@ -5,6 +5,7 @@ panel-edp
 hid-generic
 hid-multitouch
 i2c-hid-of
+i2c-hid-of-elan
 i2c-hid-of-goodix
 elan-i2c
 cros-ec-keyb

device/community/device-google-manta/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Alexandre Marquet <tb@a-marquet.fr>"
 pkgname=device-google-manta
 pkgdesc="Google Nexus 10"
-pkgver=15
+pkgver=16
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,7 +11,7 @@ arch="armv7"
 options="!check !archcheck"
 depends="
 	alsa-ucm-conf
-	firmware-samsung-manta
+	firmware-google-manta
 	linux-firmware-brcm
 	linux-firmware-s5p-mfc
 	linux-postmarketos-exynos5>=6.18.33

device/community/device-google-x64cros/APKBUILD

@@ -1,8 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer="Aster Boese <asterboese@mailbox.org>"
+# Contributor: Aster Boese <asterboese@mailbox.org>
+maintainer="hexaheximal <hexaheximal@proton.me>"
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
-pkgver=20
+pkgver=21
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"

device/community/device-lenovo-21bx/APKBUILD

@@ -1,10 +1,10 @@
-# Contributor: Konrad Dybcio <konradybcio@kernel.org>
-# Contributor: Aster Boese <asterboese@mailbox.org>
 # Reference: <https://postmarketos.org/devicepkg>
+# Contributor: Konrad Dybcio <konradybcio@kernel.org>
+# Co-Maintainer: Aster Boese <asterboese@mailbox.org>
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=20
+pkgver=23
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,7 +17,6 @@ depends="
 	linux-firmware-ath11k
 	linux-firmware-qca
 	linux-firmware-qcom
-	linux-postmarketos-qcom-laptop
 	postmarketos-base
 	qmi-utils
 	systemd-boot
@@ -30,8 +29,12 @@ source="
 	pipewire.conf
 	usbguard.conf
 	kernel-cmdline.conf
+	remove-capsules.sh
 "
 subpackages="
+	$pkgname-kernel-stable:kernel_stable
+	$pkgname-kernel-lts:kernel_lts
+	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-pipewire
 	$pkgname-usbguard
 	$pkgname-vulkan
@@ -42,12 +45,17 @@ build() {
 }
 
 package() {
+	# Cannot be top-level since this is provided by subpackages of this package
+	depends="$depends $pkgname-kernel-any"
+
 	devicepkg_package $startdir $pkgname
 
 	install -Dm644 "$srcdir"/firmware.files \
 		-t "$pkgdir"/usr/share/mkinitfs/files
 	install -Dm644 "$srcdir"/pipewire.conf \
 		-t "$pkgdir"/usr/share/pipewire.conf.d
+	install -Dm755 "$srcdir"/remove-capsules.sh \
+		-t "$pkgdir"/usr/share/boot-deploy/hooks
 	install -Dm600 "$srcdir"/usbguard.conf \
 		"$pkgdir"/etc/usbguard/rules.d/"$pkgname".conf
 }
@@ -70,6 +78,31 @@ usbguard() {
 	amove etc/usbguard/rules.d/"$pkgname".conf
 }
 
+kernel_stable() {
+	pkgdesc="Stable kernel (recommended, best balance between stability and features)"
+	depends="linux-postmarketos-stable"
+	provides="$pkgname-kernel-any"
+	provider_priority=3
+	replaces="linux-postmarketos-qcom-laptop"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_lts() {
+	pkgdesc="Long-term maintenance kernel (most stability, not all security fixes & new features)"
+	depends="linux-postmarketos-lts"
+	provides="$pkgname-kernel-any"
+	provider_priority=2
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Upstream development kernel (regular breakage, latest features)"
+	depends="linux-postmarketos-mainline"
+	provides="$pkgname-kernel-any"
+	provider_priority=1
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 sha512sums="
 7a685de71e512b5b2bf21448fb8fc1055bb33c72149acd57e1754c212c40218a2b93ab603d3262c2c37ace051c5872b2fcaeb5379a5beaac680b7a2a0f115a1e  deviceinfo
 eabb3e9c6946bb065244f129f1a432842b09b0f2a9a4b41289c3c289f52076c63d51205dd7ccaa1a7621dd8eb0e4b1a3df27f9dc6b55445fbd738be13c2031bb  firmware.files
@@ -77,4 +110,5 @@ eabb3e9c6946bb065244f129f1a432842b09b0f2a9a4b41289c3c289f52076c63d51205dd7ccaa1a
 52bbb9564ec713db5d46937701b121afe0c6c644fffe189a05766f491b4997b1bbc4c1f90229efb5764d795df8d40a57d4c840ee4b32d426e7a84520364b8bf5  pipewire.conf
 0d0412eb1f01af39000c39391f622640461305d83dae1a53aa7eef640cc17fd265cabca4e4e57dea053c47a4e50f9feb90f12ee5310d5b6425783e83efc5f9d8  usbguard.conf
 7e60772bdefc4fc9d459cf2daa9fe09f605240f261b2e8f046ec992593144d26e0c80863ea3b9cb67025fef8fad45dacf54e022d0d57afb321778a5bb2eadaf4  kernel-cmdline.conf
+bf6d6e5cdd4942651eaa424445773e9475eb9b284a5be8e3eb131f6ffcb8a652ce963a04a1f1d44cdcc00a58e00dd1a9797d3e624ecde931f816026fbb583640  remove-capsules.sh
 "

device/community/device-lenovo-21bx/remove-capsules.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Persisted_Capsules.bin is huge (70 MB) and can cause boot-deploy failures
+# when doing transactions that do large modifications to `/boot/`, such as
+# switching kernel packages. Persisted_Capsules.bin is recreated on reboot
+# and we do not use it for anything currently, so it is safe to remove in a
+# hook.
+
+printf "Removing Persisted_Capsules.bin...\n"
+rm -f /boot/Persisted_Capsules.bin  >/dev/null 2>&1

device/community/device-nokia-n900/10-initfs-input.files

@@ -5,8 +5,8 @@
 /usr/share/bkeymaps/fi/rx51_fi.bmap.gz
 /usr/share/bkeymaps/se/rx51_se.bmap.gz
 
-# touchscreen calibration
-/usr/lib/udev/rules.d/90-touchscreen-dev.rules
+# touchscreen calibration (and other input-related udev rules)
+/usr/lib/udev/rules.d/72-n900-input.rules
 
 # udev/hwdb hardware keyboard management
 /etc/udev/hwdb.bin

device/community/device-nokia-n900/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 maintainer="Danct12 <danct12@disroot.org>"
 pkgname=device-nokia-n900
-pkgver=60
+pkgver=62
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
@@ -42,14 +42,9 @@ subpackages="
 source="
 	10-initfs-input.files
 	10-initfs-keymap.sh
-	acpi.map
-	acpi_handler.sh
-	asound.state.headset
-	asound.state.speakers
 	backlight-enable.sh
 	bq27k-options.conf
 	bq27k-monitor.sh
-	device-nokia-n900.start
 	deviceinfo
 	etc-profile.d-25wlr-pixman.sh
 	i3blocks/i3blocks.conf
@@ -76,11 +71,13 @@ source="
 	sway/etc-sway-config.d-nokia-n900.conf
 	sway/etc-xdg-foot-foot.ini
 	uboot-script.cmd
+	ucm2/HiFi.conf
+	ucm2/RX-51.conf
 	udev/10-nokia-modem.rules
 	udev/15-bq27k.rules
-	udev/90-touchscreen-dev.rules
 	upower.conf
 	usr-lib-udev-hwdb.d-99-n900-hwkb.hwdb
+	usr-lib-udev-rules.d-72-n900-input.rules
 	usr-share-mkinitfs-hooks-01-omap-disable-idle.sh
 	usr-share-unl0kr-unl0kr.conf.d-00-n900-keyboard.conf
 	xkb-keymap
@@ -110,18 +107,12 @@ package() {
 		"$pkgdir"/usr/share/mkinitfs/hooks/00-$pkgname-backlight.sh
 	install -D -m644 "$srcdir"/pointercal \
 		"$pkgdir"/etc/pointercal
-	install -D -m644 "$srcdir"/asound.state.speakers \
-		"$pkgdir"/var/lib/alsa/asound.state.speakers
-	install -D -m644 "$srcdir"/asound.state.headset \
-		"$pkgdir"/var/lib/alsa/asound.state.headset
 	install -Dm644 "$srcdir"/10-initfs-input.files \
 		"$pkgdir"/usr/share/mkinitfs/files/10-initfs-input.files
 	install -Dm644 "$srcdir"/10-initfs-keymap.sh \
 		"$pkgdir"/usr/share/mkinitfs/hooks/10-initfs-keymap.sh
 	install -D -m644 "$srcdir"/usr-share-mkinitfs-hooks-01-omap-disable-idle.sh \
 		"$pkgdir"/usr/share/mkinitfs/hooks/01-omap-disable-idle.sh
-	install -Dm755 "$srcdir"/$pkgname.start \
-		"$pkgdir"/etc/local.d/$pkgname.start
 	install -Dm755 "$srcdir"/bq27k-monitor.sh \
 		"$pkgdir"/usr/bin/bq27k-monitor
 	install -Dm755 "$srcdir"/screenlock.sh \
@@ -130,14 +121,14 @@ package() {
 		"$pkgdir"/usr/share/unl0kr/unl0kr.conf.d/00-n900-keyboard.conf
 
 	# Udev & hwdb rules
-	install -D -m644 "$srcdir"/90-touchscreen-dev.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/90-touchscreen-dev.rules
 	install -D -m644 "$srcdir"/10-nokia-modem.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/10-nokia-modem.rules
 	install -D -m644 "$srcdir"/15-bq27k.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/15-bq27xxx-battery.rules
 	install -D -m644 "$srcdir"/usr-lib-udev-hwdb.d-99-n900-hwkb.hwdb \
 		"$pkgdir"/usr/lib/udev/hwdb.d/99-n900-hwkb.hwdb
+	install -D -m644 "$srcdir"/usr-lib-udev-rules.d-72-n900-input.rules \
+		"$pkgdir"/usr/lib/udev/rules.d/72-n900-input.rules
 
 	# Keymap
 	install -D -m644 "$srcdir"/keymaps/rx51_us.bmap.gz \
@@ -180,6 +171,12 @@ package() {
 	install -D -m644 "$srcdir"/bq27k-options.conf \
 		"$pkgdir"/usr/lib/modprobe.d/bq27xxx-battery.conf
 
+	# UCM
+	install -Dm644 "$srcdir"/HiFi.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/RX-51/HiFi.conf
+	install -Dm644 "$srcdir"/RX-51.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/RX-51/RX-51.conf
+
 	# UPower
 	install -Dm644 "$srcdir"/upower.conf \
 		"$pkgdir"/etc/UPower/UPower.conf.d/99-n900-fg.conf
@@ -188,11 +185,6 @@ package() {
 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
 	depends="unclutter-xfixes scrot xautolock xdotool xinput xrdb xset"
-	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"/usr/share/X11/xorg.conf.d/40-xkb.conf
 	install -Dm644 "$srcdir"/xresources \
@@ -264,16 +256,11 @@ wayland() {
 }
 
 sha512sums="
-5e0631deeea881346e0f25c7d80d849026bf3e30c53bc33c9f1ee5587d5cd93b6faa3db722cbb24de0b38111c4113051a98b3d73b8b5c520f34830c12d5e0cbe  10-initfs-input.files
+225536c3105169b4cdd68d8edec56fc106f0b468e1feb1aebe772d154c0dba7d3e803877e857c23e521951b45138b64e191c9fd4e9a143313dbf12402f25c229  10-initfs-input.files
 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh
-2e6c324c2a0627fb37ee2feff249d6c828116a9c1a32d572481dddc12648c98b726eb3a475838398742f76a60e3f2249d7707502360473b8bf2e794bf22f57ce  acpi.map
-eef1f3d5fab1148af498607d3bc7c6a866b61d808d2b90a4ea3e360d5fef779070380670431b67bd3d87111bc7d0e877ef9ab656f4de17c3071cfc360a2746e3  acpi_handler.sh
-5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
-67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
 344ec50cee2a4d864debad12810a83070ab8257f9f07dcfa9be3eea1d8b26f3ab4fbe322fe05a384152b40fc5e1481df51d191624c7062186dd70f95a0784ea8  bq27k-options.conf
 c5b8e03ca9f720a794f2593a3e938640cbd91ac44dd761079bbf4614a0d288a9d7b72de8ed2493c062dc9f37be580bea529f454d2335f55b7a9f4d14024b42a9  bq27k-monitor.sh
-e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef  device-nokia-n900.start
 b1ebed32232ca1890ed6a47372ce45f4ee004fcb76defc6f67048cfa7361d6e02ebd365a6370ba7c26d410e67926a6fada863f07aa18d7098dbdea1a3b057415  deviceinfo
 1c7499eb84948eb5b73d58474b1b71a5f2f63116a2a3e1f9a4238064dcf6c152ccefa108bd4ab1074712a2319111c8fdd4bfcf0dbe4d26b5a319404def1b11d2  etc-profile.d-25wlr-pixman.sh
 a8152e94262629e11abdd8809d187c3b7ed1866a6128fb1f435e17e72120536ac8114262e66df6decb2627743027f2b923ddbe8a94e3e844099b6fad02ec252b  i3blocks.conf
@@ -295,16 +282,18 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
 862ebc7cd2d7a1b3d41b10701b8418308c89eb0732eb99c42ec1091d48e08db9421727f67a3272b7309549798d59afb1b8d7d2fa48d1447b208fcb2329472d4d  modules.blocklist
 87c18554d307161876cfe6133f7e1b2b34a0dccd6d4eb36c3f549551f1fa3587430f203911fa29023cc5c048054dbcf629f8665e88fdec9ebf48f4790a16fcf9  modules-initfs
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
-bc926a11ac6941944c1b9bdd8d8c59c6d9689bc101f6c34881341a2689f68364b4d814e1fda8a83e58f33b6bbdc74917e49f6085a35bef669a3077c8ede1b35b  screenlock.sh
+6d79a9e58a6f68dd7689e480359ba611fd9ea3f42b3f31575028a3efcea079973099eccf8ab3571221be919b4eeaf1ec48bc38aac13911444d96110551206456  screenlock.sh
 3ec2e28a59298ad87ece5205be37b6e07c5f0f3bd0a98022f9f6824500444792cb06425bfbb62c9503c3072183f2d571c8504b6f23054062bb082c7a5b125a2b  etc-sway-config.d-n900-status.conf
 1e6939c583372dd4d493e1e2cfb6a4758a17606edd262d322bc01b2d3d76de4370581954f22f6ac976d86e87aab0979b2233e1c75780aeaff0670ea25dba62ca  etc-sway-config.d-nokia-n900.conf
 45da074b597a47825146ae1f3712538210e2ebe1c459f98a8189ccfc7c16ed54d221999b5890785c92aa750c6295dee7e920ef7f97d415d4212f8c0fea29169f  etc-xdg-foot-foot.ini
 4be9626cd2ad96730671e145aba9473b8bb7e62b7dec109eb87b4c748e5ac8fcb7cb0deeecc2a07f6fc9e9a598dbd438e02ad32d21e13d109ed7fecfb29904cc  uboot-script.cmd
+3586cdbfd9a3210ee3598eec68ddf63299075ca41e325c4b6a9cb0ebc66b3d79ce44d745829cfe263471bfe80820dd7ce2ec5fb8e28c06c3f3a020fbc20dfdc1  HiFi.conf
+1a4295801cab1bbdca2e86e355d46c9dea6dbc8fd4d89e3ea6efdade33ebb29aee0cf237ce7400ea3c7716d0fe09b404a4c7042b65998cf1ae19bca2caa3d78f  RX-51.conf
 465b9a0d2b46d0981c64b47cb1f656c2456a90b91b1751a2efad10af38a96030dd99108b1fd76ce31bf1ea0f236d55bed38b114d6bd712f09f8968de034c946c  10-nokia-modem.rules
 1acc441b9f83dc91fd65fa3f89b8205bfd72a465286bc181b4e7e92dd4b8c0bc5c20a18dab46ff3ee8ae70940efd7d767b3dfb920edb4c74377bd418b838693d  15-bq27k.rules
-c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 1087d9699f6c4325a1d7ba2e6faf7fda87953fc0d3b0ef97de1da05187ba8f942f78806916cfb2ae9456fa2e63b2adf08e1e8118dc834c31a677755bab0fbf9a  upower.conf
 432f0281c4675f2c18ac03def81c3fd796697428f72ca0b7618ba28a7de4b8d0ad6234dcce4af1a7369c5e631054a1489b53950720ba6425ff3c0e1ac1a2a110  usr-lib-udev-hwdb.d-99-n900-hwkb.hwdb
+25657426abb9d53b14a784fc41e495092229f5e2ef5ca8b1324cd6b414aa61bdcde4f87431cf33b23a67792580bb7eea5a638b1ad5be6f9c956c8fb88f704e99  usr-lib-udev-rules.d-72-n900-input.rules
 73dc0f29a97994e7efe0a2c8906f75099b2bca1d660f58ae50b44d3f00eec0cee2a89541a80a4de0f276605ef36a576dd757f0cd9a9a4fd47b535b9400a83526  usr-share-mkinitfs-hooks-01-omap-disable-idle.sh
 c6e0aefb630f60a6897cffbee70670296004dcfbade971205a8b03cc0cf0571cec59e9d0151b44f820d6d1f6a16d1ba538122c2b290a3357009c2c4268ca0cb5  usr-share-unl0kr-unl0kr.conf.d-00-n900-keyboard.conf
 4de54d007bd354461fe4d6d455fe3f29694c132a3996c79b68070d606b5ca1839f9027202ebb731035f0bf6504b42fbd5ab15c7b47b7f308ce768a84d45024c4  xkb-keymap

device/community/device-nokia-n900/acpi.map

@@ -1,24 +0,0 @@
-# FORMAT: "<EV_XXX>" <type> "<input.h name>" <keycode> <value> <script under /etc/acpi>
-# hint: "evtest /dev/input/eventX" is very helpful!
-
-"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 0 CAM_LID_OPEN
-"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 1 CAM_LID_CLOSE
-
-"EV_SW" 0x05 "SW_KEYPAD_SLIDE" 10 1 KP_SLIDE_OPEN
-"EV_SW" 0x05 "SW_KEYPAD_SLIDE" 10 0 KP_SLIDE_CLOSE
-
-"EV_KEY" 0x01 "KEY_SCREENLOCK" 152 0 SCRNLCK_UP
-"EV_KEY" 0x01 "KEY_SCREENLOCK" 152 1 SCRNLCK_DWN
-
-"EV_KEY" 0x01 "KEY_CAMERA" 212 0 CAM_BTN_UP
-"EV_KEY" 0x01 "KEY_CAMERA" 212 1 CAM_BTN_DWN
-
-"EV_KEY" 0x01 "KEY_CAMERA_FOCUS" 528 0 CAM_FOCUS_UP
-"EV_KEY" 0x01 "KEY_CAMERA_FOCUS" 528 1 CAM_FOCUS_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

device/community/device-nokia-n900/acpi_handler.sh

@@ -1,60 +0,0 @@
-#!/bin/ash
-
-user=$( getent passwd 10000 | cut -d: -f1 )
-cmd=$( echo $0 | awk '{i=split($0,a,"/"); print a[i]}' )
-
-case $cmd in
-	KP_SLIDE_OPEN)
-		su $user -c '/usr/bin/screenlock.sh unlock'
-		/usr/bin/screenlock.sh kbd_backlight 31
-		;;
-	KP_SLIDE_CLOSE)
-		/usr/bin/screenlock.sh kbd_backlight 0
-		;;
-	CAM_BTN_DWN)
-		echo "Not implemented yet"
-		;;
-	CAM_BTN_UP)
-		echo "Not implemented yet"
-		;;
-	CAM_FOCUS_DWN)
-		echo "Not implemented yet"
-		;;
-	CAM_FOCUS_UP)
-		echo "Not implemented yet"
-		;;
-	CAM_LID_CLOSE)
-		echo "Not implemented yet"
-		;;
-	CAM_LID_OPEN)
-		echo "Not implemented yet"
-		;;
-	SCRNLCK_DWN)
-		echo "Not implemented yet"
-		;;
-	SCRNLCK_UP)
-		echo "Not implemented yet"
-		;;
-	HEADPHONE_INSERT)
-		alsactl restore -f /var/lib/alsa/asound.state.headset
-		;;
-	HEADPHONE_REMOVE)
-		alsactl restore -f /var/lib/alsa/asound.state.speakers
-		;;
-	MICROPHONE_INSERT)
-		echo "Not implemented yet"
-		;;
-	MICROPHONE_REMOVE)
-		echo "Not implemented yet"
-		;;
-	VIDEOOUT_INSERT)
-		echo "Not implemented yet"
-		;;
-	VIDEOOUT_REMOVE)
-		echo "Not implemented yet"
-		;;
-	*)
-		echo "Unknown event"
-		exit 1
-		;;
-esac

device/community/device-nokia-n900/device-nokia-n900-openrc.post-install

@@ -1,9 +1,5 @@
 #!/bin/sh
 
-# Enable acpid
-rc-update add acpid default
-# hwdrivers is required for acpid to 'see' all devices
-rc-update add hwdrivers boot
 # Enable ofono
 rc-update add ofono default
 # Disable swclock because rtc is working

device/community/device-nokia-n900/device-nokia-n900.post-install

@@ -1,10 +1,5 @@
 #!/bin/sh
 
-# Generate symlinks for acpid events, based on definitions in /etc/acpi.map
-for i in $(awk '{if($NF && ($1 !~ /^#/)) print $NF}' /etc/acpi.map); do
-        ln -s /etc/acpi/handler.sh /etc/acpi/$i
-done
-
 # Update hwdb
 udevadm hwdb --update
 

device/community/device-nokia-n900/device-nokia-n900.start

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-alsactl restore -f /var/lib/alsa/asound.state.speakers

device/community/device-nokia-n900/screenlock.sh

@@ -2,8 +2,22 @@
 set -e
 
 kbd_backlight() {
-	for i in $(seq 1 6); do
-		brightnessctl --quiet --device="*kb$i" s "$1"
+	# The keyboard backlighting setup is based on 6 LEDs located above the
+	# Ctrl, Q, and E keys on the left and O, comma, and Backspace on the
+	# right. Thus the outermost keys are lit brighter than the innermost
+	# keys when the brightness value is set equally, and this worsens as
+	# the device ages, since the plastic diffuser deteriorates. Thus, set a
+	# higher brightness for the innermost LEDs to get even lighting on all
+	# keys.
+	for i in $(seq 1 3); do
+		pair=$((7 - i ))
+		brightness=$(( i * $1 ))
+		busctl call org.freedesktop.login1 /org/freedesktop/login1/session/auto \
+		    org.freedesktop.login1.Session SetBrightness ssu \
+		    "leds" "lp5523:kb$i" "$brightness"
+		busctl call org.freedesktop.login1 /org/freedesktop/login1/session/auto \
+		    org.freedesktop.login1.Session SetBrightness ssu \
+		    "leds" "lp5523:kb$pair" "$brightness"
 	done
 }
 

device/community/device-nokia-n900/ucm2/HiFi.conf

@@ -0,0 +1,55 @@
+Syntax 6
+
+SectionDevice."Speaker" {
+    Comment "Internal Speaker"
+
+    Value {
+        PlaybackChannels "2"
+        PlaybackPriority "100"
+        PlaybackPCM "hw:RX51,0"
+        PlaybackVolume "HP Playback Volume"
+        PlaybackSwitch "HP Playback Switch"
+    }
+
+    EnableSequence [
+        cdev "hw:${CardId}"
+        cset "name='Speaker Function' On"
+        cset "name='HP Playback Switch' on"
+    ]
+
+    DisableSequence [
+        cdev "hw:${CardId}"
+        cset "name='Speaker Function' Off"
+        cset "name='HP Playback Switch' off"
+    ]
+}
+
+SectionDevice."Headphones" {
+    Comment "Headphones"
+
+    Value {
+        PlaybackPCM "hw:RX51,0"
+        PlaybackChannels "2"
+        JackControl "AV Jack"
+        PlaybackPriority "300"
+        PlaybackVolume "HP Playback Volume"
+        PlaybackSwitch "HP Playback Switch"
+    }
+
+    EnableSequence [
+        cdev "hw:${CardId}"
+        cset "name='Jack Function' Headphone"
+        cset "name='HP Playback Switch' on"
+        cset "name='TPA6130A2 Headphone Playback Volume' 38"
+        cset "name='Speaker Function' Off"
+    ]
+
+    DisableSequence [
+        cdev "hw:${CardId}"
+        cset "name='Jack Function' Off"
+        cset "name='HP Playback Switch' off"
+        cset "name='TPA6130A2 Headphone Playback Volume' 0"
+        cset "name='Speaker Function' Off"
+    ]
+}
+

device/community/device-nokia-n900/ucm2/RX-51.conf

@@ -0,0 +1,16 @@
+Syntax 6
+
+SectionUseCase."HiFi" {
+        File "HiFi.conf"
+        Comment "High Fidelity Audio"
+}
+
+SectionDefaults [
+        cdev "hw:${CardId}"
+        cset "name='FM Transmitter Switch' Off"
+        cset "name='Speaker Function' Off"
+        cset "name='Jack Function' Off"
+        cset "name='Earphone Switch' off"
+        cset "name='FM Transmitter Switch' off"
+        cset "name='PCM Playback Volume' 127,127"
+]

device/community/device-nokia-n900/udev/90-touchscreen-dev.rules

@@ -1,2 +0,0 @@
-SUBSYSTEM=="input", ATTRS{phys}=="spi0.0/input-ts", ENV{WL_CALIBRATION}="1.094563 -0.020949 -34.586121 0.009427 -1.148506 503.816956", ENV{LIBINPUT_CALIBRATION_MATRIX}="1.109179 0.000000 -0.055283 0.000000 -1.192340 1.081266 0.000000 0.000000 1.000000"
-SUBSYSTEM=="input", ATTRS{phys}=="spi1.0/input-ts", ENV{WL_CALIBRATION}="1.094563 -0.020949 -34.586121 0.009427 -1.148506 503.816956", ENV{LIBINPUT_CALIBRATION_MATRIX}="1.109179 0.000000 -0.055283 0.000000 -1.192340 1.081266 0.000000 0.000000 1.000000"

device/community/device-nokia-n900/usr-lib-udev-rules.d-72-n900-input.rules

@@ -0,0 +1,7 @@
+# Allow user session to read from gpio_keys and power button without elevated
+# privileges
+SUBSYSTEM=="input", KERNEL=="event*", SUBSYSTEMS=="input", ATTRS{name}=="gpio_keys", TAG+="uaccess"
+SUBSYSTEM=="input", ATTRS{name}=="twl4030_pwrbutton", TAG+="uaccess"
+
+# Touchscreen calibration
+SUBSYSTEM=="input", DRIVERS=="tsc2005", ENV{LIBINPUT_CALIBRATION_MATRIX}="1.109179 0.000000 -0.055283 0.000000 -1.192340 1.081266 0.000000 0.000000 1.000000"

device/community/device-pine64-pinenote/APKBUILD

@@ -2,7 +2,7 @@ maintainer="Antoine Martin (ayakael) <dev@ayakael.net>"
 pkgname=device-pine64-pinenote
 pkgdesc="Pine64 PineNote"
 pkgver=15
-pkgrel=0
+pkgrel=3
 _commit="42cf0c3dc26d6e0b2a32ef5a00e7ca4ae77034c7"
 _swayconfver="v1.1.0"
 url="https://postmarketos.org"
@@ -51,12 +51,19 @@ subpackages="
 	$pkgname-nonfree-firmware-openrc:firmware_openrc
 	$pkgname-nonfree-firmware-systemd:firmware_systemd
 	$pkgname-openrc
-	$pkgname-sway
 	$pkgname-sway-hrdl
 	$pkgname-systemd
 	$pkgname-xournalpp
 	$pkgname-x11
 "
+install="
+	$pkgname-sway-hrdl.post-install
+	$pkgname-sway-hrdl.post-deinstall
+	$pkgname-nonfree-firmware.post-upgrade
+	$pkgname-nonfree-firmware.pre-install
+	$pkgname-nonfree-firmware-openrc.post-install
+	$pkgname-openrc.post-install
+"
 builddir="$srcdir"/pinenote-dist-$_commit
 _swayconfdir="$srcdir"/pinenote-config-sway-$_swayconfver
 
@@ -121,9 +128,11 @@ package() {
 		-t "$pkgdir"/usr/lib/modprobe.d
 }
 
+# since pinenote requires such an opinionated UI, hrdl's sway configuration is packaged that offers
+# an optimized configuration for sway that matches the featureset offered by their Arch Linux image
 hrdl() {
 	pkgdesc="Opinionated sway UI by hrdl optimized for the Pinenote"
-	install="$subpkgname.post-install $subpkgname.post-deinstall"
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway"
 	depends="
 		adwaita-icon-theme
 		bash
@@ -139,7 +148,8 @@ hrdl() {
 		network-manager-applet
 		nwg-menu
 		papirus-icon-theme
-		postmarketos-ui-sway
+		pinenote-service
+		procps-ng
 		py3-crcmod
 		py3-dbus-next
 		py3-i3ipc
@@ -216,7 +226,6 @@ firmware() {
 	pkgdesc="WiFi, Bluetooth and display firmware"
 	depends="linux-firmware-cypress linux-firmware-brcm"
 	replaces="firmware-pine64-pinenote"
-	install="$subpkgname.pre-upgrade $subpkgname.pre-install"
 
 	# waveform firmware is provided locally via /dev/disk/by-label/waveform
 	# extracted using waveform_exctract.sh, then adapted to kernel using wbf_to_custom.py
@@ -234,24 +243,9 @@ firmware() {
 	ln -s ../cypress/cyfmac43455-sdio.bin.zst "$subpkgdir"/usr/lib/firmware/brcm/brcmfmac43455-sdio.pine64,pinenote-v1.2.bin.zst
 }
 
-sway() {
-	install_if="$pkgname=$pkgver-r$pkgrel sway"
-	install="$subpkgname.post-upgrade"
-
-	# since pinenote requires such an opinionated UI, UI configurations ar
-	# packaged from community developpers who are leading these efforts, and since
-	# there is the possibility of multiple UI configurations per UI, aport
-	# is architectured in a way to support multiple configurations. Since only hrdl's
-	# configuration is integrated, automatically depend on its subpackage for now.
-	depends="device-pine64-pinenote-sway-hrdl"
-
-	mkdir -p "$subpkgdir"
-}
-
 openrc() {
 	# rockchip_ebc sometimes fails to load the initial waveform.
 	# This forces a reload before starting tinydm
-	install="$subpkgname.post-install"
 	install -Dm755 "$srcdir"/tinydm-ebc-workaround-openrc.initd \
 		"$subpkgdir"/etc/init.d/tinydm-ebc
 
@@ -260,11 +254,6 @@ openrc() {
 }
 
 systemd() {
-	# post-install enables tinydm if tinydm-ebc was enabled
-	# enables seamless upgrade 7-r0 to 8-r0
-	# TODO: remove in preparation for v26.06
-	install="$subpkgname.post-install"
-
 	# rockchip_ebc sometimes fails to load the initial waveform.
 	# This forces a reload before starting tinydm
 	install -Dm644 \
@@ -276,7 +265,6 @@ systemd() {
 }
 
 firmware_openrc() {
-	install="$subpkgname.post-install"
 	install -Dm755 "$srcdir"/pinenote-init-waveform.initd \
 		"$subpkgdir"/etc/init.d/pinenote-init-waveform
 
@@ -310,7 +298,7 @@ abaadb6919264c179938220ed9ace965b4bc767f4f4aa6a1d646f2ee24a5fbca7f2d6a5995836127
 d19f1af374e5a9d657d1de05d3174fa4de869971536919f4cf2eecfdd7746debc320c9aa10a6d08b6e82ffbafcf54dc38bb1f61c1668b54c05d14def37895f5a  sway-config-do-not-include-sway-configd.patch
 00a32eb78bb5793c17b09d07d5cdd1bbdd30ba0fe804372cb09ee394038fcbc45e104dc114a238477a6169a993a848817cd631c854a04c1b7061a432736c17cc  sway-wayland-sessions-use-dbus.patch
 d448aaf70419e3195cd1c4ec8ff4148283b2c630c49ba6087939ff3523f0b11b2736def35c8ba7011c0452552942a668fcbb50dece2dcaa9bbcf604ad1c1cdef  sway-waybar-config-fix-endless-interval-and-invisible-icons.patch
-96f08246606a08edad5153ab11c0ddfae1c5fc36b02fe7fcde80fbef3bcefa0f8bdb57d505d701115b0bd6dec81489b167035717da6921d170e95a705d17e13e  sway-waybar-start-fix-start.patch
+f06c59190f2981a612444c7cb2249769aa49654ca61f8df6001893cb0fcc46e575bb185bc5a75d5153a2681ab0770dd3fd2fc1bc9d3061da2c08e03484e17386  sway-waybar-start-fix-start.patch
 405b2456ba16e34799b16fd632066d7813d393e263fbea7e64457ed3c6249cda69d8ebf9e6dae7f151eb1bf6036982a50c327410fceafbc8414182d2305c5a07  sway-sane-scale.patch
 5db7f2b47a46d415ac28a6822f4033f7878bf0a05b1e1b83a944a035be9fff51aeeed2fe2c36c9e74e57283734fee860ee38ef13f9ba06984cf49eb01c85adcc  sway-nwg-menu-fix-css-path.patch
 640f51a9bef6c13a226d1c6eb8e59e714b7003f8b1967279909ab50cca7f954d51bbe47efc38503019a90e37d3fa1f9800463153da280ca736deba98e8da4ece  sway-launch-lisgd-use-lib.patch

device/community/device-pine64-pinenote/device-pine64-pinenote-nonfree-firmware.pre-install

@@ -1 +1 @@
-device-pine64-pinenote-nonfree-firmware.pre-upgrade
+device-pine64-pinenote-nonfree-firmware.post-upgrade

device/community/device-pine64-pinenote/device-pine64-pinenote-sway.post-upgrade

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# if device-pine64-pinenote-sway-hrdl isn't installed, and tinydm default session is sway_hrdl
-# should set back to sway.desktop and give a message announcing end of default sway_hrdl
-if ! apk info device-pine64-pinenote-sway-hrdl --installed -q && [ "$(readlink /var/lib/tinydm/default-session.desktop)" == "sway_hrdl" ]; then
-
-	cat >&2 <<-EOF
-
-Starting with 8-r0 device package version, the opinionated configuration
-from hrdl is not installed by default with sway, and packaged under a
-different subpackage. To keep it, please execute the following
-
-    apk add device-pine64-pinenote-sway-hrdl
-	
-	EOF
-
-	tinydm-set-session -f -s  /usr/share/wayland-sessions/sway.desktop
-fi

device/community/device-pine64-pinenote/device-pine64-pinenote-systemd.post-install

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# reenables tinydm if tinydm-ebc is detected as enabled
-# allow seamless upgrade 7-r0 to 8-r0, as tinydm-ebc was removed
-# in favor of a systemd override for tinydm
-# TODO: remove in preparation for v26.06
-if [ "$(systemctl is-active tinydm-ebc.service 2>/dev/null )" == "active" ]; then
- 	systemctl disable tinydm-ebc.service
- 	systemctl enable tinydm.service
-fi

device/community/device-pine64-pinenote/sway-waybar-start-fix-start.patch

@@ -20,4 +20,4 @@ index c8a6612..57593c6 100644
  
  # Start pinenote.service if you setup doesn't have that set up
 -exec_always systemctl --user start sway-session.target
-+exec_always systemctl --user start pinenote.service
++exec_always pinenote-service

device/community/device-pine64-pinephone/APKBUILD

@@ -2,8 +2,8 @@
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 maintainer="Arnav Singh <me@arnavion.dev>"
 pkgname=device-pine64-pinephone
-pkgver=11
-pkgrel=1
+pkgver=12
+pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -188,11 +188,10 @@ plasma_mobile() {
 
 upower() {
 	install_if="$pkgname=$pkgver-r$pkgrel upower"
-	replaces="upower"
 
 	# Shutdown when PMIC reports critical battery level
 	install -Dm644 "$srcdir"/UPower.conf \
-		"$subpkgdir"/etc/UPower/UPower.conf
+		"$subpkgdir"/etc/UPower/UPower.conf.d/50-pinephone.conf
 }
 
 shelli() {
@@ -258,7 +257,7 @@ bac664c504d9a3adc6e3d25f24ac63cf7c449a82374544a5b56c259dc25af580897b9dc992865ac8
 9170da7ac869254644f2fc8d914102f2c16e917dbeb53e33b96c76936711d0540f55fa5c2526d73d5fe244500bc2728bc9d629e2524cf52c573d11e833aee666  60-flashlight.rules
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 7dc2b7c20b4a2b15f597a6417bd01797643dad84a3683b0dee648e030fb6326e9d020307643fdcdf1bb43fc44af9975697e417003bd359610bae2d8ce614fc00  90-modem-eg25.rules
-ed0e03f7e1c0348c06be9a7922414469245604ce813bbf0c8910ef211cb993bbb0d0d4615c9c961d50712415f85d6b73e0cf02780ac784666aac56e4889341e4  UPower.conf
+46458e2981dbfad6d671d24aacf78aff127d7b8d5c3f35915f442bc36a5009f5fccede09a7ec53612ff2a6784d8961bcf99c5c8dc9ff5f9178bcc46b4373a0c3  UPower.conf
 681c096e3cc99850aa87c8c3dcf941e68c9d30046fa8989382f2f80d238c01496fb1cadde3df3a1a7e90883058c6badfe24855edb927211f2f665bfcfb4af75a  deviceinfo
 b8482111e6fa805779c5c8d56c83ccf9ad360fe6481ea4e8e1fa3b71c82fe0c8de948c6f69d2b53fbcf43b4420a976f783f5d52947eccca95f24034bd4f3e32a  modules-initfs
 3dd6d612c381cb0002049d1974d8fb5aa5a53a1eb4d6bcbf62eb2ad52cfdc45f0f6ad24a699716d3513b0371aa1316f25dc72afc10d7176cc3b99d0965c3f030  hwtest.ini

device/community/device-pine64-pinephone/UPower.conf

@@ -1,94 +1,5 @@
-# Only the system vendor should modify this file, ordinary users
-# should not have to change anything.
-
 [UPower]
-
-# Enable the Watts Up Pro device.
-#
-# The Watts Up Pro contains a generic FTDI USB device without a specific
-# vendor and product ID. When we probe for WUP devices, we can cause
-# the user to get a perplexing "Device or resource busy" error when
-# attempting to use their non-WUP device.
-#
-# The generic FTDI device is known to also be used on:
-#
-# - Sparkfun FT232 breakout board
-# - Parallax Propeller
-#
-# default=false
-EnableWattsUpPro=false
-
-# Don't poll the kernel for battery level changes.
-#
-# Some hardware will send us battery level changes through
-# events, rather than us having to poll for it. This option
-# allows disabling polling for hardware that sends out events.
-#
-# default=false
-NoPollBatteries=false
-
-# Do we ignore the lid state
-#
-# Some laptops are broken. The lid state is either inverted, or stuck
-# on or off. We can't do much to fix these problems, but this is a way
-# for users to make the laptop panel vanish, a state that might be used
-# by a couple of user-space daemons. On Linux systems, see also
-# logind.conf(5).
-#
-# default=false
-IgnoreLid=false
-
-# Policy for warnings and action based on battery levels
-#
-# Whether battery percentage based policy should be used. The default
-# is to use the time left, change to true to use the percentage, which
-# should work around broken firmwares. It is also more reliable than
-# the time left (frantically saving all your files is going to use more
-# battery than letting it rest for example).
-# default=true
-UsePercentageForPolicy=true
-
-# When UsePercentageForPolicy is true, the levels at which UPower will
-# consider the battery low, critical, or take action for the critical
-# battery level.
-#
-# This will also be used for batteries which don't have time information
-# such as that of peripherals.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# PercentageLow=10
-# PercentageCritical=3
-# PercentageAction=2
-PercentageLow=20
-PercentageCritical=17
-PercentageAction=15
-
-# When UsePercentageForPolicy is false, the time remaining at which UPower
-# will consider the battery low, critical, or take action for the critical
-# battery level.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# TimeLow=1200
-# TimeCritical=300
-# TimeAction=120
-TimeLow=1200
-TimeCritical=300
-TimeAction=120
-
-# The action to take when "TimeAction" or "PercentageAction" above has been
-# reached for the batteries (UPS or laptop batteries) supplying the computer
-#
-# Possible values are:
-# PowerOff
-# Hibernate
-# HybridSleep
-#
-# If HybridSleep isn't available, Hibernate will be used
-# If Hibernate isn't available, PowerOff will be used
+PercentageLow=20.0
+PercentageCritical=17.0
+PercentageAction=15.0
 CriticalPowerAction=PowerOff

device/community/device-samsung-m0/APKBUILD

@@ -2,8 +2,8 @@
 maintainer="Stefan Hansson <newbyte@postmarketos.org>"
 pkgname=device-samsung-m0
 pkgdesc="Samsung Galaxy S III"
-pkgver=11
-pkgrel=1
+pkgver=12
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -52,7 +52,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-fb46c4de7e2bf3bd94b7012dac1420c354acefff826c3bad295659202476332f6cecd0e3316e4e92e3cc567b116c2ab30dc8e8f79773f72bccb7ca0ee1c52c39  deviceinfo
+81ab1b1999a20a10618578c17de208fa8508494435b2410c9d827e02f09c74f17c51e613e932de782fb3c6e9fc3a538a3983f0c6e66746263208fd14c67260e8  deviceinfo
 caa81e8ab6753c0ca24c22fb6742288765dfbf2469b8b8c35c5789edfcee546ef1c3b14ad6e540c417f434258399300f17d312b58157635eafab134587ef94cc  Midas.conf
 21f64c9104ec5780fffde8ba7ce57583592469694d07dd5e2de4173d7c9f99ba57fb28bb5bcfbbce921be9c4ead9d31980e948533162fe12424c2037145debb1  HiFi.conf
 56a2bdffc273cb0a581192e65378ff50e71c7bc8a696af7d5e7c165a53c005aae104c4514c68afb668454c5a94ce78bd509f8a40e3401d67e16636b1ed81d051  modules-load.conf

device/community/device-samsung-m0/deviceinfo

@@ -11,6 +11,7 @@ deviceinfo_dtb="exynos4412-i9300"
 deviceinfo_getty="ttySAC2;115200"
 deviceinfo_arch="armv7"
 deviceinfo_flash_kernel_on_update="true"
+deviceinfo_flash_sparse="true"
 
 # Device related
 deviceinfo_drm="true"

device/community/linux-postmarketos-qcom-sdm670/0001-ASoC-codecs-cs35l36-reduce-maximum-volume-to-0dB.patch

@@ -0,0 +1,42 @@
+From ce500b195fab1c3fb4d2ff04e7f24577a8f56d66 Mon Sep 17 00:00:00 2001
+From: Richard Acayan <mailingradian@gmail.com>
+Date: Mon, 8 Jun 2026 19:39:46 -0400
+Subject: [PATCH] ASoC: codecs: cs35l36: reduce maximum volume to 0dB
+
+The digital volume can be increased to +12dB. This is very loud, but
+ALSA userspace still goes under 0dB until 64% logical volume. Cap the
+maximum volume at 0dB, so ALSA only sets the hardware volume up to 0dB.
+
+Link: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/work_items/4616
+Signed-off-by: Richard Acayan <mailingradian@gmail.com>
+---
+ sound/soc/codecs/cs35l36.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/sound/soc/codecs/cs35l36.c b/sound/soc/codecs/cs35l36.c
+index 93818d7ec1a7..98992eaadb12 100644
+--- a/sound/soc/codecs/cs35l36.c
++++ b/sound/soc/codecs/cs35l36.c
+@@ -442,8 +442,8 @@ static bool cs35l36_volatile_reg(struct device *dev, unsigned int reg)
+ 	}
+ }
+ 
+-static const DECLARE_TLV_DB_RANGE(dig_vol_tlv, 0, 912,
+-				  TLV_DB_MINMAX_ITEM(-10200, 1200));
++static const DECLARE_TLV_DB_RANGE(dig_vol_tlv, 0, 816,
++				  TLV_DB_MINMAX_ITEM(-10200, 0));
+ static DECLARE_TLV_DB_SCALE(amp_gain_tlv, 0, 1, 1);
+ 
+ static const char * const cs35l36_pcm_sftramp_text[] =  {
+@@ -483,7 +483,7 @@ static int cs35l36_ldm_sel_put(struct snd_kcontrol *kcontrol,
+ 
+ static const struct snd_kcontrol_new cs35l36_aud_controls[] = {
+ 	SOC_SINGLE_SX_TLV("Digital PCM Volume", CS35L36_AMP_DIG_VOL_CTRL,
+-		3, 0x4D0, 0x390, dig_vol_tlv),
++		3, 0x4D0, 0x330, dig_vol_tlv),
+ 	SOC_SINGLE_TLV("Analog PCM Volume", CS35L36_AMP_GAIN_CTRL, 5, 0x13, 0,
+ 		amp_gain_tlv),
+ 	SOC_ENUM("PCM Soft Ramp", pcm_sft_ramp),
+-- 
+2.54.0
+

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

@@ -4,7 +4,7 @@ maintainer="Richard Acayan <mailingradian@gmail.com>"
 _flavor="postmarketos-qcom-sdm670"
 pkgname=linux-$_flavor
 pkgver=7.0.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline Kernel fork for SDM670/SDM710 devices"
 arch="aarch64"
 _carch="arm64"
@@ -35,6 +35,7 @@ _tag="sdm670-v$pkgver"
 # Source
 source="
 	https://gitlab.com/sdm670-mainline/linux/-/archive/$_tag/linux-$_tag.tar.gz
+	0001-ASoC-codecs-cs35l36-reduce-maximum-volume-to-0dB.patch
 	$_config
 "
 builddir="$srcdir/linux-$_tag"
@@ -74,5 +75,6 @@ package() {
 
 sha512sums="
 71476207449337685a947a5ab0c3a6af619e0b1322568723ed387792f8252d329d547a491e8ec6a5cb38ad76e52c4beeb76852cd7d2fbf39fd76f9743e2671de  linux-sdm670-v7.0.10.tar.gz
+3a463e3f02fe55b295d7c41cbdeb0104d62035c56f621d3536adfdd09b6ecbd90b8daabaa15633e40d5a5b4338ede1f6876996177a089718a0000077fe8e84d9  0001-ASoC-codecs-cs35l36-reduce-maximum-volume-to-0dB.patch
 af2360a11f7182c68fb81779f13623af82d4ae5b91be31b6dfad2bec60e7d548b9ba4ba049cf5a075c06e2511d2ede720937c20fd49d9fdc6a4f158fbc4ad519  config-postmarketos-qcom-sdm670.aarch64
 "

device/community/linux-purism-librem5/APKBUILD

@@ -3,13 +3,11 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 maintainer="Alistair Francis <alistair@alistair23.me>"
 pkgname=linux-purism-librem5
-pkgver=6.6.118
-pkgrel=2
+pkgver=6.6.139
+pkgrel=0
 # NOTE: Don't forget to rebase the config! See prepare() for instructions.
 _purismrel=1
-_pureosrel=cri1
-# <kernel ver> + <purism kernel release> + <PureOS release>
-_purismver=${pkgver}pureos${_purismrel}_$_pureosrel
+_purismver=${pkgver}pureos$_purismrel
 pkgdesc="Purism Librem 5 phone kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -22,21 +20,21 @@ options="!strip !check !tracedeps
 	pmb:kconfigcheck-librem5
 	"
 makedepends="
-	bash
 	bison
-	devicepkg-dev
+	clang
 	findutils
 	flex
-	installkernel
+	linux-headers
+	lld
+	llvm
 	openssl-dev
 	perl
-	rsync
-	xz
+	postmarketos-installkernel
+	python3
+	zstd
 	"
 install="$pkgname.post-upgrade"
 
-# Source
-_repository="linux"
 # kconfig generated with: ARCH=arm64 make defconfig KBUILD_DEFCONFIG=librem5_defconfig
 _config="config-$_flavor.$arch"
 
@@ -44,13 +42,13 @@ _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_purismver.tar.gz::https://source.puri.sm/Librem5/linux/-/archive/pureos/$_purismver/linux-pureos-$_purismver.tar.gz
 	$_config
+	treewide-remove-unnecessary-linux-version.h-inclusion.patch
 "
-builddir="$srcdir/$_repository-pureos-$_purismver"
+builddir="$srcdir/linux-pureos-$_purismver"
 
 prepare() {
 	default_prepare
-	REPLACE_GCCH=0 \
-		. downstreamkernel_prepare
+	cp "$srcdir/config-$_flavor.$arch" .config
 
 	####### Rebase config
 	# The kernel config needs to be periodically rebased to enable new
@@ -62,7 +60,7 @@ prepare() {
 	# This can be uncommented to help generate the defconfig using "pmbootstrap
 	# build linux-purism-librem5". The build will fail (exit 1) to let you grab
 	# the config before it starts building the kernel:
-	#    make ARCH="$_carch" CC="${CC:-gcc}" \
+	#    make ARCH="$_carch" LLVM=1 \
 	#       defconfig KBUILD_DEFCONFIG=librem5_defconfig
 	#    exit 1
 	#
@@ -75,22 +73,29 @@ prepare() {
 
 build() {
 	unset LDFLAGS
-	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
-		LOCALVERSION=".$_purismrel"
+	make ARCH="$_carch" LLVM=1 \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor"
 }
 
 package() {
-	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
-
-	make modules_install dtbs_install \
+	make dtbs_install install modules_install \
 		ARCH="$_carch" \
+		LLVM=1 \
+		INSTALL_PATH="$pkgdir"/boot \
 		INSTALL_MOD_PATH="$pkgdir"/usr \
-		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
+		INSTALL_MOD_STRIP=1 \
+		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs
+
+	rm -f "$pkgdir"/usr/lib/modules/*/build "$pkgdir"/usr/lib/modules/*/source
+
+	install -D "$builddir"/include/config/kernel.release \
+		"$pkgdir"/usr/share/kernel/"$_flavor"/kernel.release
+
 
 }
 
 sha512sums="
-f1d75865ff15793e6e70414a356209bd27fdb4c084d773698589f2e376ddcf037f2ac60a131a72ad3986b51b88c0c738deb65169bb30fd472f25cb06327ed1a8  linux-purism-librem5-6.6.118pureos1_cri1.tar.gz
-323e1d4760857c62efa67362b36b098f7fd2d6f49970236965cfab4bb8ae43ddbafa76f2fcd0deb8faa53e4b87bf202ab3507dc10f2364234af4c10453768337  config-purism-librem5.aarch64
+d51709ee85ac8ebe271fc57ba60e2ab5f90225bd045b813a281553b0f76ae4c227317201fbb509e59af9813ea3e49947e83ac7d82b97cede15212cadd90fc372  linux-purism-librem5-6.6.139pureos1.tar.gz
+92837e9d725d2f6e6aebfc10e79007dc671cbc57ddb10c9af91b0b666131275f0897e355c77705f2b57c4c87472f4f8264d32060765582878fde04891c49f997  config-purism-librem5.aarch64
+76c1e07b5479fe7be0d1e4a74a8f4a2cd8fc25fbeb3a4efcaf8300e27817a320c0c1340ea6c00ad1c3dd86cc2cb192280de8a91360bad80665115701ba11632d  treewide-remove-unnecessary-linux-version.h-inclusion.patch
 "

device/community/linux-purism-librem5/config-purism-librem5.aarch64

@@ -100,7 +100,7 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
-# CONFIG_BPF_LSM is not set
+CONFIG_BPF_LSM=y
 # end of BPF subsystem
 
 CONFIG_PREEMPT_BUILD=y
@@ -681,7 +681,7 @@ CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y
-# CONFIG_SHADOW_CALL_STACK is not set
+CONFIG_SHADOW_CALL_STACK=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y
@@ -764,8 +764,8 @@ CONFIG_ASM_MODVERSIONS=y
 # CONFIG_MODULE_COMPRESS_NONE is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 CONFIG_MODULE_COMPRESS_XZ=y
-# CONFIG_MODULE_COMPRESS_ZSTD is not set
-# CONFIG_MODULE_DECOMPRESS is not set
+CONFIG_MODULE_COMPRESS_ZSTD=y
+CONFIG_MODULE_DECOMPRESS=y
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
@@ -2041,7 +2041,7 @@ CONFIG_OF_RESERVED_MEM=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-CONFIG_ZRAM=m
+CONFIG_ZRAM=y
 CONFIG_ZRAM_DEF_COMP_LZORLE=y
 # CONFIG_ZRAM_DEF_COMP_ZSTD is not set
 # CONFIG_ZRAM_DEF_COMP_LZ4 is not set
@@ -2061,7 +2061,7 @@ CONFIG_BLK_DEV_NBD=m
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_VIRTIO_BLK is not set
 # CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLK_DEV_UBLK=m
 
 #
 # NVME Support
@@ -2558,7 +2558,7 @@ CONFIG_USB_NET_SMSC95XX=m
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_NET_PLUSB is not set
 CONFIG_USB_NET_MCS7830=m
-# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_RNDIS_HOST=m
 CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
 CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_ALI_M5632=y
@@ -2680,7 +2680,7 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_EVBUG is not set
 
 #
@@ -2861,7 +2861,7 @@ CONFIG_INPUT_GPIO_VIBRA=m
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_PWM_VIBRA=m
@@ -2986,7 +2986,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NULL_TTY=y
+CONFIG_NULL_TTY=m
 # CONFIG_HVC_DCC is not set
 # CONFIG_RPMSG_TTY is not set
 CONFIG_SERIAL_DEV_BUS=y
@@ -4548,7 +4548,7 @@ CONFIG_DRM_I2C_NXP_TDA9950=m
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_VMWGFX is not set
-# CONFIG_DRM_UDL is not set
+CONFIG_DRM_UDL=m
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_QXL is not set
@@ -4959,7 +4959,7 @@ CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
-# CONFIG_SND_USB_AUDIO_MIDI_V2 is not set
+CONFIG_SND_USB_AUDIO_MIDI_V2=y
 CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 # CONFIG_SND_USB_UA101 is not set
 # CONFIG_SND_USB_CAIAQ is not set
@@ -5235,7 +5235,7 @@ CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
-CONFIG_HID_GENERIC=y
+CONFIG_HID_GENERIC=m
 
 #
 # Special HID drivers
@@ -5617,7 +5617,7 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 # end of USB Physical Layer drivers
 
-CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
@@ -5884,7 +5884,19 @@ CONFIG_LEDS_TRIGGER_TTY=m
 #
 # Simple LED drivers
 #
-# CONFIG_ACCESSIBILITY is not set
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
 # CONFIG_EDAC is not set
@@ -7066,7 +7078,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OCFS2_FS_STATS=y
 CONFIG_OCFS2_DEBUG_MASKLOG=y
 # CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
@@ -7121,7 +7133,7 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=m
 # CONFIG_NETFS_STATS is not set
-CONFIG_FSCACHE=m
+CONFIG_FSCACHE=y
 # CONFIG_FSCACHE_STATS is not set
 # CONFIG_FSCACHE_DEBUG is not set
 CONFIG_CACHEFILES=m
@@ -7200,7 +7212,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_FILE_CACHE=y
 # CONFIG_SQUASHFS_FILE_DIRECT is not set
 CONFIG_SQUASHFS_DECOMP_SINGLE=y
@@ -7247,15 +7259,16 @@ CONFIG_EROFS_FS_XATTR=y
 CONFIG_EROFS_FS_POSIX_ACL=y
 CONFIG_EROFS_FS_SECURITY=y
 CONFIG_EROFS_FS_ZIP=y
-# CONFIG_EROFS_FS_ZIP_LZMA is not set
-# CONFIG_EROFS_FS_ZIP_DEFLATE is not set
+CONFIG_EROFS_FS_ZIP_LZMA=y
+CONFIG_EROFS_FS_ZIP_DEFLATE=y
 # CONFIG_EROFS_FS_PCPU_KTHREAD is not set
 CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_V2 is not set
-CONFIG_NFS_V3=y
+CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
@@ -7271,7 +7284,13 @@ CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DEBUG=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFS_V4_2_READ_PLUS=y
-# CONFIG_NFSD is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_V4_2_INTER_SSC=y
 CONFIG_GRACE_PERIOD=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
@@ -7280,7 +7299,10 @@ CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_CEPH_FS=m
 # CONFIG_CEPH_FSCACHE is not set
@@ -7334,7 +7356,7 @@ CONFIG_NLS_CODEPAGE_874=m
 CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=m
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
@@ -7400,7 +7422,7 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
 CONFIG_SECURITY_APPARMOR_EXPORT_BINARY=y
 CONFIG_SECURITY_APPARMOR_PARANOID_LOAD=y
 # CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
 # CONFIG_SECURITY_SAFESETID is not set
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
 # CONFIG_SECURITY_LANDLOCK is not set
@@ -7414,6 +7436,8 @@ CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf"
 # Kernel hardening options
 #
 
+CONFIG_CFI_CLANG=y
+
 #
 # Memory initialization
 #
@@ -7500,16 +7524,16 @@ CONFIG_CRYPTO_ECDH=y
 # Block ciphers
 #
 CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
+CONFIG_CRYPTO_AES_TI=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARIA is not set
 CONFIG_CRYPTO_BLOWFISH=y
 CONFIG_CRYPTO_BLOWFISH_COMMON=y
-CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST_COMMON=y
 CONFIG_CRYPTO_CAST5=y
 CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_SEED is not set
@@ -7558,10 +7582,10 @@ CONFIG_CRYPTO_ESSIV=y
 # Hashes, digests, and MACs
 #
 CONFIG_CRYPTO_BLAKE2B=m
-CONFIG_CRYPTO_CMAC=y
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 CONFIG_CRYPTO_POLY1305=y
@@ -7596,7 +7620,7 @@ CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
+CONFIG_CRYPTO_ZSTD=y
 # end of Compression
 
 #
@@ -7644,7 +7668,7 @@ CONFIG_CRYPTO_SM3_ARM64_CE=m
 # CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 # CONFIG_CRYPTO_AES_ARM64 is not set
 CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
 CONFIG_CRYPTO_AES_ARM64_BS=m
 CONFIG_CRYPTO_SM4_ARM64_CE=m
@@ -7693,7 +7717,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
-CONFIG_PKCS8_PRIVATE_KEY_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set

device/community/linux-purism-librem5/treewide-remove-unnecessary-linux-version.h-inclusion.patch

@@ -0,0 +1,77 @@
+From e332a5aba83500e8d422c90d2a84d8a5f888673e Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <masahiroy@kernel.org>
+Date: Thu, 8 Aug 2024 02:47:28 +0900
+Subject: [PATCH] treewide: remove unnecessary <linux/version.h> inclusion
+
+These files do not use any macros defined in <linux/version.h>.
+
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
+---
+ drivers/accessibility/speakup/genmap.c                | 1 -
+ drivers/accessibility/speakup/makemapdata.c           | 1 -
+ drivers/staging/media/atomisp/include/linux/atomisp.h | 1 -
+ samples/trace_events/trace_custom_sched.c             | 1 -
+ sound/soc/codecs/cs42l42.c                            | 1 -
+ 5 files changed, 5 deletions(-)
+
+diff --git a/drivers/accessibility/speakup/genmap.c b/drivers/accessibility/speakup/genmap.c
+index 0125000e00d9ab..0882bab10fb87a 100644
+--- a/drivers/accessibility/speakup/genmap.c
++++ b/drivers/accessibility/speakup/genmap.c
+@@ -10,7 +10,6 @@
+ #include <stdio.h>
+ #include <libgen.h>
+ #include <string.h>
+-#include <linux/version.h>
+ #include <ctype.h>
+ #include "utils.h"
+ 
+diff --git a/drivers/accessibility/speakup/makemapdata.c b/drivers/accessibility/speakup/makemapdata.c
+index d7d41bb9b05fbb..55e4ef8a93dc99 100644
+--- a/drivers/accessibility/speakup/makemapdata.c
++++ b/drivers/accessibility/speakup/makemapdata.c
+@@ -10,7 +10,6 @@
+ #include <stdio.h>
+ #include <libgen.h>
+ #include <string.h>
+-#include <linux/version.h>
+ #include <ctype.h>
+ #include "utils.h"
+ 
+diff --git a/drivers/staging/media/atomisp/include/linux/atomisp.h b/drivers/staging/media/atomisp/include/linux/atomisp.h
+index 16c9da172c0317..fefbe3cd08f33d 100644
+--- a/drivers/staging/media/atomisp/include/linux/atomisp.h
++++ b/drivers/staging/media/atomisp/include/linux/atomisp.h
+@@ -20,7 +20,6 @@
+ #define _ATOM_ISP_H
+ 
+ #include <linux/types.h>
+-#include <linux/version.h>
+ 
+ /* struct media_device_info.hw_revision */
+ #define ATOMISP_HW_REVISION_MASK	0x0000ff00
+diff --git a/samples/trace_events/trace_custom_sched.c b/samples/trace_events/trace_custom_sched.c
+index b99d9ab7db858f..dd409b704b35b6 100644
+--- a/samples/trace_events/trace_custom_sched.c
++++ b/samples/trace_events/trace_custom_sched.c
+@@ -8,7 +8,6 @@
+ #define pr_fmt(fmt) fmt
+ 
+ #include <linux/trace_events.h>
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/sched.h>
+ 
+diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
+index 60d366e53526ff..6400ac875e6f6c 100644
+--- a/sound/soc/codecs/cs42l42.c
++++ b/sound/soc/codecs/cs42l42.c
+@@ -11,7 +11,6 @@
+ 
+ #include <linux/module.h>
+ #include <linux/moduleparam.h>
+-#include <linux/version.h>
+ #include <linux/types.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>

device/community/soc-qcom/APKBUILD

@@ -2,7 +2,7 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=soc-qcom
 pkgdesc="Common package for Qualcomm devices"
-pkgver=8
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -17,7 +17,6 @@ depends="
 replaces="
 	soc-qcom-sdm845
 	soc-qcom-sdm845-nonfree-firmware
-	upower
 "
 subpackages="
 	$pkgname-gstreamer-openrc:gstreamer_openrc
@@ -54,7 +53,7 @@ package() {
 
 	# Shutdown when battery is critical instead of sleep
 	install -Dm644 "$srcdir"/UPower.conf \
-		"$pkgdir"/etc/UPower/UPower.conf
+		"$pkgdir"/etc/UPower/UPower.conf.d/50-soc-qcom.conf
 
 	install -Dm644 "$srcdir"/51-qcom.conf \
 		-t "$pkgdir"/usr/share/wireplumber/wireplumber.conf.d
@@ -189,7 +188,7 @@ pulseaudio_systemd() {
 
 sha512sums="
 28c14f47eaedec577d152001c51753537c98f267ac4a0acf78a304efebe5f6a1b4dc6d501497da9a0a925806a1d9c80b25e001cf9b1eb21efa22cd6a41ff753b  51-qcom.conf
-9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
+72e8ed55499976574fa09e6c3b79c0e046c786932179cfd30788a80037906a45861f09f6663fa1bc15a4571be97b3a40ee3631988bffd1c9ee9f360358b6486a  UPower.conf
 6fb4c0bd8b7ed534d855a6732ccff783960e3cfa0e0cc7effcbb93afa00798dec15361a37a3200081bc114c8d266b7a0851cc4e819ad36eabdb47a50c72620d9  call_audio_idle_suspend_workaround.confd
 5a58475b6e2ee1d655f3f23d8dc19e1cb2f32f1dfff3b9a9337d9c5baad1ec24bfaec0fb9cc03f00e5a291bee27c6b8bffbc65157e2bee5d65ef6d1adcb0910b  call_audio_idle_suspend_workaround.initd
 6f08583574782c01d826ee6b67dd0ceca7b700559efa49042c4b9f182fcd7a4f390c8b011d8ede1820f0ac151eaee24e31a8bac127e2aaf9a6fd605eb17fbea9  call-audio-idle-suspend-workaround.service

device/community/soc-qcom/UPower.conf

@@ -1,94 +1,5 @@
-# Only the system vendor should modify this file, ordinary users
-# should not have to change anything.
-
 [UPower]
-
-# Enable the Watts Up Pro device.
-#
-# The Watts Up Pro contains a generic FTDI USB device without a specific
-# vendor and product ID. When we probe for WUP devices, we can cause
-# the user to get a perplexing "Device or resource busy" error when
-# attempting to use their non-WUP device.
-#
-# The generic FTDI device is known to also be used on:
-#
-# - Sparkfun FT232 breakout board
-# - Parallax Propeller
-#
-# default=false
-EnableWattsUpPro=false
-
-# Don't poll the kernel for battery level changes.
-#
-# Some hardware will send us battery level changes through
-# events, rather than us having to poll for it. This option
-# allows disabling polling for hardware that sends out events.
-#
-# default=false
-NoPollBatteries=false
-
-# Do we ignore the lid state
-#
-# Some laptops are broken. The lid state is either inverted, or stuck
-# on or off. We can't do much to fix these problems, but this is a way
-# for users to make the laptop panel vanish, a state that might be used
-# by a couple of user-space daemons. On Linux systems, see also
-# logind.conf(5).
-#
-# default=false
-IgnoreLid=false
-
-# Policy for warnings and action based on battery levels
-#
-# Whether battery percentage based policy should be used. The default
-# is to use the time left, change to true to use the percentage, which
-# should work around broken firmwares. It is also more reliable than
-# the time left (frantically saving all your files is going to use more
-# battery than letting it rest for example).
-# default=true
-UsePercentageForPolicy=true
-
-# When UsePercentageForPolicy is true, the levels at which UPower will
-# consider the battery low, critical, or take action for the critical
-# battery level.
-#
-# This will also be used for batteries which don't have time information
-# such as that of peripherals.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# PercentageLow=20
-# PercentageCritical=5
-# PercentageAction=2
-PercentageLow=10
-PercentageCritical=5
-PercentageAction=3
-
-# When UsePercentageForPolicy is false, the time remaining in seconds at
-# which UPower will consider the battery low, critical, or take action for
-# the critical battery level.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# TimeLow=1200
-# TimeCritical=300
-# TimeAction=120
-TimeLow=1200
-TimeCritical=300
-TimeAction=120
-
-# The action to take when "TimeAction" or "PercentageAction" above has been
-# reached for the batteries (UPS or laptop batteries) supplying the computer
-#
-# Possible values are:
-# PowerOff
-# Hibernate
-# HybridSleep
-#
-# If HybridSleep isn't available, Hibernate will be used
-# If Hibernate isn't available, PowerOff will be used
+PercentageLow=10.0
+PercentageCritical=5.0
+PercentageAction=3.0
 CriticalPowerAction=PowerOff

device/downstream/device-lg-elsa/APKBUILD

@@ -0,0 +1,31 @@
+# Reference: <https://postmarketos.org/devicepkg>
+maintainer="Nardo45 <Nardo45@proton.me>"
+pkgname=device-lg-elsa
+pkgdesc="LG V20 (elsa)"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	linux-lg-elsa
+	mkbootimg
+	msm-fb-refresher
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+source="deviceinfo kernel-cmdline.conf"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+a84a72e0bc7a2662ff2626865097d1da6f3cb08412f685a8e9add80dd9e674d648fd9d3fc7c81e6b380bd25668cfed7ce5874975aff080be8770ecc2493a083d  deviceinfo
+67a15c9304112e80e54e62da1bfc6c4c0b942f3a125723f6d007afaa07232fe61ec14c515570ae9abf2ef35a8bdd2f4e7df892904b79b0c1b0f54073603ac157  kernel-cmdline.conf
+"

device/downstream/device-lg-elsa/deviceinfo

@@ -0,0 +1,25 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="LG V20"
+deviceinfo_manufacturer="LG"
+deviceinfo_codename="lg-elsa"
+deviceinfo_year="2016"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_external_storage="true"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_generate_bootimg="true"
+deviceinfo_flash_pagesize="4096"
+deviceinfo_flash_offset_base="0x80000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x80000000"
+deviceinfo_flash_offset_tags="0x00000100"
+
+deviceinfo_rootfs_image_sector_size="4096"

device/downstream/device-lg-elsa/kernel-cmdline.conf

@@ -0,0 +1 @@
+console=ttyHSL0,115200,n8

device/downstream/device-sqfmi-beepy/APKBUILD

@@ -2,7 +2,7 @@
 maintainer="Adam Thiede <me@adamthiede.com>"
 pkgname=device-sqfmi-beepy
 pkgdesc="SQFMI Beepy"
-pkgver=4
+pkgver=5
 pkgrel=0
 
 _kbdmodname=beepy-kbd
@@ -10,8 +10,8 @@ _kbdmodver=2.11
 _kbdcommit="e65472734decd59450e2448d1218c4f69babcea8"
 
 _dispmodname=sharp-drm
-_dispmodver=1.5
-_dispcommit="181a5c5b9dd6fecc66cf4d18a94f4a83277b8ca4"
+_dispmodver=1.6
+_dispcommit="b8e7a86e962541b5d741c8fcc18152305279f118"
 
 _overlaycommit="910b9f59c2bbe5e7f33725370ceff0a4c18777af"
 
@@ -36,7 +36,6 @@ source="
 	$pkgname-$_kbdcommit.tar.gz::https://github.com/ardangelo/beepberry-keyboard-driver/archive/$_kbdcommit.tar.gz
 	$pkgname-$_overlaycommit.tar.gz::https://github.com/ardangelo/beepy-symbol-overlay/archive/$_overlaycommit.tar.gz
 	$pkgname-$_dispcommit.tar.gz::https://github.com/ardangelo/sharp-drm-driver/archive/$_dispcommit.tar.gz
-	displaydriver-compile-on-new-kernels.patch
 	keyboard-driver-compiler-warnings.patch
 	symbol-overlay.patch
 "
@@ -148,8 +147,7 @@ sha512sums="
 2b387eeb9afddef25a9bb757ec4481c446e213cd1da88291c5b0af0e631bc0bd224588fe6cecb79620bc58820eefa37d0a234ed1b417af2946af48d8f3254d38  usercfg.txt
 d3060bcbca3e90aa26c8a8d6772d8b07116e0cc4f0ae97d44d896434510493367966f23bb86d82f9719723b3bc7ee6b7a9e4b93b5185822b32ffaf4ee0411813  device-sqfmi-beepy-e65472734decd59450e2448d1218c4f69babcea8.tar.gz
 442703affd913e0bdbbfe5d5eedd49a8b743832702a6fb8e96d49530dd172a7bcdbc36d908b93c61cb455824c85be8ffaa2c67506ae72827e874129f0ba6f912  device-sqfmi-beepy-910b9f59c2bbe5e7f33725370ceff0a4c18777af.tar.gz
-b966c2cae09c3ac12d522700f37b4fa669eb884be9a2d9b4dae78e4baf8e333fa207228f944f00ee7967f8e3d17671b518744fd08187e32d4671bdd05fba8e00  device-sqfmi-beepy-181a5c5b9dd6fecc66cf4d18a94f4a83277b8ca4.tar.gz
-d26333b6eff7219622fc98bdddc288f901911c72a06a7284f9443153de91b9ee51070c5d822ee74923835057497aa6d0c9c9ed533c1e62770beb01aa5eb45ead  displaydriver-compile-on-new-kernels.patch
+ab3b5ee73040c03fa2e5481b893a8ff9be808cd1b27f538ed45df18dada09aa14ead8fbf3fa18863ef9f44d8703fff182a2e5e3107511d728864bba8f31ae292  device-sqfmi-beepy-b8e7a86e962541b5d741c8fcc18152305279f118.tar.gz
 8aa27fbd0ec58bf9a77fa105568e31c58355f4f1a33d9e932950b08fe9dd134beaaf3a7350357a3b471d96c2ceee17460c514f81083832dd97486586772873b5  keyboard-driver-compiler-warnings.patch
 fc3c720c5c8af33f2bfd8a745340547c29effc458df761cacfa9e6bed7e09f5f5ecea98e5a6c25d630cefc2a4b3e31016d42839c640759cd715bcb81d9560f38  symbol-overlay.patch
 "

device/downstream/device-sqfmi-beepy/device-sqfmi-beepy-modules.post-install

@@ -6,7 +6,7 @@ dispdir=/usr/src/sharp-drm
 kbddir=/usr/src/beepy-kbd
 
 # force use of rpi kernel in Makefiles
-KERNELRELEASE=$(find /lib/modules -type d -iname '*-rpi' -mindepth 1 -maxdepth 1 -exec basename {} \;|sort|tail -n1)
+KERNELERLEASE=$(cat /usr/share/kernel/rpi/kernel.release)
 
 dtc -@ -I dts -O dtb -W no-unit_address_vs_reg -o $dispdir/sharp-drm.dtbo $dispdir/sharp-drm.dts
 /usr/bin/make -C $kdir M=$dispdir

device/downstream/device-sqfmi-beepy/displaydriver-compile-on-new-kernels.patch

@@ -1,98 +0,0 @@
-From 0e241e03f2821d26e37dfa39df529a2c4113be1e Mon Sep 17 00:00:00 2001
-From: Kiboneu <->
-Date: Tue, 22 Apr 2025 01:44:29 -0400
-Subject: [PATCH 1/2] Convert to fbdev-ttm (kernel 6.11+) and use
- drm_format_conv_state (kernel 6.8+)
-
----
- sharp-drm-driver/src/drm_iface.c | 23 ++++++++++++++++++++++-
- 1 file changed, 22 insertions(+), 1 deletion(-)
-
-diff --git a/sharp-drm-driver/src/drm_iface.c b/sharp-drm-driver/src/drm_iface.c
-index 8c57910..e62b7e0 100644
---- a/sharp-drm-driver/src/drm_iface.c
-+++ b/sharp-drm-driver/src/drm_iface.c
-@@ -32,7 +32,10 @@
- #include <drm/drm_probe_helper.h>
- #include <drm/drm_simple_kms_helper.h>
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0)
-+// https://github.com/torvalds/linux/commit/aae4682e5d66c1e1dc181fa341652e037237f144
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0)
-+#include <drm/drm_fbdev_ttm.h>
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0)
- #include <drm/drm_fbdev_generic.h>
- #endif
-
-@@ -262,6 +265,11 @@ static int sharp_memory_clip_mono_tagged(struct sharp_memory_panel* panel, size_
- 	struct drm_gem_dma_object *dma_obj;
- 	struct iosys_map dst, vmap;
-
-+	// https://github.com/torvalds/linux/commit/4cd24d4b1a9548f42cdb7f449edc6f869a8ae730
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0)
-+	struct drm_format_conv_state fmtcnv_state = DRM_FORMAT_CONV_STATE_INIT;
-+#endif
-+
- 	// Get GEM memory manager
- 	dma_obj = drm_fb_dma_get_gem_obj(fb, 0);
-
-@@ -274,8 +282,13 @@ static int sharp_memory_clip_mono_tagged(struct sharp_memory_panel* panel, size_
- 	// Initialize destination (buf) and source (video)
- 	iosys_map_set_vaddr(&dst, buf);
- 	iosys_map_set_vaddr(&vmap, dma_obj->vaddr);
-+
- 	// DMA `clip` into `buf` and convert to 8-bit grayscale
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0)
-+	drm_fb_xrgb8888_to_gray8(&dst, NULL, &vmap, fb, clip, &fmtcnv_state);
-+#else
- 	drm_fb_xrgb8888_to_gray8(&dst, NULL, &vmap, fb, clip);
-+#endif
-
- 	// End DMA area
- 	drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE);
-@@ -292,6 +305,9 @@ static int sharp_memory_clip_mono_tagged(struct sharp_memory_panel* panel, size_
- 		(clip->x2 - clip->x1), (clip->y2 - clip->y1), clip->y1);
-
- 	// Success
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0)
-+	drm_format_conv_state_release(&fmtcnv_state);
-+#endif
- 	return 0;
- }
-
-@@ -598,7 +614,12 @@ int drm_probe(struct spi_device *spi)
-
- 	// fbdev setup
- 	spi_set_drvdata(spi, drm);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0)
-+	drm_ttm_setup(drm, 0);
-+#else
- 	drm_fbdev_generic_setup(drm, 0);
-+#endif
-
- 	printk(KERN_INFO "sharp_memory: successful probe\n");
-
-
-From ea98230f3b1ff9da993c85c8aa958d338bdd1847 Mon Sep 17 00:00:00 2001
-From: Kiboneu <->
-Date: Tue, 22 Apr 2025 01:48:12 -0400
-Subject: [PATCH 2/2] Fix typo: s/drm_ttm_setup/drm_fbdev_ttm_setup
-
----
- sharp-drm-driver/src/drm_iface.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sharp-drm-driver/src/drm_iface.c b/sharp-drm-driver/src/drm_iface.c
-index e62b7e0..cecd0f9 100644
---- a/sharp-drm-driver/src/drm_iface.c
-+++ b/sharp-drm-driver/src/drm_iface.c
-@@ -616,7 +616,7 @@ int drm_probe(struct spi_device *spi)
- 	spi_set_drvdata(spi, drm);
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0)
--	drm_ttm_setup(drm, 0);
-+	drm_fbdev_ttm_setup(drm, 0);
- #else
- 	drm_fbdev_generic_setup(drm, 0);
- #endif

device/downstream/linux-lg-elsa/APKBUILD

@@ -0,0 +1,73 @@
+# Reference: <https://postmarketos.org/vendorkernel>
+# Kernel config based on: arch/arm64/configs/lineageos_h990_defconfig
+
+maintainer="Nardo45 <Nardo45@proton.me>"
+pkgname=linux-lg-elsa
+pkgver=3.18.113
+pkgrel=0
+pkgdesc="LG V20 (elsa) kernel fork"
+arch="aarch64"
+_carch="arm64"
+_flavor="lg-elsa"
+url="https://kernel.org"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps pmb:cross-native"
+makedepends="
+	bash
+	bc
+	devicepkg-dev
+	elfutils-dev
+	flex
+	gcc6
+	gmp-dev
+	installkernel
+	linux-headers
+	perl
+	sed
+"
+
+# Source
+_repository="android_kernel_lge_msm8996"
+_commit="c0cf2a6e4ccceb664492ca47b8b1c9f9d4a680c2"
+_config="config-$_flavor.$arch"
+source="
+	$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
+	$_config
+	gcc10-extern_YYLOC_global_declaration.patch
+	asm_immediate_parentheses.patch
+	asm_section_flags.patch
+	vdsomunge_upstream.patch
+	fix_include_paths.patch
+"
+
+builddir="$srcdir/$_repository-$_commit"
+
+prepare() {
+	default_prepare
+	. downstreamkernel_prepare
+}
+
+# Compiler: GCC 6 (doesn't boot when compiled with newer versions)
+build() {
+	unset LDFLAGS
+	# We pass the compiler overrides directly to make here.
+	# This avoids using global variables which upsets apkbuild-lint.
+	make ARCH="$_carch" \
+		CC="gcc6-${CC:-gcc}" \
+		HOSTCC="gcc6-gcc" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+}
+
+package() {
+	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
+}
+
+sha512sums="
+bc15ff2fc2f452fc3e30704c36800e029a1911d5852b113b47f48264fcf43266ad1185cc69a5e8978bb9c091b94ef36f40a607545199546e0a554269de3ae71a  linux-lg-elsa-c0cf2a6e4ccceb664492ca47b8b1c9f9d4a680c2.tar.gz
+e256a4420c482da35aa92a1d0ea3346e96d59ecf2ae07c82d9610b7b711beb5130c8c818b8babbb0de4d1d65daa1bf001b9543d50fc6e3a0a79017babc839122  config-lg-elsa.aarch64
+2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
+ef1f25e7bca6624893432caa93a9795e07e8ba4aa4603a969c02ce92001d92566a1f9c87def610849522578decc7b12cf9a03d80d34d3b2e4c743ced185f1e7f  asm_immediate_parentheses.patch
+b2a06d84b2caf44944cadd355c0a425d017b7edd91fe3f7003a74fe177da0d86dd3c0b30b6879b92b0b405d378c1dd31d43f2c619f36873aa1430a00d458b3ea  asm_section_flags.patch
+6d31f4c70b2a96dcddfb0ef4aa87312eda79efdecf08306e027812f87774ede054f229b9769473ced4f05f3a25fbc3e785a7b8a1d65ba13a89b39d8d19085ff3  vdsomunge_upstream.patch
+dfecd8ba5d57b55c8988fe7c33a2f14670a3d64485ed73847cae2cab7ce95e18173dd7f01a2981bae738ad6a613ecee300412771b211b53667f906848893f130  fix_include_paths.patch
+"

device/downstream/linux-lg-elsa/asm_immediate_parentheses.patch

@@ -0,0 +1,16 @@
+diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
+index b6245c71bd07..67eb17a743ad 100644
+--- a/arch/arm64/mm/proc.S
++++ b/arch/arm64/mm/proc.S
+@@ -152,9 +152,9 @@ ENTRY(__cpu_setup)
+ 	tlbi	vmalle1				// Invalidate local TLB
+ 	dsb	nsh
+ 
+-	mov	x0, #3 << 20
++	mov	x0, #(3 << 20)
+ 	msr	cpacr_el1, x0			// Enable FP/ASIMD
+-	mov	x0, #1 << 12			// Reset mdscr_el1 and disable
++	mov	x0, #(1 << 12)			// Reset mdscr_el1 and disable
+ 	msr	mdscr_el1, x0			// access to the DCC from EL0
+ 	isb					// Unmask debug exceptions now,
+ 	enable_dbg				// since this is per-cpu

device/downstream/linux-lg-elsa/asm_section_flags.patch

@@ -0,0 +1,13 @@
+diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
+index b6245c71bd07..28b7050241d1 100644
+--- a/arch/arm64/mm/proc.S
++++ b/arch/arm64/mm/proc.S
+@@ -140,7 +140,7 @@ ENTRY(cpu_do_switch_mm)
+ 	b	post_ttbr_update_workaround	// Back to C code...
+ ENDPROC(cpu_do_switch_mm)
+ 
+-	.section ".text.init", #alloc, #execinstr
++	.section .text.init, "ax"
+ 
+ /*
+  *	__cpu_setup

device/downstream/linux-lg-elsa/fix_include_paths.patch

@@ -0,0 +1,169 @@
+diff --git a/drivers/gpu/msm/adreno_trace.h b/drivers/gpu/msm/adreno_trace.h
+index 74c4c4e6e1fa..313f2bb0b117 100644
+--- a/drivers/gpu/msm/adreno_trace.h
++++ b/drivers/gpu/msm/adreno_trace.h
+@@ -17,7 +17,7 @@
+ #undef TRACE_SYSTEM
+ #define TRACE_SYSTEM kgsl
+ #undef TRACE_INCLUDE_PATH
+-#define TRACE_INCLUDE_PATH .
++#define TRACE_INCLUDE_PATH ../../drivers/gpu/msm/
+ #undef TRACE_INCLUDE_FILE
+ #define TRACE_INCLUDE_FILE adreno_trace
+
+diff --git a/drivers/gpu/msm/kgsl_trace.h b/drivers/gpu/msm/kgsl_trace.h
+index 6438c6e65b97..088534fe7e4c 100644
+--- a/drivers/gpu/msm/kgsl_trace.h
++++ b/drivers/gpu/msm/kgsl_trace.h
+@@ -17,7 +17,7 @@
+ #undef TRACE_SYSTEM
+ #define TRACE_SYSTEM kgsl
+ #undef TRACE_INCLUDE_PATH
+-#define TRACE_INCLUDE_PATH .
++#define TRACE_INCLUDE_PATH ../../drivers/gpu/msm/
+ #undef TRACE_INCLUDE_FILE
+ #define TRACE_INCLUDE_FILE kgsl_trace
+
+diff --git a/drivers/net/ethernet/msm/rndis_ipa_trace.h b/drivers/net/ethernet/msm/rndis_ipa_trace.h
+index c0fc573799f2..1e8dd9a7f282 100644
+--- a/drivers/net/ethernet/msm/rndis_ipa_trace.h
++++ b/drivers/net/ethernet/msm/rndis_ipa_trace.h
+@@ -77,5 +77,5 @@ TRACE_EVENT(
+
+ /* This part must be outside protection */
+ #undef TRACE_INCLUDE_PATH
+-#define TRACE_INCLUDE_PATH .
++#define TRACE_INCLUDE_PATH ../../drivers/net/ethernet/msm/
+ #include <trace/define_trace.h>
+diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
+index a03a49a33f97..218d3e965943 100644
+--- a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
++++ b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
+@@ -148,5 +148,5 @@ TRACE_EVENT(
+
+ /* This part must be outside protection */
+ #undef TRACE_INCLUDE_PATH
+-#define TRACE_INCLUDE_PATH .
++#define TRACE_INCLUDE_PATH ../../drivers/platform/msm/ipa/ipa_v2/
+ #include <trace/define_trace.h>
+diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_trace.h b/drivers/platform/msm/ipa/ipa_v3/ipa_trace.h
+index b67899ba894e..9e341ab1d203 100644
+--- a/drivers/platform/msm/ipa/ipa_v3/ipa_trace.h
++++ b/drivers/platform/msm/ipa/ipa_v3/ipa_trace.h
+@@ -149,5 +149,5 @@ TRACE_EVENT(
+
+ /* This part must be outside protection */
+ #undef TRACE_INCLUDE_PATH
+-#define TRACE_INCLUDE_PATH .
++#define TRACE_INCLUDE_PATH ../../drivers/platform/msm/ipa/ipa_v3/
+ #include <trace/define_trace.h>
+diff --git a/drivers/soc/qcom/tracer_pkt_private.h b/drivers/soc/qcom/tracer_pkt_private.h
+index fc760e6b68d1..5573aec2fe83 100644
+--- a/drivers/soc/qcom/tracer_pkt_private.h
++++ b/drivers/soc/qcom/tracer_pkt_private.h
+@@ -15,7 +15,7 @@
+ #undef TRACE_SYSTEM
+ #define TRACE_SYSTEM tracer_pkt
+ #undef TRACE_INCLUDE_PATH
+-#define TRACE_INCLUDE_PATH .
++#define TRACE_INCLUDE_PATH ../../drivers/soc/qcom/
+ #undef TRACE_INCLUDE_FILE
+ #define TRACE_INCLUDE_FILE tracer_pkt_private
+
+diff --git a/drivers/nfc/pn548/pn548.c b/drivers/nfc/pn548/pn548.c
+index dca56a309437..b5f1462e34c2 100644
+--- a/drivers/nfc/pn548/pn548.c
++++ b/drivers/nfc/pn548/pn548.c
+@@ -40,7 +40,7 @@
+ #include <linux/wakelock.h>
+ #include <linux/kthread.h>
+
+-#include <pn548.h>
++#include "pn548.h"
+
+ #define MAX_BUFFER_SIZE 512
+ #define _A1_PN66T_
+
+diff --git a/include/trace/events/msm_cam.h b/include/trace/events/msm_cam.h
+index 9a5dd158b4b8..4c1b4659e91e 100644
+--- a/include/trace/events/msm_cam.h
++++ b/include/trace/events/msm_cam.h
+@@ -16,7 +16,7 @@
+ #if !defined(_TRACE_MSM_VFE_H) || defined(TRACE_HEADER_MULTI_READ)
+ #define _TRACE_MSM_VFE_H
+
+-#include "msm_isp.h"
++#include "../../uapi/media/msm_isp.h"
+ #include <linux/types.h>
+ #include <linux/tracepoint.h>
+
+diff --git a/sound/soc/msm/apq8096-auto.c b/sound/soc/msm/apq8096-auto.c
+index 2ae78f75c340..62dd641aa79f 100644
+--- a/sound/soc/msm/apq8096-auto.c
++++ b/sound/soc/msm/apq8096-auto.c
+@@ -33,7 +33,7 @@
+ #include <sound/q6core.h>
+ #include <sound/pcm_params.h>
+ #include <sound/info.h>
+-#include <device_event.h>
++#include "device_event.h"
+ #include "qdsp6v2/msm-pcm-routing-v2.h"
+
+ #define DRV_NAME "apq8096-auto-asoc-snd"
+diff --git a/sound/soc/msm/apq8096-i2c.c b/sound/soc/msm/apq8096-i2c.c
+index 8bcda764af09..8d50c6d79605 100644
+--- a/sound/soc/msm/apq8096-i2c.c
++++ b/sound/soc/msm/apq8096-i2c.c
+@@ -31,7 +31,7 @@
+ #include <sound/q6core.h>
+ #include <sound/pcm_params.h>
+ #include <sound/info.h>
+-#include <device_event.h>
++#include "device_event.h"
+ #include "qdsp6v2/msm-pcm-routing-v2.h"
+ #include "../codecs/wcd9xxx-common.h"
+ #include "../codecs/wcd9330.h"
+diff --git a/sound/soc/msm/mdm9650.c b/sound/soc/msm/mdm9650.c
+index ee469f10b78a..9c4c90e84134 100644
+--- a/sound/soc/msm/mdm9650.c
++++ b/sound/soc/msm/mdm9650.c
+@@ -26,7 +26,7 @@
+ #include <sound/q6afe-v2.h>
+ #include <sound/info.h>
+ #include <sound/pcm_params.h>
+-#include <device_event.h>
++#include "device_event.h"
+ #include <soc/qcom/socinfo.h>
+ #include <qdsp6v2/msm-pcm-routing-v2.h>
+ #include <sound/q6core.h>
+diff --git a/sound/soc/msm/msm8996.c b/sound/soc/msm/msm8996.c
+index 1e051b12065a..c135f7b6b86c 100644
+--- a/sound/soc/msm/msm8996.c
++++ b/sound/soc/msm/msm8996.c
+@@ -31,7 +31,7 @@
+ #include <sound/q6core.h>
+ #include <sound/pcm_params.h>
+ #include <sound/info.h>
+-#include <device_event.h>
++#include "device_event.h"
+ #include "qdsp6v2/msm-pcm-routing-v2.h"
+ #include "../codecs/wcd9xxx-common.h"
+ #include "../codecs/wcd9330.h"
+
+diff --git a/drivers/platform/msm/mhi/mhi_ssr.c b/drivers/platform/msm/mhi/mhi_ssr.c
+index f4f2e427972f..1c3f305c2144 100644
+--- a/drivers/platform/msm/mhi/mhi_ssr.c
++++ b/drivers/platform/msm/mhi/mhi_ssr.c
+@@ -11,8 +11,8 @@
+  */
+
+ #include <linux/pm_runtime.h>
+-#include <mhi_sys.h>
+-#include <mhi.h>
++#include "mhi_sys.h"
++#include "mhi.h"
+ #include <soc/qcom/subsystem_restart.h>
+ #include <soc/qcom/subsystem_notif.h>
+ #include <linux/esoc_client.h>
+-- 
+2.24.1

device/downstream/linux-lg-elsa/gcc10-extern_YYLOC_global_declaration.patch

@@ -0,0 +1 @@
+../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch

device/downstream/linux-lg-elsa/vdsomunge_upstream.patch

@@ -0,0 +1,178 @@
+Fixes compilation under gcc8 without glibc
+---
+diff --git a/arch/arm/vdso/vdsomunge.c b/arch/arm/vdso/vdsomunge.c
+index 9005b07296c8..f6455273b2f8 100644
+--- a/arch/arm/vdso/vdsomunge.c
++++ b/arch/arm/vdso/vdsomunge.c
+@@ -45,13 +45,10 @@
+  * it does.
+  */
+ 
+-#define _GNU_SOURCE
+-
+-#include <byteswap.h>
+ #include <elf.h>
+ #include <errno.h>
+-#include <error.h>
+ #include <fcntl.h>
++#include <stdarg.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -61,6 +58,16 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#define swab16(x) \
++	((((x) & 0x00ff) << 8) | \
++	 (((x) & 0xff00) >> 8))
++
++#define swab32(x) \
++	((((x) & 0x000000ff) << 24) | \
++	 (((x) & 0x0000ff00) <<  8) | \
++	 (((x) & 0x00ff0000) >>  8) | \
++	 (((x) & 0xff000000) >> 24))
++
+ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ #define HOST_ORDER ELFDATA2LSB
+ #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+@@ -82,27 +89,41 @@
+ #define EF_ARM_ABI_FLOAT_HARD 0x400
+ #endif
+ 
++static int failed;
++static const char *argv0;
+ static const char *outfile;
+ 
++static void fail(const char *fmt, ...)
++{
++	va_list ap;
++
++	failed = 1;
++	fprintf(stderr, "%s: ", argv0);
++	va_start(ap, fmt);
++	vfprintf(stderr, fmt, ap);
++	va_end(ap);
++	exit(EXIT_FAILURE);
++}
++
+ static void cleanup(void)
+ {
+-	if (error_message_count > 0 && outfile != NULL)
++	if (failed && outfile != NULL)
+ 		unlink(outfile);
+ }
+ 
+ static Elf32_Word read_elf_word(Elf32_Word word, bool swap)
+ {
+-	return swap ? bswap_32(word) : word;
++	return swap ? swab32(word) : word;
+ }
+ 
+ static Elf32_Half read_elf_half(Elf32_Half half, bool swap)
+ {
+-	return swap ? bswap_16(half) : half;
++	return swap ? swab16(half) : half;
+ }
+ 
+ static void write_elf_word(Elf32_Word val, Elf32_Word *dst, bool swap)
+ {
+-	*dst = swap ? bswap_32(val) : val;
++	*dst = swap ? swab32(val) : val;
+ }
+ 
+ int main(int argc, char **argv)
+@@ -119,68 +140,66 @@ int main(int argc, char **argv)
+ 	int infd;
+ 
+ 	atexit(cleanup);
++	argv0 = argv[0];
+ 
+ 	if (argc != 3)
+-		error(EXIT_FAILURE, 0, "Usage: %s [infile] [outfile]", argv[0]);
++		fail("Usage: %s [infile] [outfile]\n", argv[0]);
+ 
+ 	infile = argv[1];
+ 	outfile = argv[2];
+ 
+ 	infd = open(infile, O_RDONLY);
+ 	if (infd < 0)
+-		error(EXIT_FAILURE, errno, "Cannot open %s", infile);
++		fail("Cannot open %s: %s\n", infile, strerror(errno));
+ 
+ 	if (fstat(infd, &stat) != 0)
+-		error(EXIT_FAILURE, errno, "Failed stat for %s", infile);
++		fail("Failed stat for %s: %s\n", infile, strerror(errno));
+ 
+ 	inbuf = mmap(NULL, stat.st_size, PROT_READ, MAP_PRIVATE, infd, 0);
+ 	if (inbuf == MAP_FAILED)
+-		error(EXIT_FAILURE, errno, "Failed to map %s", infile);
++		fail("Failed to map %s: %s\n", infile, strerror(errno));
+ 
+ 	close(infd);
+ 
+ 	inhdr = inbuf;
+ 
+ 	if (memcmp(&inhdr->e_ident, ELFMAG, SELFMAG) != 0)
+-		error(EXIT_FAILURE, 0, "Not an ELF file");
++		fail("Not an ELF file\n");
+ 
+ 	if (inhdr->e_ident[EI_CLASS] != ELFCLASS32)
+-		error(EXIT_FAILURE, 0, "Unsupported ELF class");
++		fail("Unsupported ELF class\n");
+ 
+ 	swap = inhdr->e_ident[EI_DATA] != HOST_ORDER;
+ 
+ 	if (read_elf_half(inhdr->e_type, swap) != ET_DYN)
+-		error(EXIT_FAILURE, 0, "Not a shared object");
++		fail("Not a shared object\n");
+ 
+-	if (read_elf_half(inhdr->e_machine, swap) != EM_ARM) {
+-		error(EXIT_FAILURE, 0, "Unsupported architecture %#x",
+-		      inhdr->e_machine);
+-	}
++	if (read_elf_half(inhdr->e_machine, swap) != EM_ARM)
++		fail("Unsupported architecture %#x\n", inhdr->e_machine);
+ 
+ 	e_flags = read_elf_word(inhdr->e_flags, swap);
+ 
+ 	if (EF_ARM_EABI_VERSION(e_flags) != EF_ARM_EABI_VER5) {
+-		error(EXIT_FAILURE, 0, "Unsupported EABI version %#x",
+-		      EF_ARM_EABI_VERSION(e_flags));
++		fail("Unsupported EABI version %#x\n",
++		     EF_ARM_EABI_VERSION(e_flags));
+ 	}
+ 
+ 	if (e_flags & EF_ARM_ABI_FLOAT_HARD)
+-		error(EXIT_FAILURE, 0,
+-		      "Unexpected hard-float flag set in e_flags");
++		fail("Unexpected hard-float flag set in e_flags\n");
+ 
+ 	clear_soft_float = !!(e_flags & EF_ARM_ABI_FLOAT_SOFT);
+ 
+ 	outfd = open(outfile, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+ 	if (outfd < 0)
+-		error(EXIT_FAILURE, errno, "Cannot open %s", outfile);
++		fail("Cannot open %s: %s\n", outfile, strerror(errno));
+ 
+ 	if (ftruncate(outfd, stat.st_size) != 0)
+-		error(EXIT_FAILURE, errno, "Cannot truncate %s", outfile);
++		fail("Cannot truncate %s: %s\n", outfile, strerror(errno));
+ 
+ 	outbuf = mmap(NULL, stat.st_size, PROT_READ | PROT_WRITE, MAP_SHARED,
+ 		      outfd, 0);
+ 	if (outbuf == MAP_FAILED)
+-		error(EXIT_FAILURE, errno, "Failed to map %s", outfile);
++		fail("Failed to map %s: %s\n", outfile, strerror(errno));
+ 
+ 	close(outfd);
+ 
+@@ -195,7 +214,7 @@ int main(int argc, char **argv)
+ 	}
+ 
+ 	if (msync(outbuf, stat.st_size, MS_SYNC) != 0)
+-		error(EXIT_FAILURE, errno, "Failed to sync %s", outfile);
++		fail("Failed to sync %s: %s\n", outfile, strerror(errno));
+ 
+ 	return EXIT_SUCCESS;
+ }

device/testing/alsa-ucm-conf-ayaneo-pocket-s2/APKBUILD

@@ -1,17 +1,16 @@
 maintainer="Neil Armstrong <neil.armstrong@linaro.org>"
 pkgname=alsa-ucm-conf-ayaneo-pocket-s2
-pkgver=1.2.6_git20260121
+pkgver=1.2.16_git20260612
 pkgrel=0
 pkgdesc="ALSA UCM configuration for Ayaneo Pocket S2"
-url="https://github.com/sunflower2333/alsa-ucm-conf"
+url="https://github.com/superna9999/alsa-ucm-conf"
 arch="aarch64"
 license="BSD-3-Clause"
 provides="alsa-ucm-conf"
 provider_priority=1
-_commit="2dbd6af885107dd4693e621772157a9e99f4c04a"
+_commit="5e1cfc6810013182570d6ac8386a58d2fde83b0c"
 source="
-	$pkgname-$_commit.tar.gz::https://github.com/sunflower2333/alsa-ucm-conf/archive/$_commit.tar.gz
-	ucm2-qcom-sm8650-aps-remove-capture.patch
+	$pkgname-$_commit.tar.gz::https://github.com/superna9999/alsa-ucm-conf/archive/$_commit.tar.gz
 "
 builddir="$srcdir/alsa-ucm-conf-$_commit"
 options="!check"
@@ -23,6 +22,5 @@ package() {
 }
 
 sha512sums="
-cf45ed130d1148761b2b7646cb4e073e724598ec33d3ee75b47598aaa17800ad3f7cf38dc5ff76a825e64efdddd9a3b7631f571a0eb326e6c650d9d6220571d0  alsa-ucm-conf-ayaneo-pocket-s2-2dbd6af885107dd4693e621772157a9e99f4c04a.tar.gz
-d240ac698f3f8b46e2ca5b624a9527ae600f3844db20d973a463eb6b1f42a3961398097591aa6327c26fd391a151d9ca0b58ebfd571730d24d0022a876d695a2  ucm2-qcom-sm8650-aps-remove-capture.patch
+b36484420c25f851d87e1f43ed8ee43736c9881c8c66a0570dbf7ed35979b7f579d32be63adfb345a598851d51858b016cff0e969e2466624bbee2627e0077ca  alsa-ucm-conf-ayaneo-pocket-s2-5e1cfc6810013182570d6ac8386a58d2fde83b0c.tar.gz
 "

device/testing/alsa-ucm-conf-ayaneo-pocket-s2/ucm2-qcom-sm8650-aps-remove-capture.patch

@@ -1,47 +0,0 @@
-diff --git a/ucm2/Qualcomm/sm8650/APS2/HiFi.conf b/ucm2/Qualcomm/sm8650/APS2/HiFi.conf
-index 5927698..aa932f8 100644
---- a/ucm2/Qualcomm/sm8650/APS2/HiFi.conf
-+++ b/ucm2/Qualcomm/sm8650/APS2/HiFi.conf
-@@ -54,42 +54,6 @@ SectionDevice."Headphones" {
- 	}
- }
- 
--SectionDevice."Headset" {
--	Comment "Headset microphone"
--
--	ConflictingDevice [
--		"Mic"
--	]
--
--	Include.wcdmice.File "/codecs/wcd939x/HeadphoneMicEnableSeq.conf"
--	Include.wcdmicd.File "/codecs/wcd939x/HeadphoneMicDisableSeq.conf"
--	Include.txmhpe.File "/codecs/qcom-lpass/tx-macro/SoundwireMic1EnableSeq.conf"
--	Include.txmhpd.File "/codecs/qcom-lpass/tx-macro/SoundwireMicDisableSeq.conf"
--
--	Value {
--		CaptureChannels 1
--		CapturePriority 200
--		CapturePCM "hw:${CardId},2"
--		CaptureMixerElem "ADC2"
--		JackControl "Headset Jack"
--	}
--}
--
--SectionDevice."Mic" {
--	Comment "Bottom Microphone"
--
--	Include.txmhpe.File "/codecs/qcom-lpass/tx-macro/SoundwireMic8EnableSeq.conf"
--	Include.txmhpd.File "/codecs/qcom-lpass/tx-macro/SoundwireMicDisableSeq.conf"
--
--	Value {
--		CaptureChannels 1
--		CapturePriority 100
--		CapturePCM "hw:${CardId},3"
--		CaptureMixerElem "SMIC8"
--	}
--}
--
--
- SectionDevice."HDMI0" {
- 		Comment "DisplayPort 0 playback"
- 

device/testing/device-amlogic-aarch64-tvbox/APKBUILD

@@ -2,7 +2,7 @@
 maintainer="Ferass El Hafidi <funderscore@postmarketos.org>"
 pkgname=device-amlogic-aarch64-tvbox
 pkgdesc="Amlogic AArch64 TV box"
-pkgver=13
+pkgver=15
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,6 +26,7 @@ subpackages="
 	$pkgname-kernel-p212:kernel_p212
 	$pkgname-kernel-p241:kernel_p241
 	$pkgname-kernel-p281:kernel_p281
+	$pkgname-kernel-sei510:kernel_sei510
 	$pkgname-kernel-ugoos-am3:kernel_ugoos_am3
 	$pkgname-kernel-videostrong-kii-pro:kernel_videostrong_kii_pro
 	$pkgname-kernel-xiaomi-aquaman:kernel_xiaomi_aquaman
@@ -55,33 +56,40 @@ aml_boot_prep() {
 }
 
 kernel_p201() {
-	pkgdesc="Kernel for Amlogic P201-based TV box (S905)"
+	pkgdesc="Kernel for Amlogic P201-based TV box (S905) [ONLY FOR TESTING]"
 	depends="linux-postmarketos-amlogic u-boot-amlogic-s905-tv"
 	aml_boot_prep "meson-gxbb-p201.dtb" "$subpkgdir"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
 kernel_p212() {
-	pkgdesc="Kernel for Amlogic P212-based TV box (S905X)"
+	pkgdesc="Kernel for Amlogic P212-based TV box (S905X) [ONLY FOR TESTING]"
 	depends="linux-postmarketos-amlogic u-boot-amlogic-s905x-tv"
 	aml_boot_prep "meson-gxl-s905x-p212.dtb" "$subpkgdir"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
 kernel_p241() {
-	pkgdesc="Kernel for Amlogic P241-based TV box (S805X/S805Y)"
+	pkgdesc="Kernel for Amlogic P241-based TV box (S805X/S805Y) [ONLY FOR TESTING]"
 	depends="linux-postmarketos-amlogic u-boot-amlogic-s905x-tv"
 	aml_boot_prep "meson-gxl-s805x-p241.dtb" "$subpkgdir"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
 kernel_p281() {
-	pkgdesc="Kernel for Amlogic P281-based TV box (S905W)"
+	pkgdesc="Kernel for Amlogic P281-based TV box (S905W) [ONLY FOR TESTING]"
 	depends="linux-postmarketos-amlogic u-boot-amlogic-s905x-tv"
 	aml_boot_prep "meson-gxl-s905w-p281.dtb" "$subpkgdir"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
+kernel_sei510() {
+	pkgdesc="Kernel for SEI Robotics SEI510-based TV box (S905X2) [ONLY FOR TESTING]"
+	depends="linux-postmarketos-amlogic u-boot-amlogic-s905x2-tv"
+	aml_boot_prep "meson-g12a-sei510.dtb" "$subpkgdir"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 kernel_ugoos_am3() {
 	pkgdesc="Kernel for Ugoos AM3 (S912)"
 	depends="linux-postmarketos-amlogic"
@@ -113,7 +121,7 @@ kernel_zte_b860h() {
 
 sha512sums="
 17e803e341c362f54df2116125549ededc41deb89cd6f57974133e18053b30af35fc2b60cdb732b10efadf95234f154bdd7b32410c139f0166adfe9b4ffe02dd  boot-image.its
-a280bef31d82f8bf5908a3316c39a1a401d5c6170afecb680dc166ef64425d576dbc7f8a35174983fda466d28643647df2e07a79cb536af8422433914d12f050  deviceinfo
+8608f681b41ae4b4242acf4c4b231ed7c9045b15f1bbea5c81fef8284d27f2b408c3c533b70ca1cf49da9595745b1b750a68afa2cf4d437a94b29ace4442b32f  deviceinfo
 9b9c3d26f5dea76d58b7966d1a9ed7e19941d67d8b2fc4d8577aa11900b26a0f9230e158f3f3a99250624bd269da86c1ed1a1095530af0155eae008fd6c9646d  kernel-cmdline.conf
 52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs
 "

device/testing/device-amlogic-aarch64-tvbox/deviceinfo

@@ -11,6 +11,7 @@ deviceinfo_dtb_p201="amlogic/meson-gxbb-p201"
 deviceinfo_dtb_p212="amlogic/meson-gxl-s905x-p212"
 deviceinfo_dtb_p241="amlogic/meson-gxl-s805x-p241"
 deviceinfo_dtb_p281="amlogic/meson-gxl-s905w-p281"
+deviceinfo_dtb_sei510="amlogic/meson-g12a-sei510"
 deviceinfo_dtb_videostrong_kii_pro="amlogic/meson-gxbb-kii-pro"
 deviceinfo_dtb_ugoos_am3="amlogic/meson-gxm-ugoos-am3"
 deviceinfo_dtb_xiaomi_aquaman="amlogic/meson-gxl-s805y-xiaomi-aquaman"

device/testing/device-apple-idevice/APKBUILD

@@ -3,13 +3,14 @@
 maintainer="Aster Boese <asterboese@mailbox.org>"
 pkgname=device-apple-idevice
 pkgdesc="Apple Generic Apple iDevice"
-pkgver=7
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-apple-idevice
 	m1n1-apple-idevice
 	postmarketos-base
 	"
@@ -17,11 +18,11 @@ makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-4k:kernel_4k
 	$pkgname-kernel-16k:kernel_16k
-"
+	"
 source="
 	deviceinfo
 	modules-initfs
-"
+	"
 
 build() {
 	devicepkg_build $startdir $pkgname

device/testing/device-apple-tonga/APKBUILD

@@ -1,33 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-maintainer="EDKPiepaint <2163971449v@gmail.com>"
-pkgname=device-apple-tonga
-pkgdesc="Apple Macbook Air M1"
-pkgver=6
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	linux-asahi
-	postmarketos-base
-	systemd-boot
-	asahi-audio
-	asahi-fwextract
-	asahi-scripts
-	alsa-ucm-conf-asahi
-"
-makedepends="devicepkg-dev systemd-boot"
-source="deviceinfo kernel-cmdline.conf"
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-sha512sums="
-01413f95bfa4f92406ce948ea6cb14b11e3f304b0fe32fbe252d673e43f62c66f115188dc11ed45df9d8f450c30137bb95b2babd4c23a97a9759d7dcc529c67c  deviceinfo
-0d7bfa506942e551b0bbbefd465ab8f19b241db93de393efbd788ade6113da37e96e4141633356207a2d9645d668b2aa7cdaa9e78d27723208f4205c8af4bbba  kernel-cmdline.conf
-"

device/testing/device-apple-tonga/deviceinfo

@@ -1,16 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Apple Macbook Air M1"
-deviceinfo_manufacturer="Apple"
-deviceinfo_codename="apple-tonga"
-deviceinfo_year="2020"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_chassis="laptop"
-deviceinfo_drm="true"
-# Bootloader related
-deviceinfo_boot_filesystem="fat32"

device/testing/device-apple-tonga/kernel-cmdline.conf

@@ -1,2 +0,0 @@
-loglevel=7
-pmos.nosplash

device/testing/device-asus-s5507q/APKBUILD

@@ -2,14 +2,13 @@
 maintainer="binarycraft007 <keep.it.sns@gmail.com>"
 pkgname=device-asus-s5507q
 pkgdesc="ASUS Vivobook S 15"
-pkgver=6
-pkgrel=2
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	linux-postmarketos-qcom-laptop
 	postmarketos-base
 	systemd-boot
 	firmware-asus-s5507q-dpu
@@ -26,6 +25,12 @@ _pmb_recommends="
 	firmware-asus-s5507q-common
 "
 
+subpackages="
+	$pkgname-kernel-stable:kernel_stable
+	$pkgname-kernel-lts:kernel_lts
+	$pkgname-kernel-mainline:kernel_mainline
+"
+
 build() {
 	devicepkg_build $startdir $pkgname
 }
@@ -34,6 +39,25 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+kernel_stable() {
+	pkgdesc="Stable kernel (recommended, best balance between stability and features)"
+	depends="linux-postmarketos-stable"
+	replaces="linux-postmarketos-qcom-laptop"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_lts() {
+	pkgdesc="Long-term maintenance kernel (most stability, not all security fixes & new features)"
+	depends="linux-postmarketos-lts"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Upstream development kernel (regular breakage, latest features)"
+	depends="linux-postmarketos-mainline"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 sha512sums="
 a1cab3c635b322dfa9b561a07770dd1c879d5ae2864a572e2e19e4cbed72b712a370d5e18a4f9675aaf473e49246e6faee697c514c01567828c4b8cb7fc606eb  deviceinfo
 04cc87ed6b0041ede7edb2693ee4dd58d6ac8f1b036a0b37e1a86cce57b66e35d9f400a3ea75d75278b028132535033915f3a2fff919866e85336c5f92a68ffe  kernel-cmdline.conf

device/testing/device-ayaneo-pocket-s2/APKBUILD

@@ -2,7 +2,7 @@
 maintainer="Neil Armstrong <neil.armstrong@linaro.org>"
 pkgname=device-ayaneo-pocket-s2
 pkgdesc="Ayaneo Pocket S2"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -47,6 +47,6 @@ package() {
 sha512sums="
 012b1b6a9fcdfb6043b6f6992606a59fb347a5dde47c61f47479dccba24e13a88b0e03a64d79786d1152786c593874988deaa487fa7ec1634c4a7a4bcac20c34  deviceinfo
 6c6a1393fd91dbb565e5b09aacf5f18a0911de19074f25548174a2d1a6db6f52f27ea556bfb5f4731085c345c42047fddbacc2a77ffe288728ff96d4c7a2cbed  kernel-cmdline.conf
-5c219e5532705402a2cff81ae792ee5d74751bccfe0038d5ea2d6701cc07df860808f7879ba93a80241bfbcb2a2527587b1c1d770602dd682c15f7d5800d03a3  firmware.files
-d81fa838f41002c05d7db40104f3c9959be48009a08e479cbe57eca9a3dc7ab3328bfa2257a2c59cee1208b79f3d3b98d6caf9b0c7312d4a1746ad1f5660f168  modules-initfs
+55abca53ab338921f578bb52dde30fb0c3518f0cb772aac8a23eab4900ee05f0f4209aecd9b3d79c79ab4d45270d068c0d2e01881c57bd6cf0c98930956be7f2  firmware.files
+1aa76a0ef8ee0d3a0f0fe819e02fbbba9bc7a990191eaad630700aacc5c44e27d123c016c5b978e5ece08de69f1fea268b5612716feb0b95712f7f8dd015d8be  modules-initfs
 "

device/testing/device-ayaneo-pocket-s2/firmware.files

@@ -23,7 +23,9 @@
 /lib/firmware/qcom/sm8650/ayaneo/ps2/cdsp.mbn.zst
 /lib/firmware/qcom/sm8650/ayaneo/ps2/cdsp_dtb.mbn.zst
 /lib/firmware/qcom/sm8650/ayaneo/ps2/cdspr.jsn.zst
-/lib/firmware/qcom/sm8650/SM8650-APS2-tplg.bin.zst
+
+# Audioreach Topology
+/lib/firmware/qcom/ayaneo-ps2/SM8650-APS2-tplg.bin.zst
 
 # Wi-Fi
 /lib/firmware/ath12k/WCN7850/hw2.0/amss.bin.zst

device/testing/device-ayaneo-pocket-s2/modules-initfs

@@ -37,7 +37,7 @@ nb7vpq904m
 nvmem_qcom-spmi-sdam
 nvmem-reboot-mode
 ocmem
-panel-wt0600-2k
+panel-renesas-r63419
 pdr_interface
 phy-qcom-eusb2-repeater
 phy-qcom-qmp-combo

device/testing/device-epson-embt2ws/APKBUILD

@@ -2,7 +2,7 @@
 maintainer="Andreas Kemnade <andreas@kemnade.info>"
 pkgname=device-epson-embt2ws
 pkgdesc="Epson Moverio BT-200"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,6 +25,11 @@ source="
 	kernel-cmdline.conf
 	modules-initfs
 	sdboot.cmd
+	x11-clone.conf
+"
+
+subpackages="
+	$pkgname-x11
 "
 
 build() {
@@ -38,9 +43,16 @@ package() {
 	install -Dm644 "$srcdir/sdboot.scr" "$pkgdir/boot/sdboot.scr"
 }
 
+x11() {
+	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+	install -D -m644 "$srcdir"/x11-clone.conf \
+		"$subpkgdir"/usr/share/X11/xorg.conf.d/x11-clone.conf
+}
+
 sha512sums="
 2afeb8e1a52d68265f1dee541983f47b0ec5a07c4a9a3f545464142a1346653760a1b6c13db1fa8011252bf392c8978e2db0169d946fc5e757166094a9878983  deviceinfo
-156346ca9c8cd36fa4e8ce44ae20efbb58eb9c8bc9a24164c2e1472026967247cdf306b82cd9d442c8f58becd85c482ab6624d7dd6814193ce9be48a6693cb8a  kernel-cmdline.conf
+5bc0bb6df7eb59ef88939e2ad6e7111f86d0ef0466989bf6c6baa9fdde416dc6ea41b59932d55e8b6a802311bd748849e40824945eeb57c269ee2156c34ab48e  kernel-cmdline.conf
 e6d26536578432bd1d9123d3b3eb621e39d5475e5ce9086c42fae213be6fa05d56bd6b42d08f6f5afccffe5b01ca940239c11b8046e0be1a5962ac95a0b0dfa4  modules-initfs
 2c3a39107dd6c061d001d11211b816fc0e1fb060e0bcbf0fcf057d7910a7dcc4d1d06c6b0572ee0d616f1d06679ca48872395f62c1f44f5460cceefbbd2b5050  sdboot.cmd
+a189bc388a7a3b176444acb2e14c3894686e7d49b29dc6f0737673130202778ed7426ae27daef568a387b6e68619a2bb07de9e895c19d782324a7f896fdadf7e  x11-clone.conf
 "

device/testing/device-epson-embt2ws/kernel-cmdline.conf

@@ -1 +1,2 @@
 console=ttyS2,115200
+pmos.force-partition-resize

device/testing/device-epson-embt2ws/x11-clone.conf

@@ -0,0 +1,5 @@
+Section "Device"
+	Identifier "head"
+	Driver "modesetting"
+	Option "PreferCloneMode" "true"
+EndSection

device/testing/device-pine64-pinetab/APKBUILD

@@ -2,8 +2,8 @@
 maintainer=""
 pkgname=device-pine64-pinetab
 pkgdesc="PINE64 PineTab"
-pkgver=4
-pkgrel=1
+pkgver=5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -155,11 +155,10 @@ plasma_mobile() {
 
 upower() {
 	install_if="$pkgname=$pkgver-r$pkgrel upower"
-	replaces="upower"
 
 	# Shutdown when PMIC reports critical battery level
 	install -Dm644 "$srcdir"/UPower.conf \
-		"$subpkgdir"/etc/UPower/UPower.conf
+		"$subpkgdir"/etc/UPower/UPower.conf.d/50-pinetab.conf
 }
 
 sha512sums="
@@ -174,5 +173,5 @@ a2fd8037c9a1af000f31c7005436d791525317f818c553d1e2f472b4df76c71d769ecbf67b369a47
 7a19bfc3bf08c11bf34943f822fcae9de57dbdae4759281386e77f711c5d9f7a58fd4970166c4db751e9c29585291fe52f58bc622d80b835d6c645eb339a7263  PineTab.conf
 9c472065b19141dd4c7555869b955de2e679b36e597f9fa3bdac18d0e9460986b0e2fffe1e04751301305f1b6474c1375803afb7d6212eeae91b4905d0bf8ff8  pulse-pinetab.conf
 6374ef977eab14b71fa88057ebd52ca03035e387e5f41504598a990f24b2e92bccd2db476c545dc541000e08fccdecb6f1cd63e25b5835df706269e0384dacc7  weston.ini
-ed0e03f7e1c0348c06be9a7922414469245604ce813bbf0c8910ef211cb993bbb0d0d4615c9c961d50712415f85d6b73e0cf02780ac784666aac56e4889341e4  UPower.conf
+46458e2981dbfad6d671d24aacf78aff127d7b8d5c3f35915f442bc36a5009f5fccede09a7ec53612ff2a6784d8961bcf99c5c8dc9ff5f9178bcc46b4373a0c3  UPower.conf
 "

device/testing/device-pine64-pinetab/UPower.conf

@@ -1,94 +1,5 @@
-# Only the system vendor should modify this file, ordinary users
-# should not have to change anything.
-
 [UPower]
-
-# Enable the Watts Up Pro device.
-#
-# The Watts Up Pro contains a generic FTDI USB device without a specific
-# vendor and product ID. When we probe for WUP devices, we can cause
-# the user to get a perplexing "Device or resource busy" error when
-# attempting to use their non-WUP device.
-#
-# The generic FTDI device is known to also be used on:
-#
-# - Sparkfun FT232 breakout board
-# - Parallax Propeller
-#
-# default=false
-EnableWattsUpPro=false
-
-# Don't poll the kernel for battery level changes.
-#
-# Some hardware will send us battery level changes through
-# events, rather than us having to poll for it. This option
-# allows disabling polling for hardware that sends out events.
-#
-# default=false
-NoPollBatteries=false
-
-# Do we ignore the lid state
-#
-# Some laptops are broken. The lid state is either inverted, or stuck
-# on or off. We can't do much to fix these problems, but this is a way
-# for users to make the laptop panel vanish, a state that might be used
-# by a couple of user-space daemons. On Linux systems, see also
-# logind.conf(5).
-#
-# default=false
-IgnoreLid=false
-
-# Policy for warnings and action based on battery levels
-#
-# Whether battery percentage based policy should be used. The default
-# is to use the time left, change to true to use the percentage, which
-# should work around broken firmwares. It is also more reliable than
-# the time left (frantically saving all your files is going to use more
-# battery than letting it rest for example).
-# default=true
-UsePercentageForPolicy=true
-
-# When UsePercentageForPolicy is true, the levels at which UPower will
-# consider the battery low, critical, or take action for the critical
-# battery level.
-#
-# This will also be used for batteries which don't have time information
-# such as that of peripherals.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# PercentageLow=10
-# PercentageCritical=3
-# PercentageAction=2
-PercentageLow=20
-PercentageCritical=17
-PercentageAction=15
-
-# When UsePercentageForPolicy is false, the time remaining at which UPower
-# will consider the battery low, critical, or take action for the critical
-# battery level.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# TimeLow=1200
-# TimeCritical=300
-# TimeAction=120
-TimeLow=1200
-TimeCritical=300
-TimeAction=120
-
-# The action to take when "TimeAction" or "PercentageAction" above has been
-# reached for the batteries (UPS or laptop batteries) supplying the computer
-#
-# Possible values are:
-# PowerOff
-# Hibernate
-# HybridSleep
-#
-# If HybridSleep isn't available, Hibernate will be used
-# If Hibernate isn't available, PowerOff will be used
+PercentageLow=20.0
+PercentageCritical=17.0
+PercentageAction=15.0
 CriticalPowerAction=PowerOff

device/testing/device-postmarketos-trailblazer/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=device-postmarketos-trailblazer
 pkgdesc="postmarketOS Trailblazer generic ARM64"
-pkgver=20
+pkgver=21
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -39,7 +39,6 @@ subpackages="
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-kernel-lts:kernel_lts
 	$pkgname-kernel-stable:kernel_stable
-	$pkgname-kernel-postmarketos-qcom-laptop:kernel_postmarketos_qcom_laptop
 	$pkgname-kernel-postmarketos-amlogic:kernel_postmarketos_amlogic
 "
 source="
@@ -82,12 +81,6 @@ kernel_stable() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
-kernel_postmarketos_qcom_laptop() {
-	pkgdesc="Mainline kernel with additional patches for Qualcomm Snapdragon-based laptops (linux-postmarketos-qcom-laptop)"
-	depends="linux-postmarketos-qcom-laptop"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 kernel_postmarketos_amlogic() {
 	pkgdesc="Mainline kernel with additional patches for Amlogic AArch64-based devices (linux-postmarketos-amlogic)"
 	depends="linux-postmarketos-amlogic"

device/testing/device-samsung-exynos7/APKBUILD

@@ -1,9 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer="methanal <baclofen@tuta.io>"
+maintainer="methanal <kauschluss+methanal@disroot.org>"
 pkgname=device-samsung-exynos7
 pkgdesc="Samsung Exynos 7 generic device"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"

device/testing/device-samsung-p4note/APKBUILD

@@ -1,9 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
+maintainer="Martin Jücker <martin@bitkeller.de>"
 pkgname=device-samsung-p4note
 pkgdesc="Samsung Galaxy Note 10.1"
 pkgver=7
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"

device/testing/firmware-apple-idevice/APKBUILD

@@ -0,0 +1,26 @@
+# Co-Maintainer: Nick Chan <towinchenmi@gmail.com>
+maintainer="Aster Boese <asterboese@mailbox.org>"
+pkgname=firmware-apple-idevice
+pkgver=0_git20260612
+pkgrel=0
+_commit="1241d49aab85ca2320bf58655b9426a021214ed0"
+pkgdesc="Firmware for Apple iDevices"
+url="https://github.com/Fruit-Firmware/Fruit-Firmware"
+arch="aarch64"
+license="proprietary"
+source="https://github.com/Fruit-Firmware/Fruit-Firmware/archive/$_commit.tar.gz"
+options="!archcheck !check !spdx !strip !tracedeps pmb:cross-native"
+builddir="$srcdir/Fruit-Firmware-$_commit"
+
+package() {
+	mkdir -p "$pkgdir"/usr/lib/firmware/apple
+
+	for i in "$builddir"/firmware/apple/*; do
+		install -Dm644 "$i" \
+			"$pkgdir"/usr/lib/firmware/apple/"$(basename "$i")"
+	done
+}
+
+sha512sums="
+93d9d641884b609757c4ef1fc079eb513fad6d0eb65e2bd096003c556185569e22eaf643afaeb0edcbf803725498a892ff8c01c1f37437e1e0b87c03618982f7  1241d49aab85ca2320bf58655b9426a021214ed0.tar.gz
+"

device/testing/firmware-ayaneo-pocket/APKBUILD

@@ -1,6 +1,6 @@
 maintainer="Neil Armstrong <neil.armstrong@linaro.org>"
 pkgname=firmware-ayaneo-pocket
-pkgver=20251207
+pkgver=20260612
 pkgrel=0
 pkgdesc="Firmware for Ayaneo Pocket"
 subpackages="
@@ -12,13 +12,13 @@ subpackages="
 	$pkgname-s2-tplg:s2_tplg
 	$pkgname-renesas-usb:renesas_usb
 	"
-url="https://github.com/sunflower2333/linux-firmware-ayaneo"
+url="https://github.com/superna9999/linux-firmware-ayaneo"
 arch="aarch64"
 license="proprietary"
 makedepends="zstd"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="17fd5306f1dd33356f0bf85e2781f5c31e98ba0e"
-source="https://github.com/sunflower2333/linux-firmware-ayaneo/archive/$_commit/linux-firmware-ayaneo-$_commit.tar.gz"
+_commit="7b0d4a031ee9a20f48a7749af0ea61c781bd9af4"
+source="https://github.com/superna9999/linux-firmware-ayaneo/archive/$_commit/linux-firmware-ayaneo-$_commit.tar.gz"
 builddir="$srcdir/linux-firmware-ayaneo-$_commit"
 
 package() {
@@ -51,8 +51,8 @@ s2_adsp() {
 s2_tplg() {
 	pkgdesc="Ayaneo Pocket S2 Audio Topology"
 
-	install -Dm644 "$builddir"/qcom/sm8650/SM8650-APS2-tplg.bin.zst -t \
-		"$subpkgdir/lib/firmware/qcom/sm8650/"
+	install -Dm644 "$builddir"/qcom/ayaneo-ps2/SM8650-APS2-tplg.bin.zst -t \
+		"$subpkgdir/lib/firmware/qcom/ayaneo-ps2/"
 }
 
 s2_cdsp() {
@@ -77,5 +77,5 @@ s2_ath12k() {
 }
 
 sha512sums="
-0fa6040320ea2493dd31b66b75c247b44030755f7f74df740537b237d77c73f81c4bb01cbd7c9749bcbb8e3a9c37e827b14e64b6ab9da97b3d5b806124657ac2  linux-firmware-ayaneo-17fd5306f1dd33356f0bf85e2781f5c31e98ba0e.tar.gz
+041bb687a951ec0745c3201e6b19ebfb30dd9fe34882fd6c2d3f2c713de890784fc433805502c3ec15980860e640ce86aed75a13c55d451d230d43d8229b002b  linux-firmware-ayaneo-7b0d4a031ee9a20f48a7749af0ea61c781bd9af4.tar.gz
 "

device/testing/linux-ayaneo-pocket-s2/APKBUILD

@@ -1,7 +1,7 @@
 # Kernel config based on: arch/arm64/configs/defconfig
 maintainer="Neil Armstrong <neil.armstrong@linaro.org>"
 pkgname=linux-ayaneo-pocket-s2
-pkgver=7.0_git20260421
+pkgver=7.0_git20260612
 pkgrel=0
 pkgdesc="Ayaneo Pocket S2 kernel fork"
 arch="aarch64"
@@ -43,7 +43,7 @@ makedepends="
 # Source
 _url="https://gitlab.com/superna9999/"
 _repository="linux"
-_commit="954b1b997752f0ceaf838171c9775dfa72b5553a"
+_commit="d42f74bb3f3372e95cd0525177e2cb83ebb23b17"
 _defconfig="defconfig"
 _config="config-$_flavor.$arch"
 source="
@@ -73,7 +73,7 @@ package() {
 	make LLVM=1 zinstall modules_install dtbs_install \
 		ARCH="$_carch" \
 		INSTALL_PATH="$pkgdir"/boot/ \
-		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_MOD_PATH="$pkgdir"/usr \
 		INSTALL_MOD_STRIP=1 \
 		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs
 
@@ -84,7 +84,7 @@ package() {
 }
 
 sha512sums="
-a8b4267603c0036dce2f023b2fe52791699f547981d398a113ba020aeeb1390ed0643881fa19b50d4585f89b76f33759360a96fbeeb70561b03423db6ee71893  linux-ayaneo-pocket-s2-954b1b997752f0ceaf838171c9775dfa72b5553a.tar.gz
+f50dc5bcbc511e87d93024fa4430b87cdaaf3314368bcf8a7c24b7461e912bb6a5fb51feff7e5e6b98aa77d533e3bebb79ef276cec9e2eab6e50db657ee2cd83  linux-ayaneo-pocket-s2-d42f74bb3f3372e95cd0525177e2cb83ebb23b17.tar.gz
 f7712cb52ab2abae02deb3f90d0bdba83bcdf1af9b5f4fdb97963d729d1a0161301ecb3b5948dcd7a7f182c14e52d3863ec48f22a00276008d3bb0615d29ba68  misc.config
-80e0044ed9ab9331adc667001ce1677113dfc299b9cdd366d221e967e77f7f11aa2a90ae90f5823d54126c46095aaa5a32c93026840605bc2492fce863f70e7d  config-ayaneo-pocket-s2.aarch64
+07089f3297c5206ae1a1a64c5c8438d1d82ca29c4c4651211be74e9786a10956a45bc13ad9bb666a9beb5ca7550948e71bdaa90598bfd4282b2fe57ad9277e1f  config-ayaneo-pocket-s2.aarch64
 "

device/testing/linux-ayaneo-pocket-s2/config-ayaneo-pocket-s2.aarch64

@@ -11,7 +11,7 @@ CONFIG_AS_VERSION=220103
 CONFIG_LD_VERSION=0
 CONFIG_LD_IS_LLD=y
 CONFIG_LLD_VERSION=220103
-CONFIG_RUSTC_VERSION=109500
+CONFIG_RUSTC_VERSION=109600
 CONFIG_RUST_IS_AVAILABLE=y
 CONFIG_RUSTC_LLVM_VERSION=220103
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -4991,11 +4991,11 @@ CONFIG_REGULATOR_ROHM=y
 # CONFIG_REGULATOR_S2MPA01 is not set
 CONFIG_REGULATOR_S2MPS11=y
 # CONFIG_REGULATOR_S5M8767 is not set
+CONFIG_REGULATOR_SGM3804=y
 # CONFIG_REGULATOR_SLG51000 is not set
 # CONFIG_REGULATOR_STM32_BOOSTER is not set
 # CONFIG_REGULATOR_STM32_VREFBUF is not set
 # CONFIG_REGULATOR_STM32_PWR is not set
-CONFIG_REGULATOR_SGM3804=y
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
@@ -5771,6 +5771,7 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
 CONFIG_DRM_PANEL_RAYDIUM_RM692E5=m
 # CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RENESAS_R61307 is not set
+CONFIG_DRM_PANEL_RENESAS_R63419=m
 # CONFIG_DRM_PANEL_RENESAS_R69328 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_AMS581VF01 is not set
@@ -5822,7 +5823,6 @@ CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
 # CONFIG_DRM_PANEL_VISIONOX_RM692E5 is not set
 CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
 # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
-CONFIG_DRM_PANEL_AYANEO_WT0600_2K=m
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 # end of Display Panels
 
@@ -7339,7 +7339,26 @@ CONFIG_LEDS_TRIGGER_PATTERN=m
 #
 # Simatic LED drivers
 #
-# CONFIG_ACCESSIBILITY is not set
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+# CONFIG_SPEAKUP_SYNTH_DUMMY is not set
+# end of Speakup console speech
+
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EDAC=y
@@ -9239,7 +9258,7 @@ CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
-# CONFIG_EXPORTFS_BLOCK_OPS is not set
+CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_FS_ENCRYPTION is not set
 # CONFIG_FS_VERITY is not set
@@ -9424,11 +9443,21 @@ CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFS_V4_2_READ_PLUS=y
 CONFIG_NFSD=m
 # CONFIG_NFSD_V2 is not set
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+CONFIG_NFSD_V4_2_INTER_SSC=y
+# CONFIG_NFSD_V4_SECURITY_LABEL is not set
+# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set
+# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set
+# CONFIG_NFSD_V4_POSIX_ACLS is not set
 CONFIG_GRACE_PERIOD=m
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 # CONFIG_NFS_LOCALIO is not set
 CONFIG_NFS_V4_2_SSC_HELPER=y
@@ -9542,7 +9571,7 @@ CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
 # CONFIG_SECURITY_SAFESETID is not set
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
 # CONFIG_SECURITY_LANDLOCK is not set

device/testing/linux-ayn-odin/APKBUILD

@@ -2,11 +2,11 @@
 #
 # This kernel package can be replaced with linux-postmarketos-qcom-sdm845 once
 # https://gitlab.com/sdm845-mainline/linux/-/merge_requests/91 is merged
-maintainer=""
+maintainer="Stefan Hansson <newbyte@postmarketos.org>"
 _flavor="ayn-odin"
 pkgname=linux-$_flavor
 pkgver=6.7.0
-pkgrel=8
+pkgrel=10
 pkgdesc="Mainline Kernel fork for AYN Odin"
 arch="aarch64"
 _carch="arm64"
@@ -72,7 +72,7 @@ package() {
 		ARCH="$_carch" \
 		LLVM=1 \
 		INSTALL_PATH="$pkgdir"/boot/ \
-		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_MOD_PATH="$pkgdir"/usr \
 		INSTALL_MOD_STRIP=1 \
 		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs-tmp
 

device/testing/linux-htc-flounder/APKBUILD

@@ -1,7 +1,7 @@
-maintainer=""
+maintainer="Szymon Graczyk <szymon@graczyk.dev>"
 pkgname=linux-htc-flounder
 pkgver=6.19.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Google Nexus 9 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -50,11 +50,14 @@ package() {
 	install -Dm644 "$builddir/arch/$_carch/boot/Image.gz" \
 		"$pkgdir/boot/vmlinuz"
 
+	install -Dm644 "$builddir/include/config/kernel.release" \
+		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
+
 	make modules_install dtbs_install \
 		ARCH="$_carch" \
 		LLVM=1 \
 		INSTALL_PATH="$pkgdir"/boot/ \
-		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_MOD_PATH="$pkgdir"/usr \
 		INSTALL_MOD_STRIP=1 \
 		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
 }

device/testing/linux-next/APKBUILD

@@ -1,7 +1,7 @@
 # Kernel config based on: arch/arm64/configs/defconfig
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=linux-next
-pkgver=7.1_git20260609
+pkgver=7.1_git20260619
 pkgrel=0
 _nextver="${pkgver#*_git}"
 pkgdesc="Linux next kernel"
@@ -90,7 +90,7 @@ package() {
 }
 
 sha512sums="
-d90fb68a5f51eea0630a4879115c4781713ae2049a8178a9046bbdce693eadc8d826174e7e2a7db3a6362c8da17805aca19a6590582702e4e217aab8802cce97  linux-next-next-20260609.tar.gz
+d581f166ee76202b1b8755b420f3df881ab22a7dd4e7d557251058a988929bd4412077cbc75666510d12c65987ff1e7a130209242d9b2133161244d71525f386  linux-next-next-20260619.tar.gz
 08ec500bd2f40c1c80e56ebd938d4e54af71972fdf00c4dfe8a911cf094e1c296766276010470bfa26c68093c90bcae01266acc5e59fa0ec4620d4becc2c53d4  devices.config
 25c07558cc7dc82485957c82246bbf1eef4a4188f007546b27336fcd84507b387c8afc3d0feb2a2760e90ccde804ff7d7112be38831bba92d5a1988780a42cdd  pmos.config
 "

device/testing/linux-pine64-pinetab2/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Stefan Hansson <newbyte@postmarketos.org>
 maintainer="Dang Huynh <dang.huynh@mainlining.org>"
 pkgname=linux-pine64-pinetab2
-pkgver=7.0.6
+pkgver=7.0.12
 _danctnix_kernel_rel=1
 pkgrel=0
 pkgdesc="Pine64 PineTab 2 mainline"
@@ -32,14 +32,20 @@ makedepends="
 _tags="v$pkgver-danctnix$_danctnix_kernel_rel"
 _config="config-$_flavor.$arch"
 source="
-	$pkgname-$_tags.tar.gz::https://codeberg.org/DanctNIX/linux-pinetab2/archive/$_tags.tar.gz
+	linux-$pkgver.tar.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$pkgver.tar.xz
+	$_tags.patch.zst::https://codeberg.org/DanctNIX/linux-pinetab2/releases/download/$_tags/$_tags.patch.zst
 	$_config
 "
-builddir="$srcdir/linux-pinetab2"
+builddir="$srcdir/linux-$pkgver"
 _outdir="out"
 
 prepare() {
 	default_prepare
+
+	# Decrunch the patch file and apply it to the tree
+	zstd -d "$(readlink $srcdir/$_tags.patch.zst)" -o "$srcdir/$_tags.patch"
+	patch -p1 -i "$srcdir/$_tags.patch"
+
 	cp "$srcdir/config-$_flavor.$CARCH" .config
 }
 
@@ -66,6 +72,7 @@ package() {
 }
 
 sha512sums="
-b5f0578bf9bc18ea70161bb39fcbbfcd5c92a0d4c58b7c92af64c2277ce2242db3a3551929d608944392bd6b4756bf65a796594acdb4847033a6992ea99ad09b  linux-pine64-pinetab2-v7.0.6-danctnix1.tar.gz
+5c1df7992b8b78ba28b441a5efdb3fd8d07c2a0ce1421e42a409001dea4b8bdf1aa2bda26645439603c3a903a00d7dfa14324ad2f59f8131174c83d1a5da2f45  linux-7.0.12.tar.xz
+b24aadf37f85285edca551d1fd8625755e6db121a760143e468a48c7eb45ffbc3aeff9aea1666afc74a6e7f8ed75944a848c1f9b1ae37d2ad2b3c4412b5b0873  v7.0.12-danctnix1.patch.zst
 77b54e385f63436a6fa0a595149d626aae7026dbd748ab121bcbaa88a0e7cf156239033867d8f7acd51b42f04c6cfe9de1c20cc7f687491afe836a7b4759763f  config-pine64-pinetab2.aarch64
 "

device/testing/linux-postmarketos-apple-16k/APKBUILD

@@ -7,7 +7,7 @@
 maintainer="Nick Chan <towinchenmi@gmail.com>"
 _flavor="postmarketos-apple-16k"
 pkgname=linux-$_flavor
-pkgver=7.0.4
+pkgver=7.0.12
 pkgrel=0
 pkgdesc="Mainline kernel fork for Apple iPhone and iPad devices (16K)"
 arch="aarch64"
@@ -74,6 +74,6 @@ package() {
 }
 
 sha512sums="
-d95ced0eddb5f2e989719b7af3664fb7b40dafe2e9f035de730125e4b2185c3f9dfd504101b6b2e719509041e7865f9f9cce9688adad127999f1b08a292a8382  hoolock-7.0.4.tar.gz
-f8f9324cdc4d880bf674abf82d682252263b8eb0fb6c3704b0b6cd00a2a61c7c7fee68d0f06b5504e6aacda7e627f441bc3dec7511375b6f87808e7ce0988f9f  config-postmarketos-apple-16k.aarch64
+0715d0a3ede47639c9283abd29e79dadc4c842c0396d3c539f413648db2091b164bf95b95d3e5e8db3d73f2faa2cba39ac9db2049cc6d60dd4765aeabb84814f  hoolock-7.0.12.tar.gz
+711c982ec45ad6594ae428bb486b0f1deb113838a35993c058e0bbfe76a129f7d1e02baaade51600f516a722dd6c9900966d87745d909b06ed5c0bbc7a0f7362  config-postmarketos-apple-16k.aarch64
 "

device/testing/linux-postmarketos-apple-16k/config-postmarketos-apple-16k.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 7.0.4 Kernel Configuration
+# Linux/arm64 7.0.12 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="Alpine clang version 22.1.3"
 CONFIG_GCC_VERSION=0
@@ -11,7 +11,7 @@ CONFIG_AS_VERSION=220103
 CONFIG_LD_VERSION=0
 CONFIG_LD_IS_LLD=y
 CONFIG_LLD_VERSION=220103
-CONFIG_RUSTC_VERSION=109500
+CONFIG_RUSTC_VERSION=109600
 CONFIG_RUST_IS_AVAILABLE=y
 CONFIG_RUSTC_LLVM_VERSION=220103
 CONFIG_CC_CAN_LINK=y
@@ -31,7 +31,7 @@ CONFIG_RUSTC_HAS_SPAN_FILE=y
 CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y
 CONFIG_RUSTC_HAS_FILE_WITH_NUL=y
 CONFIG_RUSTC_HAS_FILE_AS_C_STR=y
-CONFIG_PAHOLE_VERSION=130
+CONFIG_PAHOLE_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -293,7 +293,7 @@ CONFIG_PERF_EVENTS=y
 
 CONFIG_PROFILING=y
 CONFIG_RUST=y
-CONFIG_RUSTC_VERSION_TEXT="rustc 1.95.0 (59807616e 2026-04-14) (Alpine Linux Rust 1.95.0-r0)"
+CONFIG_RUSTC_VERSION_TEXT="rustc 1.96.0 (ac68faa20 2026-05-25) (Alpine Linux Rust 1.96.0-r0)"
 CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.72.1"
 CONFIG_TRACEPOINTS=y
 
@@ -5973,9 +5973,6 @@ CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
 # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
 # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-# CONFIG_DEBUG_INFO_BTF is not set
-CONFIG_PAHOLE_HAS_BTF_TAG=y
-CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=2048
 # CONFIG_STRIP_ASM_SYMS is not set

device/testing/linux-postmarketos-apple-4k/APKBUILD

@@ -7,7 +7,7 @@
 maintainer="Aster Boese <asterboese@mailbox.org>"
 _flavor="postmarketos-apple-4k"
 pkgname=linux-$_flavor
-pkgver=7.0.4
+pkgver=7.0.12
 pkgrel=0
 pkgdesc="Mainline kernel fork for Apple iPhone and iPad devices (4k)"
 arch="aarch64"
@@ -74,6 +74,6 @@ package() {
 }
 
 sha512sums="
-d95ced0eddb5f2e989719b7af3664fb7b40dafe2e9f035de730125e4b2185c3f9dfd504101b6b2e719509041e7865f9f9cce9688adad127999f1b08a292a8382  hoolock-7.0.4.tar.gz
-9e88d32d517f12d9b942314482b2cd0f79138b7fad07daa231b5ef69a61f5c31a7ff75ab11a3d99d4e827be9b89acbed5a8d4ef9a3d5242be8ab181d72257e7b  config-postmarketos-apple-4k.aarch64
+0715d0a3ede47639c9283abd29e79dadc4c842c0396d3c539f413648db2091b164bf95b95d3e5e8db3d73f2faa2cba39ac9db2049cc6d60dd4765aeabb84814f  hoolock-7.0.12.tar.gz
+e05c2c6e1dd8d344ee9a24aa46644415f4eb44540714a6473d0545903b0d74bd01aaf76de4fd621f37f41cff052330958ddd48a12a69831d835ca32739176fe6  config-postmarketos-apple-4k.aarch64
 "