From f0b0dff3854f2bd30e69ad11db4b8d4bec8053c6 Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Wed, 15 Apr 2026 21:48:14 +0200
Subject: [PATCH] device-lenovo-21bx: switch to mainline kernels

Adds support for the kernels in main (lts, mainline, stable) and removes
support for linux-postmarketos-qcom-laptop after discussion with the
kernel's maintainers, as it is most likely going to be dropped, or at
least moved to testing.

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8368>
---
 device/community/device-lenovo-21bx/APKBUILD | 34 ++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/device/community/device-lenovo-21bx/APKBUILD b/device/community/device-lenovo-21bx/APKBUILD
index 44faae334..b2861c3c2 100644
--- a/device/community/device-lenovo-21bx/APKBUILD
+++ b/device/community/device-lenovo-21bx/APKBUILD
@@ -4,7 +4,7 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=20
+pkgver=21
 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
@@ -32,6 +31,9 @@ source="
 	kernel-cmdline.conf
 "
 subpackages="
+	$pkgname-kernel-stable:kernel_stable
+	$pkgname-kernel-lts:kernel_lts
+	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-pipewire
 	$pkgname-usbguard
 	$pkgname-vulkan
@@ -42,6 +44,9 @@ 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 \
@@ -70,6 +75,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 maintainance 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