main/postmarketos-base: add systemd preset trigger

Re-apply presets when presets are added/modified/removed
main/postmarketos-ui-gnome-mobile: add systemd preset
2024-05-29 13:42:00 -07:00 · 2024-05-29 11:56:03 -07:00 · 2024-05-29 11:56:02 -07:00 · 2024-05-29 11:56:02 -07:00 · 2024-05-29 11:56:02 -07:00 · 2024-05-29 11:55:39 -07:00
88 changed files with 562 additions and 265 deletions
@@ -1,7 +1,7 @@
 ---

 # global settings
-image: alpine:edge
+image: alpine:latest
 before_script: &global_before_scripts
  - apk upgrade -U
 after_script:
@@ -17,7 +17,7 @@ device/*/*-google-x64cros/			@jenneron @JustSoup321 @alpernebbi
 device/*/*-htc-golfu/				@Newbyte
 device/*/*-htc-m8qlul/				@Newbyte
 device/*/*-kobo-clara/				@akemnade
-device/*/*-lenovo-21bx/				@craftyguy
+device/*/*-lenovo-21bx/				@craftyguy @jane400
 device/*/*-lenovo-a6000/			@jenneron @Minecrell
 device/*/*-lenovo-a6010/			@jenneron @Minecrell
 device/*/*-librecomputer-lafrite/		@funderscore
@@ -8,7 +8,7 @@ fi

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

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

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

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

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

 sha512sums="
-ad4db0c989c1a4773f75411c2749bcc8d25756d20396cdb6bfa59bd5ed14164928c602e9833101e584b28490971f6d43973a9c7de9c544693aef40dbe183cabc  busybox-static-1.36.1-r26-armhf-edge.apk
+98ada58005e7285a555fde224e7af42c56d774e56a78c038fefaf79d75ed5862a33f192e7b6568ab439ce024383a913f9f0813deb9f1cab2b5c4757eb38432d3  busybox-static-1.36.1-r28-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

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

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

 sha512sums="
-f6664d29ecb22e396133116210d792e101fa552b4f4d2295de19af460830bbb151a2d3c4a7b7bbe1596d7b3ed85042f10dae49d78ae4e6ac053ed565f9043c01  busybox-static-1.36.1-r26-armv7-edge.apk
+c7bed023f7b6b790dc95b765c9d8d8fdee6831b39be25e3ffdf88403b3682595e61f076ddc4d36a09e268a978fdc84a7f28b83a471acf1d1d0c2b3b7187ce9fa  busybox-static-1.36.1-r28-armv7-edge.apk
 "
@@ -3,7 +3,7 @@

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

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

 sha512sums="
-4bd0750236a556ad833c27892a55624a324e8ec7cadb0b7287cabd3a9cdded836357ae959aea7ba828be8727b86c6ed4844a1572b68ad3ce3f3e6f913e43ae72  grub-efi-2.12-r3-x86-edge.apk
+3cc14376ad5dc2a4d8488d49199d1257c5024c8c4afcbcdf67a0cd7a66e75962191850cca4248ce13abf060b4d9e2fd0966ef6adeb38a00d58c9e4054eec1e9d  grub-efi-2.12-r5-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-aarch64
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-dddd12728842e84bf7d532901d9b9e26e2c8c86e25a3625329586c9088ec9b3825ce3e512c56b7e875b923905308b89494d31d7ca05ebda5485bd00de3954236  musl-1.2.5-r0-aarch64-edge.apk
-061e68319d2069c211169d7f39b1da572a4c0ab56f8cfe5267c024921ea0e5f44ecc1cca6051bebaa9c83d067f0fd2cbc6b6b73d0e3075410eaf889a25cc82b4  musl-dev-1.2.5-r0-aarch64-edge.apk
+5ad546aca584d77f6fcf7d92bc5e6432d8c32b3db2922a4099423649e674b5c149464bd0048021e50b18398a00382bbeb6a0a598148bea4fa6d783f5c4c4445d  musl-1.2.5-r1-aarch64-edge.apk
+b6fed1441c0eacfea0061967915a876ce0af79b83511d9b05ae7e7cf489d88e36a544fa7f7512f390429d7d0217b672c04a83dfceea603ce0e86d2a47c50f4cc  musl-dev-1.2.5-r1-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armhf
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-4d76f479017b6f666c36782183f3bdb3e58a48f7400cd125c129e380a8654cf99f685f8d3e97b51cb0199b59720a320e251dd9b89fe55ef8f542a043ab3e7355  musl-1.2.5-r0-armhf-edge.apk
-7fa4e9ed4acb6292d46939a63e572eb92085e577bbfce75139a3ebef910434230fcbbb7a236efde7ad6d150d84e31c46edcfe835f4102cb9e68f062eb8488a1e  musl-dev-1.2.5-r0-armhf-edge.apk
+148883dfd80bb670df4c6a919aaf3334d203a87fac98df8046a920a2e4c1c3439347f5653abc2994e9a9fe2946764395cd83e2f2437ab903e37f8ad3fcc6637a  musl-1.2.5-r1-armhf-edge.apk
+052f4f3ff6974aadbe90c1a69c4b29a1fefc25d2f2f794b3d55ed49b79a94dab900592a65b3c80ae9824580eab4fb99cb2cfdf9399354e74a1804871d97774a0  musl-dev-1.2.5-r1-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armv7
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-74e482403f77b9d302a4bb0ad6b86a18e81b5be0eb987296a4b0033c996e474b86eac079abc52bd8f02723aa242ea2a74e61bbd0eee036fbf79a21ae250a6e04  musl-1.2.5-r0-armv7-edge.apk
-02321d629aaa3712546b01645f1eb308f5e25e49bc3c2c42eff3a7cf84cd60327c6bc9818ebeb7d1d9556ddfaa2e132fdab0dc2142eec4df3a799e3402329c49  musl-dev-1.2.5-r0-armv7-edge.apk
+f3da7602184940c3ca4ddc973fd127fe08eb5e9141cf4c22cf49ccf131ef836b7f697f20dc64c7e18661f88779354c8b93c14521d18fb2e83d10638c3c8ed7d5  musl-1.2.5-r1-armv7-edge.apk
+b2678887dfc565691d92c1604137d984c5ce68f7c39c1ec2fd7200d4df4f818d4690c323f93b76ca1d4498a5dc36dff61959e06cc749099c706f85601d915d8e  musl-dev-1.2.5-r1-armv7-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-riscv64
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-c11fb5eed8dab05504d88660a4750981a40020a1609b4ec4f9184cf7645283893e7cafc48da471012a4095699d371517cc9e09c0ec73fef4612280c95feebca2  musl-1.2.5-r0-riscv64-edge.apk
-77eba42ed78e680419f838f47a9a9f17d42288259540b70792af23b22f85ba1d2f87958e7db77b11b43629d8593fa58a02902453ecb0a46dd7c33cfca750b820  musl-dev-1.2.5-r0-riscv64-edge.apk
+822f24faaf2285174742788da0dceef3bada4dbd0db9f67362876b3c0ab6bc647a0f2f0cc70e2e28dbb90121f08b65640a344e7cae8416a84bfb389db32e7d9c  musl-1.2.5-r1-riscv64-edge.apk
+04ac4a81d713f71b68082767ce2afab3ce458730664c140f49a0b33f257666a6b4289c5b53935fe16345f8445a458e5307511773651c4574526cfaaf232c239a  musl-dev-1.2.5-r1-riscv64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-7403427bbe6683739ce00c0396dc4bfa8fce2f3e4957d12bc6c31bfb1a60bafca9e7ba266d1ba7ca469ab3738874965cf25e8f3bd838c002b4e5aad702a79e18  musl-1.2.5-r0-x86-edge.apk
-f5b0dfe7543bd7d1de3bfc8617c61fb7287227ea4dd9a722bfd4ec99e8a9405826973375a81a380b04bcba419c18e292cf60aaf1c9503eec3b420ed7adbacd68  musl-dev-1.2.5-r0-x86-edge.apk
+53a30a57f0db29e8d73d7190590fce18a19bcd358f9b0f3d4fa0b8821dad4ed5f1065c3c07dbc373a23cbd98c9a9dc1c2c2d864ac88eefd53dc5f89d8e57ed67  musl-1.2.5-r1-x86-edge.apk
+e9178fcfe27bdc7568c35889cff8cf20829f67460fd6dc22a6ca0465063a809081ee1267b4275432d23d1e7d457a4b207a0ff11c678233c4e430a1173d4ccea8  musl-dev-1.2.5-r1-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86_64
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-8bb997e077850195621916ee0722be7e054086fa5c2907c7d290ee8892910c073e3aece13a2839589966987711f4af6b2f4bffdc6c45d636a24655ef9cbec101  musl-1.2.5-r0-x86_64-edge.apk
-5d93191c3c9bf03b466dc169b57e519f0165c6551d117ae09538907c57a49f58afa3c9225aafc7a61625f224276eff4ee2dbe79d65cf684d03a46c24dd78aa4c  musl-dev-1.2.5-r0-x86_64-edge.apk
+5506970c66b6da294d32961e94cadc6926a7405915a3d4dd519ed8c2aae829f2fbfaab2ccc8d0794f4aa102aa3e8cbd62099aa54668a11ac0c5072f59befece6  musl-1.2.5-r1-x86_64-edge.apk
+bd2602e59831ba860a548c8281bb62be3382b4035f18c9e36350be644db61a762a413e1d696697d402a57d4bc565faf86c2a212e27c9b9a890d765f794bbe829  musl-dev-1.2.5-r1-x86_64-edge.apk
 "
@@ -1,5 +1,6 @@
-# Maintainer: Konrad Dybcio <konradybcio@kernel.org>
-# Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Co-Maintainer: jane400 <jane400@postmarketos.org>
+# Contributor: Konrad Dybcio <konradybcio@kernel.org>
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
@@ -1,5 +1,5 @@
 pkgname=firmware-fairphone-fp4
-pkgver=20231122
+pkgver=20240313
 pkgrel=0
 pkgdesc="Firmware for Fairphone 4"
 subpackages="
@@ -17,7 +17,7 @@ arch="aarch64"
 license="proprietary"
 makedepends="pil-squasher"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="9bcb18012b18756e5f7adc4fcd41396e7f28199b"
+_commit="d95bd920afa9084cefe0f69be931a5421e544154"
 source="https://github.com/FairBlobs/FP4-firmware/archive/$_commit/FP4-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP4-firmware-$_commit"

@@ -39,8 +39,6 @@ adreno() {
 		"$subpkgdir/lib/firmware/qcom/"
 	install -Dm644 "$builddir"/a615_zap.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s a615_zap.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/a615_zap.mdt"
-	ln -s sm7225/fairphone4/a615_zap.mbn "$subpkgdir/lib/firmware/qcom/a615_zap.mdt"
 }

 adsp() {
@@ -48,7 +46,6 @@ adsp() {

 	install -Dm644 "$builddir"/adsp.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s adsp.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/adsp.mdt"
 	install -Dm644 "$builddir"/adsp*.jsn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
 }
@@ -67,7 +64,6 @@ cdsp() {

 	install -Dm644 "$builddir"/cdsp.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s cdsp.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/cdsp.mdt"
 	install -Dm644 "$builddir"/cdsp*.jsn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
 }
@@ -78,7 +74,6 @@ ipa() {
 	cd "$builddir"
 	install -Dm644 "$builddir"/lagoon_ipa_fws.mbn \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/ipa_fws.mbn"
-	ln -s ipa_fws.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/ipa_fws.mdt"
 }

 modem() {
@@ -86,7 +81,6 @@ modem() {

 	install -Dm644 "$builddir"/modem.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s modem.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/modem.mdt"
 	install -Dm644 "$builddir"/modem*.jsn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"

@@ -111,5 +105,5 @@ wlan() {
 }

 sha512sums="
-c579b1893a61e09f532e0858ddb90b83e663bf1489707ba8b0e524771504db73764233c2dfe3a4b97b40eab4ef88d50adbea33ab25c28c289d1890d7b0addd70  FP4-firmware-9bcb18012b18756e5f7adc4fcd41396e7f28199b.tar.gz
+3839431922c6250fa76c563183387edbc1370f34d833d5d7c6c08f0d921c0498c93ff376af5d43fecf78d4ac6aff3b90e41345310181826b0a21507dbfba778c  FP4-firmware-d95bd920afa9084cefe0f69be931a5421e544154.tar.gz
 "
@@ -1,5 +1,6 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Co-Maintainer: jane400 <jane400@postmarketos.org>
 pkgname=firmware-lenovo-21bx
 pkgver=1
 pkgrel=0
@@ -1,5 +1,6 @@
-# Maintainer: Konrad Dybcio <konradybcio@kernel.org>
-# Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Co-Maintainer: jane400 <jane400@postmarketos.org>
+# Contributor: Konrad Dybcio <konradybcio@kernel.org>
 pkgname=linux-lenovo-21bx
 pkgver=6.9
 pkgrel=1
@@ -1,7 +1,7 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.9
+pkgver=6.9.2
 pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
@@ -68,8 +68,8 @@ package() {
 }

 sha512sums="
-fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579  linux-6.9.tar.xz
-f148cf476030eba3034c56e3ca51b982f8230e2d7b199b59f021612943ec1ae8899c0b308593bf1b10f3b632aa7232c695fbed348c406258b8e6a998ffb00803  config-postmarketos-mediatek-mt8173.aarch64
+a168f5b3e7ee7451d5bb1c7f6c090d6002330a4529ef74b2e47f6902ba3d6feaa8dc89f7b5a072d52f6933fd08354a0ff1e12f22240ce53c758c144d4ad132cd  linux-6.9.2.tar.xz
+0a28bc2e6d57a95ec5125f0c8a21b42d63af7a907e214e3ca3fa90a6741277bb809426a1b8a26b52452854ff6cb04800887552b86c37c0c6af1ad0b7f8acfcd7  config-postmarketos-mediatek-mt8173.aarch64
 4b499c1fbf53631cffd6fa7299643dc744e0e2187f71804664b02f05296162b42e3f76aa0d8c688cecb43a8bcd41ec92991c98287951292260237b828dcca710  fix-mmc1-speed.patch
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 caf48ac0f77661153ee94c7de4931baca135a69a97e93f01ad8f276b4a9944e077d7214c117450943cca07990c773661f79718cb0c2ff7c5789c93d37afb26de  fix-spi-nor-max-frequency.patch
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.9.0 Kernel Configuration
+# Linux/arm64 6.9.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a6lte
 pkgdesc="Samsung Galaxy A6 2018"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,6 +29,7 @@ source="
 	etc-init.d-wlan0-up
 	etc-lightdm-lightdm.conf
 	etc-NetworkManager-conf.d-swlan0-unmanaged.conf
+	etc-NetworkManager-conf.d-wlan0-preserve-mac.conf
 	usr-libexec-samsungipcd-voicecall.sh
 	usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf
 	usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf
@@ -54,7 +55,6 @@ package() {
 	install -Dm644 etc-conf.d-samsungipcd "$pkgdir"/etc/conf.d/samsungipcd
 	install -Dm755 etc-init.d-wlan0-up "$pkgdir"/etc/init.d/wlan0-up
 	install -Dm644 etc-lightdm-lightdm.conf "$pkgdir"/etc/lightdm/lightdm.conf
-	install -Dm644 etc-NetworkManager-conf.d-swlan0-unmanaged.conf "$pkgdir"/etc/NetworkManager/conf.d/swlan0-unmanaged.conf
 	install -Dm755 usr-libexec-samsungipcd-voicecall.sh "$pkgdir"/usr/libexec/samsungipcd/voicecall.sh
 	install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/HiFi.conf
 	install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/Universal7870-I.conf
@@ -90,6 +90,8 @@ downstream_quirks() {
 	install="$subpkgname.post-install"
 	install -Dm755 etc-init.d-udev-settle "$subpkgdir"/etc/init.d/udev-settle
 	install -Dm755 etc-init.d-hciattach-ttySAC0 "$subpkgdir"/etc/init.d/hciattach-ttySAC0
+	install -Dm644 etc-NetworkManager-conf.d-swlan0-unmanaged.conf "$pkgdir"/etc/NetworkManager/conf.d/swlan0-unmanaged.conf
+	install -Dm644 etc-NetworkManager-conf.d-wlan0-preserve-mac.conf "$pkgdir"/etc/NetworkManager/conf.d/wlan0-preserve-mac.conf
 	# we run bootmac ourselves and don't want it to trigger from the udev rule
 	# so remove the rule
 	install -Dm755 /dev/null "$subpkgdir"/usr/lib/udev/rules.d/90-bootmac.rules
@@ -104,6 +106,7 @@ bfe2b5455084554d9dc8d30ec5ff72564cfe9574618d0ccc6d544f336d2869bd18a8617ddb3d5873
 203b832a7080d5f1351c5e024e444f9fe509f6e0fd4b376a60c7d73359b7e356863a4f15caf9b2e4e733dc44d2971722083e7c69ca94a012eb004b4b8ded9d09  etc-init.d-udev-settle
 7caddfe4659c969a33adcc27a760bc78d4f70ca4b7a4a5ec28a6411c12f3e6dd6d427b59f75976a737a5fe0f09806f8b6d65798f6358bd1e1954ad2a28fbfdc8  etc-init.d-wlan0-up
 861270c6bc0b2a3e6cd389c21c8c895e62de8cf8bec6fcf23c178f8cbaae855d62b0ee98692671ab4f518d84cb43dd0b2fe46f5a609f65af6a6c06e0fdbb6d0c  etc-lightdm-lightdm.conf
+5c3a692f22a29fca792c114c6d94ff1bf0d6921f068f207a2894a8f99c73dcc319e7c803ed7adfe64eb3e60088f37e2a2730118b2ed57aa01b35415664085567  etc-NetworkManager-conf.d-wlan0-preserve-mac.conf
 ef24527b13e48a9153643f3713167d3d08486e7de8b4c94d7c446ff380396115890573d8cd4aa5448766d9e779e189833a83e7921081679bd348c3f8a59410af  etc-NetworkManager-conf.d-swlan0-unmanaged.conf
 abe1c4a2f59fe862cebef75c54b8806bd86ce06aeb15d8c0699ab1338c9d575cb72a4d5b099f94272b1d9c9c3f4960af209a9e058ea9e57733b7d905dad0d33f  usr-libexec-samsungipcd-voicecall.sh
 2169590d10d6123575d43e8ff7dc0d2ba824f8266d9fa75a5b59a4cc5753e47e327368b777082930d6b7a7aed6f57fa6ac2c5a2e816e1e12cd1032a8bb1822b5  usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf
@@ -0,0 +1,2 @@
+[connection]
+wifi.cloned-mac-address=preserve
@@ -1,5 +1,5 @@
 pkgname=firmware-fairphone-fp5
-pkgver=20231122
+pkgver=20240417
 pkgrel=0
 pkgdesc="Firmware for Fairphone 5"
 subpackages="
@@ -17,7 +17,7 @@ arch="aarch64"
 license="proprietary"
 makedepends="pil-squasher"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="3f529aecb4a9c61299c5f93d1137c6870daf93d3"
+_commit="73b1f5451539063c161f805efd1717d6e8ee4070"
 source="https://github.com/FairBlobs/FP5-firmware/archive/$_commit/FP5-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP5-firmware-$_commit"

@@ -111,5 +111,5 @@ wpss() {
 }

 sha512sums="
-a1f52a30858b85784298fc0da239ab764a53123670ee3c2fdda3ee760d9ad34a1122d6c4601ae6fa38aa93918ed9e53b4e46eaf8eb2c5f86590be836a199ee32  FP5-firmware-3f529aecb4a9c61299c5f93d1137c6870daf93d3.tar.gz
+7c21f8ba33e34167555769ded52debb472552e421608b54c33f244edc9f1ff633400ae2bf21bfe8df00e6a138d8ed53b9edf5d6aa5c0cdd63308854881077f7e  FP5-firmware-73b1f5451539063c161f805efd1717d6e8ee4070.tar.gz
 "
@@ -3,7 +3,7 @@

 _flavor="postmarketos-qcom-msm8226"
 pkgname=linux-$_flavor
-pkgver=6.8.7
+pkgver=6.9.1
 pkgrel=0
 _tag="v${pkgver/_/-}-msm8226"
 pkgdesc="Mainline kernel fork for Qualcomm APQ8026/MSM8226/MSM8926 devices"
@@ -59,6 +59,6 @@ package() {
 }

 sha512sums="
-68bce90ecf2e0194594cf16fc41a60994ed013b56f4be24d49debe708276768d6d976c722f6909da5b4a993a173428d1f6f17921760fbbd49a7cdc2958ac89a9  linux-v6.8.7-msm8226.tar.gz
-bdf43e433b1780af53101eb0d28ede11bc25f2ef5180fcf7a71847dcf68b8e7dc09610153f8dd28d9f70ff842a4aa4b613f9dfbdf070349b6ad1d05a05dcdab4  config-postmarketos-qcom-msm8226.armv7
+20bece90edcb5a389fe6e01cf7565228731f5e96ab33178f386e155c42bfa1e26ba49b386abb05c971586e23fa901397d830f8265ffa9025f4785332af082827  linux-v6.9.1-msm8226.tar.gz
+c19122ffe8a6adbcd2413baf6f33fc87354a7ab430872af4e69ccd31eb8e9d57a1dfb37d93409459482d97a215c1911783fbe7076af2d7878e23d72ea1df54d9  config-postmarketos-qcom-msm8226.armv7
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.8.7 Kernel Configuration
+# Linux/arm 6.9.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
@@ -245,7 +245,6 @@ CONFIG_TRACEPOINTS=y
 # Kexec and crash features
 #
 # CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
 # end of Kexec and crash features
 # end of General setup

@@ -325,13 +324,7 @@ CONFIG_ARCH_MULTI_V6_V7=y
 # end of TI OMAP/AM/DM/DRA Family

 CONFIG_ARCH_QCOM=y
-# CONFIG_ARCH_IPQ40XX is not set
-# CONFIG_ARCH_MSM8X60 is not set
-# CONFIG_ARCH_MSM8909 is not set
-# CONFIG_ARCH_MSM8916 is not set
-# CONFIG_ARCH_MSM8960 is not set
-CONFIG_ARCH_MSM8974=y
-# CONFIG_ARCH_MDM9615 is not set
+# CONFIG_ARCH_QCOM_RESERVE_SMEM is not set
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_ROCKCHIP is not set
 # CONFIG_ARCH_S5PV210 is not set
@@ -590,6 +583,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # end of Power management options

 CONFIG_AS_VFP_VMRS_FPINST=y
+CONFIG_CPU_MITIGATIONS=y

 #
 # General architecture-dependent options
@@ -649,8 +643,11 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
 CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_HAVE_PAGE_SIZE_4KB=y
+CONFIG_PAGE_SIZE_4KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SHIFT=12
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -814,12 +811,12 @@ CONFIG_BOUNCE=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_SYSFS is not set
 CONFIG_CMA_AREAS=7
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CPU_CACHE_ALIASING=y
 CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
@@ -852,7 +849,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 # CONFIG_PACKET_DIAG is not set
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_AF_UNIX_OOB=y
 # CONFIG_UNIX_DIAG is not set
 # CONFIG_TLS is not set
@@ -939,7 +935,6 @@ CONFIG_NF_TABLES=m
 # CONFIG_NF_LOG_IPV4 is not set
 # CONFIG_NF_REJECT_IPV4 is not set
 # CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
 # end of IP: Netfilter Configuration

 # CONFIG_IP_DCCP is not set
@@ -1090,6 +1085,7 @@ CONFIG_ETHTOOL_NETLINK=y
 #
 CONFIG_ARM_AMBA=y
 CONFIG_HAVE_PCI=y
+CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DOMAINS_GENERIC=y
@@ -1318,7 +1314,6 @@ CONFIG_MTD_CFI_I2=y
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
 # end of Mapping drivers for chip access

@@ -1400,6 +1395,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 # CONFIG_MTD_UBI_BLOCK is not set
+# CONFIG_MTD_UBI_NVMEM is not set
 # CONFIG_MTD_HYPERBUS is not set
 CONFIG_DTC=y
 CONFIG_OF=y
@@ -2005,6 +2001,9 @@ CONFIG_MICREL_PHY=y
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_NCN26000_PHY is not set
 # CONFIG_AT803X_PHY is not set
+# CONFIG_QCA83XX_PHY is not set
+# CONFIG_QCA808X_PHY is not set
+# CONFIG_QCA807X_PHY is not set
 # CONFIG_QSEMI_PHY is not set
 # CONFIG_REALTEK_PHY is not set
 # CONFIG_RENESAS_PHY is not set
@@ -2341,6 +2340,8 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=y
 # CONFIG_TOUCHSCREEN_EXC3000 is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GOODIX is not set
+# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set
+# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
 # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set
 # CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set
@@ -2467,7 +2468,6 @@ CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
@@ -2703,6 +2703,7 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 CONFIG_PTP_1588_CLOCK_KVM=y
 # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
+# CONFIG_PTP_1588_CLOCK_FC3W is not set
 # CONFIG_PTP_1588_CLOCK_MOCK is not set
 # end of PTP clock support

@@ -2711,6 +2712,7 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_PINCTRL_AW9523 is not set
 # CONFIG_PINCTRL_CY8C95X0 is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
@@ -2922,8 +2924,10 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set
 # CONFIG_SENSORS_AS370 is not set
 # CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
 # CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_CHIPCAP2 is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
 # CONFIG_SENSORS_CORSAIR_PSU is not set
 # CONFIG_SENSORS_DRIVETEMP is not set
@@ -2960,6 +2964,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LTC4245 is not set
 # CONFIG_SENSORS_LTC4260 is not set
 # CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_LTC4282 is not set
 # CONFIG_SENSORS_MAX1111 is not set
 # CONFIG_SENSORS_MAX127 is not set
 # CONFIG_SENSORS_MAX16065 is not set
@@ -3008,10 +3013,12 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
 # CONFIG_SENSORS_NZXT_KRAKEN2 is not set
+# CONFIG_SENSORS_NZXT_KRAKEN3 is not set
 # CONFIG_SENSORS_NZXT_SMART2 is not set
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
+# CONFIG_SENSORS_PT5161L is not set
 # CONFIG_SENSORS_PWM_FAN is not set
 # CONFIG_SENSORS_SBTSI is not set
 # CONFIG_SENSORS_SBRMI is not set
@@ -3069,7 +3076,6 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -3994,8 +4000,7 @@ CONFIG_DVB_SP2=m
 # Graphics support
 #
 CONFIG_APERTURE_HELPERS=y
-CONFIG_VIDEO_CMDLINE=y
-CONFIG_VIDEO_NOMODESET=y
+CONFIG_VIDEO=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
@@ -4036,6 +4041,7 @@ CONFIG_DRM_SCHED=m
 # CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_AMDGPU is not set
 # CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_XE is not set
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_UDL is not set
@@ -4073,15 +4079,15 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set
 # CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
+# CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
-# CONFIG_DRM_PANEL_DSI_CM is not set
-# CONFIG_DRM_PANEL_LVDS is not set
-# CONFIG_DRM_PANEL_SIMPLE is not set
-# CONFIG_DRM_PANEL_EDP is not set
 # CONFIG_DRM_PANEL_EBBG_FT8719 is not set
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
+# CONFIG_DRM_PANEL_DSI_CM is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
@@ -4091,17 +4097,17 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_JDI_LPM102A188A is not set
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set
+# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set
@@ -4110,8 +4116,8 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
-# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
 # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set
 # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
@@ -4122,15 +4128,16 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
@@ -4141,19 +4148,21 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set
+# CONFIG_DRM_PANEL_EDP is not set
+# CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
-# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set
 # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set

@@ -4299,6 +4308,7 @@ CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_KTD253 is not set
+# CONFIG_BACKLIGHT_KTD2801 is not set
 # CONFIG_BACKLIGHT_KTZ8866 is not set
 # CONFIG_BACKLIGHT_PWM is not set
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
@@ -4827,6 +4837,7 @@ CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
 CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
 CONFIG_USB_MON=y

 #
@@ -5186,6 +5197,7 @@ CONFIG_LEDS_PM8058=y
 #
 # CONFIG_LEDS_GROUP_MULTICOLOR is not set
 # CONFIG_LEDS_KTD202X is not set
+# CONFIG_LEDS_NCP5623 is not set
 # CONFIG_LEDS_PWM_MULTICOLOR is not set
 CONFIG_LEDS_QCOM_LPG=y

@@ -5455,7 +5467,6 @@ CONFIG_STAGING=y

 # CONFIG_FB_SM750 is not set
 # CONFIG_STAGING_MEDIA is not set
-# CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_KS7010 is not set
@@ -5565,6 +5576,7 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_CLKSRC_QCOM=y
 # CONFIG_MICROCHIP_PIT64B is not set
 # end of Clock Source drivers

@@ -5595,6 +5607,7 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
+# CONFIG_MSM_IOMMU is not set
 # CONFIG_IOMMUFD is not set
 CONFIG_ARM_SMMU=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
@@ -5700,6 +5713,7 @@ CONFIG_QCOM_STATS=y
 CONFIG_QCOM_WCNSS_CTRL=y
 # CONFIG_QCOM_APR is not set
 # CONFIG_QCOM_ICC_BWMON is not set
+# CONFIG_QCOM_PBS is not set
 # end of Qualcomm SoC drivers

 # CONFIG_SOC_TI is not set
@@ -5787,7 +5801,9 @@ CONFIG_IIO_SW_TRIGGER=y
 # CONFIG_BMA180 is not set
 # CONFIG_BMA220 is not set
 # CONFIG_BMA400 is not set
-# CONFIG_BMC150_ACCEL is not set
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
 # CONFIG_BMI088_ACCEL is not set
 # CONFIG_DA280 is not set
 # CONFIG_DA311 is not set
@@ -5846,6 +5862,7 @@ CONFIG_KXSD9_I2C=m
 # CONFIG_AD7923 is not set
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
+# CONFIG_AD9467 is not set
 # CONFIG_ADI_AXI_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
@@ -5871,6 +5888,7 @@ CONFIG_KXSD9_I2C=m
 # CONFIG_MCP3564 is not set
 # CONFIG_MCP3911 is not set
 # CONFIG_NAU7802 is not set
+# CONFIG_PAC1934 is not set
 CONFIG_QCOM_VADC_COMMON=m
 # CONFIG_QCOM_PM8XXX_XOADC is not set
 # CONFIG_QCOM_SPMI_RRADC is not set
@@ -5889,6 +5907,7 @@ CONFIG_QCOM_SPMI_VADC=m
 # CONFIG_TI_ADS1015 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
+# CONFIG_TI_ADS1298 is not set
 # CONFIG_TI_ADS7950 is not set
 # CONFIG_TI_ADS8344 is not set
 # CONFIG_TI_ADS8688 is not set
@@ -6043,6 +6062,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # CONFIG_ADF4377 is not set
+# CONFIG_ADMFM2000 is not set
 # CONFIG_ADMV1013 is not set
 # CONFIG_ADMV4420 is not set
 # CONFIG_ADRF6780 is not set
@@ -6180,6 +6200,7 @@ CONFIG_TSL2772=m
 #
 # Magnetometer sensors
 #
+# CONFIG_AF8133J is not set
 # CONFIG_AK8974 is not set
 CONFIG_AK8975=m
 # CONFIG_AK09911 is not set
@@ -6346,6 +6367,7 @@ CONFIG_ARM_GIC_MAX_NR=1

 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_GPIO is not set
 # CONFIG_RESET_QCOM_AOSS is not set
 # CONFIG_RESET_QCOM_PDC is not set
 # CONFIG_RESET_SIMPLE is not set
@@ -6450,6 +6472,7 @@ CONFIG_PM_OPP=y
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=y
 CONFIG_INTERCONNECT_QCOM=y
+# CONFIG_INTERCONNECT_QCOM_MSM8909 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8939 is not set
 CONFIG_INTERCONNECT_QCOM_MSM8974=m
@@ -6472,6 +6495,7 @@ CONFIG_INTERCONNECT_QCOM_RPMH_POSSIBLE=y
 # CONFIG_INTERCONNECT_QCOM_SDX75 is not set
 # CONFIG_INTERCONNECT_QCOM_SM6115 is not set
 # CONFIG_INTERCONNECT_QCOM_SM6350 is not set
+# CONFIG_INTERCONNECT_QCOM_SM7150 is not set
 # CONFIG_INTERCONNECT_QCOM_SM8150 is not set
 # CONFIG_INTERCONNECT_QCOM_SM8250 is not set
 # CONFIG_INTERCONNECT_QCOM_SM8350 is not set
@@ -6492,6 +6516,7 @@ CONFIG_INTERCONNECT_QCOM_SMD_RPM=m
 CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_VALIDATE_FS_PARSER is not set
 CONFIG_FS_IOMAP=y
+CONFIG_FS_STACK=y
 CONFIG_BUFFER_HEAD=y
 CONFIG_LEGACY_DIRECT_IO=y
 CONFIG_EXT2_FS=y
@@ -6538,6 +6563,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 # CONFIG_VIRTIO_FS is not set
+CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_OVERLAY_FS is not set

 #
@@ -6565,8 +6591,8 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 # CONFIG_EXFAT_FS is not set
-# CONFIG_NTFS_FS is not set
 # CONFIG_NTFS3_FS is not set
+# CONFIG_NTFS_FS is not set
 # end of DOS/FAT/EXFAT/NT Filesystems

 #
@@ -7012,7 +7038,6 @@ CONFIG_GENERIC_NET_UTILS=y
 # CONFIG_CORDIC is not set
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y

 #
@@ -7195,7 +7220,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
 # CONFIG_DEBUG_FS_ALLOW_NONE is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+CONFIG_ARCH_HAS_UBSAN=y
 # CONFIG_UBSAN is not set
 CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments
@@ -7218,7 +7243,6 @@ CONFIG_HAVE_KCSAN_COMPILER=y
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_WX is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_PER_VMA_LOCK_STATS is not set
@@ -7375,6 +7399,7 @@ CONFIG_PROBE_EVENTS=y
 # arm Debugging
 #
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
+# CONFIG_ARM_DEBUG_WX is not set
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 CONFIG_UNWINDER_ARM=y
 CONFIG_ARM_UNWIND=y
@@ -7411,8 +7436,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_TEST_HEXDUMP is not set
-# CONFIG_STRING_SELFTEST is not set
-# CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_SCANF is not set
@@ -4,7 +4,7 @@ _flavor=postmarketos-qcom-msm8974
 _config="config-$_flavor.$CARCH"

 pkgname=linux-$_flavor
-pkgver=6.8.4
+pkgver=6.9.1
 pkgrel=0
 _tag="v${pkgver/_/-}-msm8974"
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8974 devices"
@@ -60,6 +60,6 @@ package() {
 }

 sha512sums="
-5da93906b0df89278fd5ed4ea5a2a5f38b4b606b0d234686e4ee998dc9fb8e4b51626fd7a20c1fbed756f53cad1db27c3e29041e6358b1011534fb680977bc3b  linux-v6.8.4-msm8974.tar.gz
-9501006ee70fc8a9d8c67b99587345ab3fd0669df3873c75ac86ae72963abde8cedf55db0aea70ffb45416a506d55eaca67da49c0e4f5657e82a1ea0fe4b61ca  config-postmarketos-qcom-msm8974.armv7
+34b5b1e94bc333df301efd156980b09814b633069aa890e43bd2e5102c2a4bcafbcc758db359e50d96447f9de81be68456fba6749e894e5c8768975329f7a948  linux-v6.9.1-msm8974.tar.gz
+d15c6348479b810d38fbc29fc80ff3f81ae78dcbaf3802870a5773bee823b2dc4cc7dd5e4f61bd6744c662eed918647b53bd002be375977ae89664a3194cc997  config-postmarketos-qcom-msm8974.armv7
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.8.4 Kernel Configuration
+# Linux/arm 6.9.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
@@ -169,7 +169,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -260,7 +260,6 @@ CONFIG_TRACEPOINTS=y
 # Kexec and crash features
 #
 # CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
 # end of Kexec and crash features
 # end of General setup

@@ -337,13 +336,7 @@ CONFIG_ARCH_MULTI_V6_V7=y
 # end of TI OMAP/AM/DM/DRA Family

 CONFIG_ARCH_QCOM=y
-# CONFIG_ARCH_IPQ40XX is not set
-# CONFIG_ARCH_MSM8X60 is not set
-# CONFIG_ARCH_MSM8909 is not set
-# CONFIG_ARCH_MSM8916 is not set
-# CONFIG_ARCH_MSM8960 is not set
-CONFIG_ARCH_MSM8974=y
-# CONFIG_ARCH_MDM9615 is not set
+# CONFIG_ARCH_QCOM_RESERVE_SMEM is not set
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_ROCKCHIP is not set
 # CONFIG_ARCH_S5PV210 is not set
@@ -598,6 +591,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # end of Power management options

 CONFIG_AS_VFP_VMRS_FPINST=y
+CONFIG_CPU_MITIGATIONS=y

 #
 # General architecture-dependent options
@@ -657,8 +651,11 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
 CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_HAVE_PAGE_SIZE_4KB=y
+CONFIG_PAGE_SIZE_4KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SHIFT=12
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -832,12 +829,12 @@ CONFIG_BOUNCE=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_SYSFS is not set
 CONFIG_CMA_AREAS=7
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CPU_CACHE_ALIASING=y
 CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
@@ -874,7 +871,6 @@ CONFIG_SKB_EXTENSIONS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=y
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_AF_UNIX_OOB=y
 CONFIG_UNIX_DIAG=y
 # CONFIG_TLS is not set
@@ -1184,6 +1180,7 @@ CONFIG_IP_VS_NFCT=y
 # IP: Netfilter Configuration
 #
 CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_IP_NF_IPTABLES_LEGACY=m
 # CONFIG_NF_SOCKET_IPV4 is not set
 # CONFIG_NF_TPROXY_IPV4 is not set
 CONFIG_NF_TABLES_IPV4=y
@@ -1211,12 +1208,13 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_IP_NF_TARGET_ECN is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
 CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_ARPFILTER is not set
 # end of IP: Netfilter Configuration

 #
 # IPv6: Netfilter Configuration
 #
+CONFIG_IP6_NF_IPTABLES_LEGACY=m
 # CONFIG_NF_SOCKET_IPV6 is not set
 # CONFIG_NF_TPROXY_IPV6 is not set
 CONFIG_NF_TABLES_IPV6=y
@@ -1474,6 +1472,7 @@ CONFIG_ETHTOOL_NETLINK=y
 #
 CONFIG_ARM_AMBA=y
 CONFIG_HAVE_PCI=y
+CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DOMAINS_GENERIC=y
@@ -2140,6 +2139,9 @@ CONFIG_MICROCHIP_PHY=m
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_NCN26000_PHY is not set
 # CONFIG_AT803X_PHY is not set
+# CONFIG_QCA83XX_PHY is not set
+# CONFIG_QCA808X_PHY is not set
+# CONFIG_QCA807X_PHY is not set
 # CONFIG_QSEMI_PHY is not set
 # CONFIG_REALTEK_PHY is not set
 # CONFIG_RENESAS_PHY is not set
@@ -2476,6 +2478,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_EXC3000 is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GOODIX is not set
+# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set
+# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
 # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set
 # CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set
@@ -2601,7 +2605,6 @@ CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
@@ -2829,6 +2832,7 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_PINCTRL_AW9523 is not set
 # CONFIG_PINCTRL_CY8C95X0 is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
@@ -3041,8 +3045,10 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set
 # CONFIG_SENSORS_AS370 is not set
 # CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
 # CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_CHIPCAP2 is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
 # CONFIG_SENSORS_CORSAIR_PSU is not set
 # CONFIG_SENSORS_DRIVETEMP is not set
@@ -3078,6 +3084,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LTC4245 is not set
 # CONFIG_SENSORS_LTC4260 is not set
 # CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_LTC4282 is not set
 # CONFIG_SENSORS_MAX1111 is not set
 # CONFIG_SENSORS_MAX127 is not set
 # CONFIG_SENSORS_MAX16065 is not set
@@ -3125,10 +3132,12 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_NCT7802 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
 # CONFIG_SENSORS_NZXT_KRAKEN2 is not set
+# CONFIG_SENSORS_NZXT_KRAKEN3 is not set
 # CONFIG_SENSORS_NZXT_SMART2 is not set
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
+# CONFIG_SENSORS_PT5161L is not set
 # CONFIG_SENSORS_PWM_FAN is not set
 # CONFIG_SENSORS_SBTSI is not set
 # CONFIG_SENSORS_SBRMI is not set
@@ -3184,7 +3193,6 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -3438,8 +3446,7 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 # Graphics support
 #
 CONFIG_APERTURE_HELPERS=y
-CONFIG_VIDEO_CMDLINE=y
-CONFIG_VIDEO_NOMODESET=y
+CONFIG_VIDEO=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
@@ -3480,6 +3487,7 @@ CONFIG_DRM_SCHED=y
 # CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_AMDGPU is not set
 # CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_XE is not set
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_UDL is not set
@@ -3517,15 +3525,15 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set
 # CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
+# CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
-# CONFIG_DRM_PANEL_DSI_CM is not set
-# CONFIG_DRM_PANEL_LVDS is not set
-CONFIG_DRM_PANEL_SIMPLE=y
-# CONFIG_DRM_PANEL_EDP is not set
 # CONFIG_DRM_PANEL_EBBG_FT8719 is not set
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
+# CONFIG_DRM_PANEL_DSI_CM is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
@@ -3536,17 +3544,17 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set
 CONFIG_DRM_PANEL_JDI_LPM055A081AB5=y
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_JDI_LPM102A188A is not set
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set
+# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set
@@ -3555,8 +3563,8 @@ CONFIG_DRM_PANEL_JDI_LPM055A081AB5=y
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
-# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
 # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set
 # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
@@ -3567,8 +3575,10 @@ CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
@@ -3577,7 +3587,6 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E3FA2_FULL=m
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
@@ -3588,19 +3597,21 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E3FA2_FULL=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set
+# CONFIG_DRM_PANEL_EDP is not set
+CONFIG_DRM_PANEL_SIMPLE=y
+# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
-# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set
 # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set

@@ -3748,6 +3759,7 @@ CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_KTD253 is not set
+# CONFIG_BACKLIGHT_KTD2801 is not set
 # CONFIG_BACKLIGHT_KTZ8866 is not set
 # CONFIG_BACKLIGHT_PWM is not set
 CONFIG_BACKLIGHT_QCOM_WLED=y
@@ -4290,6 +4302,7 @@ CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
 CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
 CONFIG_USB_MON=y

 #
@@ -4684,6 +4697,7 @@ CONFIG_LEDS_PM8058=y
 #
 # CONFIG_LEDS_GROUP_MULTICOLOR is not set
 # CONFIG_LEDS_KTD202X is not set
+# CONFIG_LEDS_NCP5623 is not set
 # CONFIG_LEDS_PWM_MULTICOLOR is not set
 CONFIG_LEDS_QCOM_LPG=y

@@ -4952,7 +4966,6 @@ CONFIG_STAGING=y

 # CONFIG_FB_SM750 is not set
 # CONFIG_STAGING_MEDIA is not set
-# CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_KS7010 is not set
@@ -4997,11 +5010,14 @@ CONFIG_QCOM_RPMCC=y
 CONFIG_COMMON_CLK_QCOM=y
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_A7PLL is not set
+# CONFIG_QCOM_CLK_APCS_MSM8916 is not set
+# CONFIG_QCOM_CLK_APCS_SDX55 is not set
 CONFIG_QCOM_CLK_RPM=y
 CONFIG_QCOM_CLK_SMD_RPM=y
 # CONFIG_APQ_GCC_8084 is not set
 # CONFIG_APQ_MMCC_8084 is not set
 # CONFIG_IPQ_APSS_PLL is not set
+# CONFIG_IPQ_APSS_6018 is not set
 # CONFIG_IPQ_GCC_4019 is not set
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_806X is not set
@@ -5058,6 +5074,7 @@ CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_CLKSRC_QCOM=y
 # CONFIG_MICROCHIP_PIT64B is not set
 # end of Clock Source drivers

@@ -5068,7 +5085,7 @@ CONFIG_MAILBOX=y
 # CONFIG_PL320_MBOX is not set
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
-# CONFIG_QCOM_APCS_IPC is not set
+CONFIG_QCOM_APCS_IPC=y
 # CONFIG_QCOM_IPCC is not set
 CONFIG_IOMMU_SUPPORT=y

@@ -5082,6 +5099,7 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # end of Generic IOMMU Pagetable Support

 # CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_MSM_IOMMU is not set
 # CONFIG_IOMMUFD is not set
 # CONFIG_ARM_SMMU is not set
 # CONFIG_QCOM_IOMMU is not set
@@ -5182,6 +5200,7 @@ CONFIG_QCOM_STATS=m
 CONFIG_QCOM_WCNSS_CTRL=y
 # CONFIG_QCOM_APR is not set
 # CONFIG_QCOM_ICC_BWMON is not set
+# CONFIG_QCOM_PBS is not set
 # end of Qualcomm SoC drivers

 # CONFIG_SOC_TI is not set
@@ -5325,6 +5344,7 @@ CONFIG_KXSD9_I2C=y
 # CONFIG_AD7923 is not set
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
+# CONFIG_AD9467 is not set
 # CONFIG_ADI_AXI_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
@@ -5350,6 +5370,7 @@ CONFIG_KXSD9_I2C=y
 # CONFIG_MCP3564 is not set
 # CONFIG_MCP3911 is not set
 # CONFIG_NAU7802 is not set
+# CONFIG_PAC1934 is not set
 CONFIG_QCOM_VADC_COMMON=m
 # CONFIG_QCOM_PM8XXX_XOADC is not set
 # CONFIG_QCOM_SPMI_RRADC is not set
@@ -5368,6 +5389,7 @@ CONFIG_QCOM_SPMI_VADC=m
 # CONFIG_TI_ADS1015 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
+# CONFIG_TI_ADS1298 is not set
 # CONFIG_TI_ADS7950 is not set
 # CONFIG_TI_ADS8344 is not set
 # CONFIG_TI_ADS8688 is not set
@@ -5518,6 +5540,7 @@ CONFIG_IIO_INV_SENSORS_TIMESTAMP=m
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # CONFIG_ADF4377 is not set
+# CONFIG_ADMFM2000 is not set
 # CONFIG_ADMV1013 is not set
 # CONFIG_ADMV4420 is not set
 # CONFIG_ADRF6780 is not set
@@ -5655,6 +5678,7 @@ CONFIG_TSL2772=m
 #
 # Magnetometer sensors
 #
+# CONFIG_AF8133J is not set
 # CONFIG_AK8974 is not set
 CONFIG_AK8975=y
 # CONFIG_AK09911 is not set
@@ -5821,6 +5845,7 @@ CONFIG_ARM_GIC_MAX_NR=1

 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_GPIO is not set
 # CONFIG_RESET_QCOM_AOSS is not set
 # CONFIG_RESET_QCOM_PDC is not set
 # CONFIG_RESET_SIMPLE is not set
@@ -5927,6 +5952,7 @@ CONFIG_PM_OPP=y
 # CONFIG_SLIMBUS is not set
 CONFIG_INTERCONNECT=y
 CONFIG_INTERCONNECT_QCOM=y
+# CONFIG_INTERCONNECT_QCOM_MSM8909 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8939 is not set
 CONFIG_INTERCONNECT_QCOM_MSM8974=y
@@ -6004,6 +6030,7 @@ CONFIG_AUTOFS_FS=m
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 # CONFIG_VIRTIO_FS is not set
+CONFIG_FUSE_PASSTHROUGH=y
 CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
@@ -6039,10 +6066,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_EXFAT_FS=m
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_NTFS_FS is not set
 CONFIG_NTFS3_FS=m
 # CONFIG_NTFS3_LZX_XPRESS is not set
 # CONFIG_NTFS3_FS_POSIX_ACL is not set
+# CONFIG_NTFS_FS is not set
 # end of DOS/FAT/EXFAT/NT Filesystems

 #
@@ -6495,7 +6522,6 @@ CONFIG_GENERIC_NET_UTILS=y
 # CONFIG_CORDIC is not set
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y

 #
@@ -6682,7 +6708,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
 # CONFIG_DEBUG_FS_ALLOW_NONE is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+CONFIG_ARCH_HAS_UBSAN=y
 # CONFIG_UBSAN is not set
 CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments
@@ -6705,7 +6731,6 @@ CONFIG_HAVE_KCSAN_COMPILER=y
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_WX is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_PER_VMA_LOCK_STATS is not set
@@ -6863,6 +6888,7 @@ CONFIG_PROBE_EVENTS=y
 # arm Debugging
 #
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
+# CONFIG_ARM_DEBUG_WX is not set
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 CONFIG_UNWINDER_ARM=y
 CONFIG_ARM_UNWIND=y
@@ -6899,8 +6925,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_TEST_HEXDUMP is not set
-# CONFIG_STRING_SELFTEST is not set
-# CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_SCANF is not set
@@ -4,7 +4,7 @@
 _flavor="postmarketos-qcom-sm8250"
 pkgname=linux-$_flavor
 pkgver=6.9.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline kernel fork for SM8250"
 arch="aarch64"
 _carch="arm64"
@@ -62,5 +62,5 @@ package() {

 sha512sums="
 ebc5b88e52d8b64d51caacd74fe0e32c5fb59e5f47ed28b715ca5857e876306835734fe8067cdacecc86e4d89f9f01127e4ede723d9ecd623ce0e188ddbb863b  linux-postmarketos-qcom-sm8250-sm8250-6.9.0.tar.gz
-622403954e0405c9c0c6bf8b58434f91563dcf52a765dcf57488bb63700353427096697428d20e556b6cd342c86168fff0ecac03a5b9e046c7e28a87f3c333b2  config-postmarketos-qcom-sm8250.aarch64
+e7267ce492bdb04151e61ec323ca68f4ded4e6579808ae8d25e266624b62884bc3f0960d86d5010c813ddf9b1fb8c8bab066b33c752e1ecaea75df98d7bb8efb  config-postmarketos-qcom-sm8250.aarch64
 "
@@ -173,7 +173,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -0,0 +1,2 @@
+enable iio-sensor-proxy
+enable modemmanager
@@ -1,39 +1,33 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-base-ui-gnome
 pkgver=3
-pkgrel=5
+pkgrel=8
 pkgdesc="Meta package for shared configuration for GNOME-based UIs"
 url="https://postmarketos.org"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="
-	apk-polkit-rs-openrc
 	dnsmasq
-	elogind
-	elogind-openrc
 	gcr-ssh-agent
 	gnome-bluetooth
 	iio-sensor-proxy
-	iio-sensor-proxy-openrc
 	modemmanager
-	modemmanager-openrc
-	polkit-elogind
 	postmarketos-artwork-wallpapers
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
 	power-profiles-daemon
-	pulseaudio
 	xdg-desktop-portal-gnome
 	xdg-desktop-portal-gtk
 	xdg-user-dirs
 	xdg-user-dirs-gtk
 	xwayland
 	"
-install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	00_postmarketos-base-ui-gnome.gschema.override
+	50-gnome-base.preset
 	"
 options="!check"
+subpackages="$pkgname-openrc $pkgname-systemd"

 _pmb_recommends="
 	evince
@@ -50,6 +44,7 @@ _pmb_recommends="
 	gnome-software
 	gnome-software-plugin-apk
 	gnome-text-editor
+	gnome-weather
 	lollypop
 	loupe
 "
@@ -59,6 +54,29 @@ package() {
 		"$srcdir"/*.override
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="
+		apk-polkit-rs-openrc
+		elogind
+		elogind-openrc
+		iio-sensor-proxy-openrc
+		modemmanager-openrc
+		polkit-elogind
+	"
+
+	mkdir "$subpkgdir"
+}
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+
+	install -Dm644 "$srcdir"/50-gnome-base.preset \
+		-t "$subpkgdir"/usr/lib/systemd/system-preset/
+}
+
 sha512sums="
 1f68138876f2270943c88fd6f914f156692397a840f4945564cce0ed6e5d56943661fee025e0e4e0881b5df18a4f5f290086eb67be945e59abd5fe4c71cf5e67  00_postmarketos-base-ui-gnome.gschema.override
+25250cd780dd6af7723aa20209c1ba256f0d70acccf26ea54a1a31bab13520485025912bb5621cf009d78555d60402430ad35d0dc6f7d49f33c1d76c1898088b  50-gnome-base.preset
 "
@@ -1,8 +1,6 @@
 #!/bin/sh

 rc-update add apk-polkit-server default
-rc-update add bluetooth default
 rc-update add elogind default
 rc-update add iio-sensor-proxy default
 rc-update add modemmanager default
-rc-update add networkmanager default
@@ -0,0 +1 @@
+postmarketos-base-ui-gnome-openrc.post-install
@@ -1 +0,0 @@
-postmarketos-base-ui-gnome.post-install
@@ -0,0 +1,3 @@
+enable hfd-service
+enable iio-sensor-proxy
+enable urfkill
@@ -2,38 +2,29 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-base-ui-plasma
 pkgver=2
-pkgrel=1
+pkgrel=5
 pkgdesc="Meta package for shared configuration for Plasma-based UIs"
 url="https://postmarketos.org"
 arch="noarch !armhf" # armhf is not supported
 license="GPL-3.0-or-later"
 depends="
 	bluedevil
-	bluez-openrc
 	breeze
 	dnsmasq
-	elogind
-	elogind-openrc
 	iio-sensor-proxy
-	iio-sensor-proxy-openrc
 	kscreen
 	kwallet-pam
 	kwayland-integration
 	modemmanager
-	modemmanager-openrc
 	polkit-kde-agent-1
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
 	powerdevil
-	pulseaudio
 	urfkill
-	urfkill-openrc
 	xdg-desktop-portal-kde
 	"
 # Required to launch
 depends="$depends
-	tinydm
-	tinydm-openrc
 	xorg-server
 	"
 _pmb_recommends="
@@ -50,12 +41,13 @@ _pmb_recommends="
 	postmarketos-artwork-wallpapers
 	xdg-user-dirs
 	"
-install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-openrc $pkgname-systemd"
 source="
 	gtk-app-wayland.sh
 	kdewallet.kwl
 	kdewallet.salt
 	qtlogging.ini
+	50-plasma-base.preset
 	"
 options="!check pmb:gpu-accel"

@@ -75,10 +67,31 @@ package() {
 		"$srcdir"/kdewallet.salt
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="
+		bluez-openrc
+		elogind
+		elogind-openrc
+		iio-sensor-proxy-openrc
+		urfkill-openrc
+		"
+
+	mkdir -p "$subpkgdir"
+}
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+
+	install -Dm644 "$srcdir"/50-plasma-base.preset \
+		-t "$subpkgdir"/usr/lib/systemd/system-preset/
+}

 sha512sums="
 57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179  gtk-app-wayland.sh
 923309f71ee0840ae49d610ab5c11260432f462709eee7148ee5a4703872b9926a3267b16b524162c1560e0798c63fe392a161a57be5c6000bbb1e3f0c947e25  kdewallet.kwl
 f3fdaaaf13e985166b86158d5a60098aa45195ea078a4cab7fbf12d3aa428000af3e46ec011dbdc38a4c00faeac5f9a3b5bc2765a6afdd0f1ee58616e31e7429  kdewallet.salt
 341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb  qtlogging.ini
+2918f2594dfbd50db5849c9c4d0571b5bc96379a8ab927f283a9cf197bd06866e6d11d2e2b2aa2119639089adb7e4b6b8ee5b6339604d54bab58c6012a9e3416  50-plasma-base.preset
 "
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+rc-update add bluetooth default
+rc-update add elogind default
+rc-update add hfd-service default
+rc-update add iio-sensor-proxy default
+rc-update add networkmanager default
+rc-update add urfkill default
@@ -0,0 +1 @@
+postmarketos-base-ui-plasma-openrc.post-install
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-rc-update add bluetooth default
-rc-update add elogind default
-rc-update add hfd-service default
-rc-update add iio-sensor-proxy default
-rc-update add networkmanager default
-rc-update add modemmanager default
-rc-update add tinydm default
-rc-update add urfkill default
-
-
-# Migrate from the old ofono setup
-if rc-update del ofono default; then
-	rc-update del ofono-auto-enable default
-	rc-service stop ofono
-	rc-service stop ofono-auto-enable
-
-	rc-service start modemmanager
-fi
-
-glib-compile-schemas /usr/share/glib-2.0/schemas
@@ -1 +0,0 @@
-postmarketos-base-ui-plasma.post-install
@@ -1,7 +1,7 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-base-ui
 pkgver=22
-pkgrel=3
+pkgrel=6
 pkgdesc="Meta package for minimal postmarketOS UI base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -23,21 +23,26 @@ depends="
 	"
 _pmb_recommends="font-twemoji"
 subpackages="
+	$pkgname-audio-none:_audio_none
 	$pkgname-audio-pipewire:_audio_pipewire
 	$pkgname-audio-pulseaudio:_audio_pulseaudio
 	$pkgname-bluez
+	$pkgname-bluez-systemd:bluez_systemd
 	$pkgname-bluez-obexd:_obexd
 	$pkgname-elogind
 	$pkgname-flatpak
 	$pkgname-networkmanager-usb-tethering:_usb_tethering
 	$pkgname-networkmanager
+	$pkgname-networkmanager-systemd:networkmanager_systemd
 	$pkgname-openrc-settingsd:_openrc_settingsd
-	$pkgname-pulseaudio
 	$pkgname-qt-tweaks:qt_tweaks
 	$pkgname-qt-wayland:qt_wayland
+	$pkgname-systemd
 	$pkgname-tinydm
 	$pkgname-wifi-iwd:iwd
+	$pkgname-wifi-iwd-systemd:iwd_systemd
 	$pkgname-wifi-wpa_supplicant:wpa_supplicant
+	$pkgname-wifi-wpa_supplicant-systemd:wpa_supplicant_systemd
 	$pkgname-x11
 	postmarketos-default-camera:_default_camera
 	"
@@ -65,6 +70,11 @@ _source644="
 	usr/lib/NetworkManager/conf.d/50-random-mac.conf
 	usr/lib/NetworkManager/conf.d/50-tethering.conf
 	usr/lib/NetworkManager/conf.d/50-use-dnsmasq.conf
+	usr/lib/systemd/system-preset/50-bluetooth.preset
+	usr/lib/systemd/system-preset/50-iwd.preset
+	usr/lib/systemd/system-preset/50-networkmanager.preset
+	usr/lib/systemd/system-preset/50-wpa_supplicant.preset
+	usr/lib/systemd/system-preset/99-base-ui.preset
 	usr/share/wireplumber/wireplumber.conf.d/50-pulseaudio.conf
 "
 _source600="
@@ -123,9 +133,14 @@ bluez() {
 	amove etc/conf.d/bluetooth
 }

+bluez_systemd() {
+	install_if="$pkgname-bluez=$pkgver-r$pkgrel systemd"
+	amove usr/lib/systemd/system-preset/50-bluetooth.preset
+}
+
 elogind() {
 	install_if="$pkgname=$pkgver-r$pkgrel elogind"
-	depends="sleep-inhibitor"
+	depends="sleep-inhibitor !systemd-logind"
 	install="$subpkgname.post-install"
 	replaces="
 		elogind
@@ -144,6 +159,12 @@ _openrc_settingsd() {
 	amove etc/conf.d/openrc-settingsd
 }

+systemd() {
+	install_if="$pkgname-=$pkgver-r$pkgrel systemd"
+	depends="systemd-timesyncd"
+	amove usr/lib/systemd/system-preset/99-base-ui.preset
+}
+
 tinydm() {
 	install_if="$pkgname=$pkgver-r$pkgrel tinydm-openrc"
 	replaces="tinydm-openrc"
@@ -153,13 +174,6 @@ tinydm() {
 	amove etc/tinydm.d/env-wayland.d/50-sdl-wayland.sh
 }

-pulseaudio() {
-	install_if="$pkgname=$pkgver-r$pkgrel pulseaudio"
-	depends="pulseaudio-utils"
-	provides="postmarketos-base-pulseaudio=$pkgver-r$pkgrel"
-	amove etc/pulse/default.pa.d/postmarketos.pa
-}
-
 _obexd() {
 	install_if="$pkgname=$pkgver-r$pkgrel bluez-obexd"
 	replaces="bluez-obexd"
@@ -183,7 +197,6 @@ networkmanager() {
 		gojq
 		networkmanager
 		networkmanager-cli
-		networkmanager-openrc
 		networkmanager-tui
 		networkmanager-wifi
 		networkmanager-wwan
@@ -194,6 +207,11 @@ networkmanager() {
 	amove usr/lib/NetworkManager/dispatcher.d/50-dns-filter.sh
 }

+networkmanager_systemd() {
+	install_if="$pkgname-networkmanager=$pkgver-r$pkgrel systemd"
+	amove usr/lib/systemd/system-preset/50-networkmanager.preset
+}
+
 _default_camera() {
 	# dummy package for camera app, packages can install_if on this to install
 	# the appropriate camera app for that device/UI
@@ -219,9 +237,15 @@ wpa_supplicant() {
 	amove etc/conf.d/wpa_supplicant
 }

+wpa_supplicant_systemd() {
+	install_if="$pkgname-wpa_supplicant=$pkgver-r$pkgrel systemd"
+	amove usr/lib/systemd/system-preset/50-wpa_supplicant.preset
+}
+
 iwd() {
 	pkgdesc="Use iwd as the WiFi backend (but may not work with all devices)"
 	depends="iwd"
+
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	provides="postmarketos-base-ui-wifi=$pkgver-r$pkgrel"
 	# Lower than wpa_supplicant for now, see:
@@ -231,6 +255,19 @@ iwd() {
 	amove usr/lib/NetworkManager/conf.d/50-iwd.conf
 }

+iwd_systemd() {
+	install_if="$pkgname-iwd=$pkgver-r$pkgrel systemd"
+	amove usr/lib/systemd/system-preset/50-iwd.preset
+}
+
+_audio_none() {
+	pkgdesc="Do not install any audio backend."
+	provides="postmarketos-base-ui-audio=$pkgver-r$pkgrel"
+	provider_priority=10
+
+	mkdir "$subpkgdir"
+}
+
 _audio_pipewire() {
 	pkgdesc="Use pipewire as the audio backend. (but may not work with all devices)"
 	depends="pipewire-alsa pipewire-pulse"
@@ -242,12 +279,12 @@ _audio_pipewire() {

 _audio_pulseaudio() {
 	pkgdesc="Use pulseaudio as the audio backend."
-	depends="alsa-plugins-pulse pulseaudio pulseaudio-alsa !pipewire-pulse"
+	depends="alsa-plugins-pulse pulseaudio pulseaudio-alsa pulseaudio-utils !pipewire-pulse"
 	provides="postmarketos-base-ui-audio=$pkgver-r$pkgrel"
 	provider_priority=100

-	mkdir "$subpkgdir"
 	amove usr/share/wireplumber/wireplumber.conf.d/50-pulseaudio.conf
+	amove etc/pulse/default.pa.d/postmarketos.pa
 }

 flatpak() {
@@ -273,6 +310,11 @@ cac604e25c46e695dd30bd5a10cfd2d69595fcc3bc290096ac94b76b10834d591ea6576afb79c46b
 d4b4c4fed2dee7266f6a87ae266691377593014943e2953e4cd87a59f3110f25bfb5f3f866cc843519f628695e4df7602bfdcd3d79f2c2cd6e8256535c33b038  rootfs-usr-lib-NetworkManager-conf.d-50-random-mac.conf
 6507eb31cdd694a7db0280246433118a650bf5d99fbe639f967ae2d95945429a7e03ca6feb5bb6e7b9fb14fcec21e13e51209a79edd0041e77b5bf76b129ed6f  rootfs-usr-lib-NetworkManager-conf.d-50-tethering.conf
 900554534191fa0797064d35350934cdd8af59f30f0ae7d8ec63c2e11c44a16c643d3024b6543940488cd590fec1d392548bcaacc3be88cddff90f69b17ece07  rootfs-usr-lib-NetworkManager-conf.d-50-use-dnsmasq.conf
+ee18a6d19f037f4ab76e0cefbe0b2c74f36c892f4c938d1122afe8b9e4c55c38fb48e311271f4036471c0c12e022bc8beea8181b34e084b7fb9e4685ff445551  rootfs-usr-lib-systemd-system-preset-50-bluetooth.preset
+b6f586ec976beb816a284ed4b9568b57b967e6f02c66e0df0df0b40d7100260d828c51ba1ea22efbd7d4691f045e56f9b54be1ee5cd76af9021539e1c136d860  rootfs-usr-lib-systemd-system-preset-50-iwd.preset
+15647e8e0b4a696f4abf75606d016e6963aa831d97218712d46f2f53ccd1d46115d1d4a0c0742d04a59498e2f936d68d2d0b55a5b1169292ba8b3f70e781d785  rootfs-usr-lib-systemd-system-preset-50-networkmanager.preset
+1cee819a9163eb1212c934057615f712bd9380f067ff4b240903ef96165c78d1a32e5312c2d9af07cb68284edff5482a02829319d446a5f35e1c935ca0ab4e96  rootfs-usr-lib-systemd-system-preset-50-wpa_supplicant.preset
+f494c848a82d48d126291f36ae79fcca7c4cc33029ebb6cadc76436502044975d5d40a53e4fdee97ec2d8558e9231fca2b2b9cc1ac388b32a692e40de7475978  rootfs-usr-lib-systemd-system-preset-99-base-ui.preset
 ebb7700018cf64fe6dcb747365cd2fb816deb6e06e7368af779284b51b1f0749e24f8e70b0b72fa6bff4178a02af934f728c3b115c8c1f77aa1a3490879af731  rootfs-usr-share-wireplumber-wireplumber.conf.d-50-pulseaudio.conf
 1b8add60574ec4644197cb93263c0653325c2e88e03673de918be5fb3280c7b81e8e97dce498850a07f2f3307771c44f3c876922e5cbd5207523ede31816296f  rootfs-usr-lib-NetworkManager-system-connections-USB_Networking.nmconnection
 d1ddd43489e6016e3ffd716027ed2bae4a2ab5f213118bdbcb96750e267ab7c0367cd0e0e386300aa5550352653144f5caeddd790621fe0879f83ca1995bb65c  rootfs-etc-tinydm.d-env-wayland.d-50-firefox-wayland.sh
@@ -1,4 +1,6 @@
 #!/bin/sh -e

-rc-update -qq del wpa_supplicant || true
-rc-update -q add iwd default
+if command -v rc-update >/dev/null; then
+	rc-update -qq del wpa_supplicant || true
+	rc-update -q add iwd default
+fi
@@ -1,4 +1,6 @@
 #!/bin/sh -e

-rc-update -qq del iwd || true
-rc-update -q add wpa_supplicant default
+if command -v rc-update >/dev/null; then
+	rc-update -qq del iwd || true
+	rc-update -q add wpa_supplicant default
+fi
@@ -1,6 +1,8 @@
 #!/bin/sh -e

-for service in cgroups dbus haveged chronyd rfkill; do
-	rc-update -q add $service default
-done
+if command -v rc-update >/dev/null; then
+	for service in cgroups dbus haveged chronyd rfkill; do
+		rc-update -q add $service default
+	done
+fi
 exit 0
@@ -0,0 +1 @@
+enable bluetooth
@@ -0,0 +1,2 @@
+disable wpa_supplicant
+enable iwd
@@ -0,0 +1 @@
+enable NetworkManager
@@ -0,0 +1,2 @@
+disable iwd
+enable wpa_supplicant
@@ -0,0 +1,3 @@
+enable haveged
+enable systemd-rfkill
+enable timesyncd
@@ -1,6 +1,6 @@
 pkgname=postmarketos-base
 pkgver=32
-pkgrel=4
+pkgrel=5
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -23,6 +23,7 @@ subpackages="
 	$pkgname-mesa
 	$pkgname-nftables
 	$pkgname-nofde
+	$pkgname-systemd
 	"
 options="!check"

@@ -122,6 +123,12 @@ nofde() {
 	mkdir "$subpkgdir"
 }

+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+	triggers="$subpkgname.trigger=/usr/lib/systemd/*-preset"
+	mkdir $subpkgdir
+}
+
 sha512sums="
 e529f5cef1f31481b577f99b8917704f2cfefb963d98bf40a14b017938e55a00134d2033f81d2cb0b8489c5e9b4a92fdc0a788013f1adb4cd46d9580c9988186  rootfs-etc-sudoers
 9591c9cb2194fa1092505159c9eb3d899bec95b6dbd9a0222be62098db012da113a125e40d70373d60af9880dfa489bdbe12b6b897bdef5613e023800fb6ee1b  rootfs-etc-doas.d-10-postmarketos.conf
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+systemctl preset-all
@@ -1,12 +1,11 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-config-nftables
 pkgver=0.16
-pkgrel=0
+pkgrel=1
 pkgdesc="nftables firewall configuration for postmarketOS"
 url="https://gitlab.com/postmarketos"
 arch="noarch"
 license="MIT"
-depends="nftables-openrc"
 subpackages="
 	$pkgname-openusb:openusb
 	$pkgname-log:log
@@ -19,6 +18,7 @@ subpackages="
 	$pkgname-vlc-chromecast:vlc_chromecast
 	$pkgname-vncserver:vncserver
 	$pkgname-wifi-display:wifi_display
+	$pkgname-openrc
 "
 source="
 	rules/00_log_all.nft
@@ -39,7 +39,6 @@ source="
 	networkmanager.conf
 "
 options="!check" # No tests
-install="$pkgname.post-install"

 package() {
 	cd rules
@@ -48,6 +47,14 @@ package() {
 	done
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+	depends="nftables-openrc"
+
+	mkdir -p "$subpkgdir"
+}
+
 openusb() {
 	depends="$pkgname"
 	description="Adds a rule to accept all incoming connections to the usb* interface"
@@ -2,7 +2,7 @@
 # Maintainer: Affe Null <affenull2345@gmail.com>
 pkgname=postmarketos-ui-bananui
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="(Wayland) Keypad controlled UI for feature phones"
 url="https://git.abscue.de/obp/bananui"
 arch="noarch"
@@ -14,7 +14,6 @@ depends="
 	pam-rundir
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
-	pulseaudio
 	seatd
 	seatd-openrc
 	tinydm
@@ -0,0 +1 @@
+enable gdm
@@ -2,7 +2,7 @@
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-gnome-mobile
 pkgver=2
-pkgrel=4
+pkgrel=5
 pkgdesc="(Wayland) Gnome Shell patched to adapt better to phones (Experimental)"
 url="https://gnome.org/"
 arch="noarch !armhf !riscv64" # gnome-shell / riscv64: mutter-mobile
@@ -45,8 +45,10 @@ _pmb_recommends="
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
+	50-gnome-mobile.preset
 	firefox-wayland.sh
 	"
+subpackages="$pkgname-systemd"
 options="!check"

 package() {
@@ -54,6 +56,14 @@ package() {
 		"$srcdir"/firefox-wayland.sh \
 		-t "$pkgdir"/etc/profile.d/
 }
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+
+	install -Dm644 "$srcdir"/50-gnome-mobile.preset \
+		-t "$subpkgdir"/usr/lib/systemd/system-preset/
+}
 sha512sums="
+7c8303a878d66c4831c27f77ffaf3fd78f831c9419f62a0c2a2e89c8490e3bb32bb46b5549e7347a9aca4d36cb6305f5cc094d7c7a91e9285cb866e50f04b7c5  50-gnome-mobile.preset
 0d9ec58be7dc354e181989c7f08e7d4dd93fefd06a99e784b87fe898479dd47a40dfa9689c6a63ebdc04bf87883a270686aec27f7cc34cb21ec0f370a4afe2d8  firefox-wayland.sh
 "
@@ -1,3 +1,5 @@
 #!/bin/sh

-rc-update add gdm default
+if command -v rc-update >/dev/null; then
+	rc-update add gdm default
+fi
@@ -0,0 +1 @@
+enable gdm
@@ -2,7 +2,7 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-ui-gnome
 pkgver=3
-pkgrel=9
+pkgrel=10
 pkgdesc="(Wayland) Gnome Shell"
 url="https://gnome.org/"
 # armhf blocked by gnome-shell -> gjs -> mozjs102
@@ -23,9 +23,14 @@ _pmb_recommends="
 	gnome-extensions-app
 	gnome-system-monitor
 	nautilus
+	snapshot
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
-source="firefox-wayland.sh"
+source="
+	firefox-wayland.sh
+	50-gnome.preset
+"
+subpackages="$pkgname-systemd"
 options="!check"

 package() {
@@ -33,6 +38,14 @@ package() {
 		"$srcdir"/firefox-wayland.sh \
 		-t "$pkgdir"/etc/profile.d/
 }
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+
+	install -Dm644 "$srcdir"/50-gnome.preset \
+		-t "$subpkgdir"/usr/lib/systemd/system-preset/
+}
 sha512sums="
 0d9ec58be7dc354e181989c7f08e7d4dd93fefd06a99e784b87fe898479dd47a40dfa9689c6a63ebdc04bf87883a270686aec27f7cc34cb21ec0f370a4afe2d8  firefox-wayland.sh
+7c8303a878d66c4831c27f77ffaf3fd78f831c9419f62a0c2a2e89c8490e3bb32bb46b5549e7347a9aca4d36cb6305f5cc094d7c7a91e9285cb866e50f04b7c5  50-gnome.preset
 "
@@ -1,3 +1,5 @@
 #!/bin/sh

-rc-update add gdm default
+if command -v rc-update >/dev/null; then
+	rc-update add gdm default
+fi
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-kodi
 pkgver=2
-pkgrel=7
+pkgrel=8
 pkgdesc="(GBM) 10-foot UI useful on TV's"
 url="https://kodi.tv"
 # kodi does not know of other archs
@@ -17,7 +17,6 @@ depends="
 	polkit-elogind
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
-	pulseaudio
 	upower
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
@@ -2,7 +2,7 @@
 # Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=postmarketos-ui-lxqt
 pkgver=0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="(X11) Lightweight Qt Desktop Environment (stylus recommended)"
 url="https://lxqt-project.org/"
 # armhf: lxqt-desktop not available
@@ -41,8 +41,6 @@ _pmb_recommends="
 	pavucontrol-qt
 	pm-utils
 	postmarketos-artwork-wallpapers
-	pulseaudio
-	pulseaudio-utils
 	qps
 	screengrab
 	unclutter-xfixes
@@ -2,7 +2,7 @@
 # Maintainer: Jakko <jahau@rocketmail.com>
 pkgname=postmarketos-ui-mate
 pkgver=7
-pkgrel=0
+pkgrel=1
 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)"
 url="http://mate-desktop.org/"
 arch="noarch"
@@ -31,7 +31,6 @@ _pmb_recommends="
 	mate-tweak
 	network-manager-applet
 	onboard
-	pulseaudio
 	unclutter-xfixes
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
@@ -0,0 +1 @@
+enable phosh
@@ -2,7 +2,7 @@
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-phosh
 pkgver=22.3
-pkgrel=5
+pkgrel=7
 pkgdesc="(Wayland) Mobile UI initially developed for the Librem 5"
 url="https://phosh.mobi"
 arch="noarch !armhf"
@@ -20,8 +20,6 @@ depends="
 	postmarketos-base-ui-gnome
 	postmarketos-base-ui-qt-tweaks
 	postmarketos-base-ui-qt-wayland
-	tinydm
-	tinydm-openrc
 	udiskie
 	xdg-desktop-portal-wlr
 	"
@@ -43,8 +41,10 @@ source="
 	01_postmarketos-ui-phosh.gschema.override
 	mimeapps.list
 	udiskie.desktop
+	50-phosh.preset
 	"
-options="!check pmb:gpu-accel"
+options="!check pmb:gpu-accel pmb:systemd"
+subpackages="$pkgname-openrc $pkgname-systemd"

 package() {
 	install -Dm644 "$srcdir"/01_postmarketos-ui-phosh.gschema.override \
@@ -55,8 +55,29 @@ package() {
 		"$pkgdir"/etc/xdg/autostart/udiskie.desktop
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+	depends="
+		tinydm
+		tinydm-openrc
+	"
+	mkdir "$subpkgdir"
+}
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+	depends="
+		libcap-utils
+		phosh-service
+	"
+	install -Dm644 "$srcdir"/50-phosh.preset \
+		-t "$subpkgdir"/usr/lib/systemd/system-preset/
+}
+
 sha512sums="
 e577b8073df680ccee75ef5b6bb1f2877d5727687d63d6fd9211298e791b6c9f593eb79278c77a4b4918e3c57333c2a012030baf5a3c8d6d16000cc63a030f84  01_postmarketos-ui-phosh.gschema.override
 a741e8db9e4232334b924326c48be4e4c8f7a2382a7608926918a7491c518b2dda551e55a00d4d5fcf58c7950a78dc35d5cc5eaab53ad93a56de40887071f242  mimeapps.list
 53f5c565b4ca8a12f12b63ec84a0194ef530703565d123203d41582a35a54d66afaf3a676df158ae0effe327dcfc1c6496a082ce9dbe803b2547417c3c3fad6e  udiskie.desktop
+43b005dfb3d363400f00afdce77e47d58a3d4dcea43babe2262f15eba02390f6b29bc8c75b0f337d842d20db0579d76a5857973e9823e2f5a1ea155182681993  50-phosh.preset
 "
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+rc-update add tinydm default
+rc-update add waked default
+tinydm-set-session -s /usr/share/wayland-sessions/phosh.desktop
+
+exit 0
@@ -1,9 +1,5 @@
 #!/bin/sh

-rc-update add tinydm default
-rc-update add waked default
-tinydm-set-session -s /usr/share/wayland-sessions/phosh.desktop
-
 # Add the user to relevant groups in post-upgrade (symlink to post-install).
 # Note that we don't want to rely on users existing in post-install
 # (pmaports#820), therefore the group is also set via _pmb_groups during
@@ -0,0 +1 @@
+enable sddm
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-plasma-desktop
 pkgver=3
-pkgrel=1
+pkgrel=3
 pkgdesc="(X11/Wayland) KDE Desktop Environment (works well with tablets)"
 url="https://www.kde.org"
 # armhf and riscv64 blocked by plasma
@@ -37,8 +37,10 @@ _pmb_recommends="$_pmb_recommends
 	wayland-utils
 	xdpyinfo
 	"
+options="!check pmb:systemd" # No tests for a metapkg
+subpackages="$pkgname-systemd"
 install="$pkgname.post-install $pkgname.post-upgrade"
-options="!check" # No tests for a metapkg
+source="50-plasma-desktop.preset"

 package() {
 	mkdir -p "$pkgdir"
@@ -57,3 +59,13 @@ extras() {

 	mkdir -p "$subpkgdir"
 }
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+
+	install -Dm644 "$srcdir"/50-plasma-desktop.preset \
+		-t "$subpkgdir"/usr/lib/systemd/system-preset/
+}
+sha512sums="
+cc1e6a1c53b9552f93a5a8b2b8e3d10723274c3e30d388f59c498fa7ee8ea4a3be0a6eee7a50558fd1e83fac540456fa300044380ca8dd6db62069c30c431482  50-plasma-desktop.preset
+"
@@ -8,6 +8,7 @@ if [ -f ${SDDM_CONF} ]; then
 	fi
 fi

-rc-update add sddm default
-rc-update add networkmanager default
-rc-update add bluetooth default
+if command -v rc-update >/dev/null; then
+	rc-update add modemmanager default
+	rc-update add sddm default
+fi
@@ -0,0 +1,2 @@
+enable modemmanager
+enable plasma-mobile
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-plasma-mobile
 pkgver=5
-pkgrel=1
+pkgrel=3
 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration)"
 url="https://wiki.postmarketos.org/wiki/Plasma_Mobile"
 arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807
@@ -29,15 +29,16 @@ _pmb_recommends="
 	spacebar
 	ttyescape
 	"
-install="$pkgname.post-install $pkgname.post-upgrade"
 source="
+	50-plasma-mobile.preset
+	plasma-mobile.service
 	kscreenlockerrc
 	maliit-plasmamobile.json
 	org.kde.phone.homescreen.js
 	"
-subpackages="$pkgname-extras"
+subpackages="$pkgname-extras $pkgname-openrc $pkgname-systemd"
 replaces="plasma-mobile"
-options="!check pmb:gpu-accel"
+options="!check pmb:gpu-accel pmb:systemd"

 package() {
 	install -Dm644 \
@@ -72,8 +73,33 @@ extras() {
 	mkdir -p "$subpkgdir"
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="
+		modemmanager-openrc
+		tinydm
+		tinydm-openrc
+		"
+
+	mkdir -p "$subpkgdir"
+}
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+
+	install -Dm644 "$srcdir"/plasma-mobile.service \
+		"$subpkgdir"/usr/lib/systemd/system/plasma-mobile.service
+
+	install -Dm644 "$srcdir"/50-plasma-mobile.preset \
+		-t "$subpkgdir"/usr/lib/systemd/system-preset/
+}
+
+

 sha512sums="
+27e7a1ee0ac34736490adcd3043d175d30bafbbb166934f90599c6424c94598cd75480ed475d0ba47ea7546fa73326fa39ff7b8f3a509d15fd3be510dc1f36e7  50-plasma-mobile.preset
+e12d8e98e28a795f879aebcceb32a991ee4abcb3bc5ec458aa5378bb52ff86cf39be04bc4a196925f532d623304b3005f561fa5e55d1c87944d718058ec4c0e6  plasma-mobile.service
 b3aa8ee26c01de103c0c0af23532bf232f7071fdd02c53bd787d78e5974faa5662fc5776ce9be417392214ae73334b0eb0d073fe24f616a0ce99081f30b9158c  kscreenlockerrc
 70ee87860842057b557a433a9ae7d54653f076a612b3d9de2d413d598806d23ec19390262eaa398cddf39437f1213d14922402a8d978878e5e98f3767ce0b9eb  maliit-plasmamobile.json
 50dbb5e0b1550776ca6fc5b91468412b23d49aa502af77cf7d5d15af11eaf61b1632b205f42eac3274bf28a0b7b278a4d6bfc98c6c12ea29830fd258bad5107d  org.kde.phone.homescreen.js
@@ -0,0 +1,58 @@
+[Unit]
+Description=Open-source user interface for phones, based on Plasma technologies
+Documentation=https://invent.kde.org/plasma-mobile
+
+# replaces the getty
+Conflicts=getty@tty1.service
+After=getty@tty1.service
+
+# Needs all the dependencies of the services it's replacing
+# (currently getty@tty1.service):
+After=rc-local.service plymouth-quit-wait.service systemd-user-sessions.service
+
+OnFailure=getty@tty1.service
+
+# D-Bus is necessary for contacting logind. Logind is required.
+Wants=dbus.socket
+After=dbus.socket
+
+# This scope is created by pam_systemd when logging in as the user.
+# This directive is a workaround to a systemd bug, where the setup of the
+# user session by PAM has some race condition, possibly leading to a failure.
+# See README for more details.
+After=session-c1.scope
+
+# Since we are part of the graphical session, make sure we are started before
+# it is complete.
+Before=graphical.target
+
+# Prevent starting on systems without virtual consoles
+ConditionPathExists=/dev/tty0
+
+[Service]
+Environment=LANG=C.UTF-8
+ExecStart=/usr/bin/startplasmamobile
+TimeoutStartSec=30
+User=10000
+PAMName=login
+WorkingDirectory=~
+Restart=always
+RestartSec=5s
+
+# A virtual terminal is needed.
+TTYPath=/dev/tty7
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
+
+# Fail to start if not controlling the tty.
+StandardInput=tty-fail
+StandardOutput=journal
+StandardError=journal
+
+# Log this user with utmp, letting it show up with commands 'w' and 'who'.
+UtmpIdentifier=tty7
+UtmpMode=user
+
+[Install]
+WantedBy=graphical.target
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+rc-update add modemmanager default
+rc-update add tinydm default
+
+tinydm-set-session -s /usr/share/wayland-sessions/plasma-mobile.desktop
@@ -0,0 +1 @@
+postmarketos-ui-plasma-mobile-openrc.post-install
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-rc-update add bluetooth default
-rc-update add elogind default
-rc-update add hfd-service default
-rc-update add iio-sensor-proxy default
-rc-update add networkmanager default
-rc-update add modemmanager default
-rc-update add tinydm default
-rc-update add urfkill default
-
-
-# Migrate from the old ofono setup
-if rc-update del ofono default; then
-	rc-update del ofono-auto-enable default
-	rc-service stop ofono
-	rc-service stop ofono-auto-enable
-
-	rc-service start modemmanager
-fi
-
-tinydm-set-session -s /usr/share/wayland-sessions/plasma-mobile.desktop
-
-glib-compile-schemas /usr/share/glib-2.0/schemas
@@ -1 +0,0 @@
-postmarketos-ui-plasma-mobile.post-install
@@ -2,7 +2,7 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-ui-sway
 pkgver=3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm (DOES NOT RUN WITHOUT HW ACCELERATION!)"
 url="https://postmarketos.org"
 arch="noarch"
@@ -15,7 +15,6 @@ depends="
 	polkit-elogind
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
-	pulseaudio
 	sway
 	swaybg
 	tinydm
@@ -44,7 +44,7 @@ _pmb_recommends="
 	"
 provides="postmarketos-ui-sxmo"
 provider_priority=5
-options="!check" # has no tests
+options="!check pmb:systemd-never"

 package() {
 	mkdir -p "$pkgdir"
@@ -49,7 +49,7 @@ _pmb_recommends="
 	"
 provides="postmarketos-ui-sxmo"
 provider_priority=10
-options="!check" # has no tests
+options="!check pmb:systemd-never"

 package() {
 	mkdir -p "$pkgdir"
@@ -2,7 +2,7 @@
 # Maintainer: Jakko <jahau@rocketmail.com>
 pkgname=postmarketos-ui-xfce4
 pkgver=0.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="(X11) Lightweight desktop (stylus recommended)"
 url="https://gitlab.com/postmarketOS/xfce4-phone"
 arch="noarch"
@@ -32,7 +32,6 @@ _pmb_recommends="
 	pavucontrol
 	pm-utils
 	postmarketos-artwork-wallpapers
-	pulseaudio
 	unclutter-xfixes
 	xfce4-notifyd
 	xfce4-pulseaudio-plugin
@@ -2,14 +2,16 @@

 pkgname=gnome-shell-mobile
 pkgver=45_git20240426
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME shell"
 url="https://wiki.gnome.org/Projects/GnomeShell"
-arch="all !armhf !s390x !riscv64" # gjs / riscv64: mutter-mobile
+# gjs / riscv64: mutter-mobile
+arch="all !armhf !s390x !riscv64"
 license="GPL-2.0-or-later"
 depends="
 	accountsservice
 	adwaita-icon-theme
+	desktop-file-utils
 	elogind
 	font-adobe-source-code-pro
 	font-cantarell
@@ -23,6 +25,7 @@ depends="
 	ibus
 	librsvg
 	networkmanager-common
+	tecla
 	unzip
 	upower
 	"
@@ -53,6 +56,7 @@ makedepends="
 	python3
 	sassc
 	startup-notification-dev
+	tecla-dev
 	"
 checkdepends="
 	xvfb-run
@@ -60,7 +64,13 @@ checkdepends="
 	"
 	# gdm is also needed but introduces circular dep
 provides="gnome-shell=$pkgver-r$pkgrel"
-subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang $pkgname-schemas::noarch"
+subpackages="
+	$pkgname-dbg
+	$pkgname-doc
+	$pkgname-lang
+	$pkgname-schemas::noarch
+	gnome-mobile-extensions-app:extensions_app:noarch
+	"
 _commit="3a352e95bf540d663f35554ee2de5dcd1ff408bc"
 _gvc_commit="8e7a5a4c3e51007ce6579292642517e3d3eb9c50"
 source="mobile-shell-$_commit.tar.gz::https://gitlab.gnome.org/verdre/mobile-shell/-/archive/$_commit/mobile-shell-$_commit.tar.gz
@@ -69,6 +79,8 @@ source="mobile-shell-$_commit.tar.gz::https://gitlab.gnome.org/verdre/mobile-she
 	gsh.patch"
 builddir="$srcdir/mobile-shell-$_commit"
 options="!check" # Tests have circular dependency 'gnome-shell <-> gdm'
+# To make sure pmb_recommends installs the correct one
+_pmb_recommends="gnome-mobile-extensions-app"

 # secfixes:
 #   0:
@@ -94,6 +106,19 @@ check() {
 	xvfb-run meson test --no-rebuild -v -C output
 }

+extensions_app() {
+	provides="gnome-extensions-app=$pkgver-r$pkgrel"
+	pkgdesc="Manage GNOME Shell extensions"
+	depends="gnome-shell-mobile libadwaita"
+	replaces="gnome-shell-mobile"
+
+	amove usr/bin/gnome-extensions-app
+	amove usr/share/applications/org.gnome.Shell.Extensions.desktop
+	amove usr/share/gnome-shell/org.gnome.Extensions
+	amove usr/share/gnome-shell/org.gnome.Extensions.data.gresource
+	amove usr/share/gnome-shell/org.gnome.Extensions.src.gresource
+}
+
 schemas() {
 	pkgdesc="GNOME Shell gsetting schemas"
 	depends=""
@@ -2,7 +2,7 @@

 pkgname=iio-sensor-proxy
 pkgver=9999
-pkgrel=2
+pkgrel=3
 pkgdesc="IIO sensors to D-Bus proxy"
 url="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 arch="aarch64"
Author	SHA1	Message	Date
Clayton Craft	fe8a3397ce	main/postmarketos-base: add systemd preset trigger Re-apply presets when presets are added/modified/removed	2024-05-29 13:42:00 -07:00
Clayton Craft	d64c887751	main/postmarketos-ui-gnome-mobile: add systemd preset	2024-05-29 11:56:03 -07:00
Clayton Craft	77e1744324	main/postmarketos-ui-gnome: add systemd preset	2024-05-29 11:56:02 -07:00
Clayton Craft	0e2acf0663	main/postmarketos-ui-phosh: add systemd preset	2024-05-29 11:56:02 -07:00
Clayton Craft	cb30033a43	main/postmarketos-ui-plasma-desktop: add systemd preset This also: - Drops the openrc subpkg since we can handle common post-install stuff and enabling the openrc services in the main pkg's post-install script instead. - Doesn't enable MM by default (maybe a mistake earlier? Bart requested this change)	2024-05-29 11:56:02 -07:00
Clayton Craft	5ca27fa226	main/postmarketos-ui-plasma-mobile: add systemd preset This also: - Enables MM by default (requested by Bart)	2024-05-29 11:55:39 -07:00
Clayton Craft	95abf0dab1	main/postmarketos-base-ui-gnome: add systemd preset	2024-05-29 11:46:25 -07:00
Clayton Craft	9d6bcda638	main/postmarketos-base-ui-plasma: add systemd preset Also: - remove NM and bluez from systemd autostart (these are handled now by pmos-base-ui presets) - move dependency on bluez-openrc to the openrc subpkg	2024-05-29 11:46:25 -07:00
Clayton Craft	b1faf40d39	main/postmarketos-base-ui: use systemd presets - systemd presets added for services that should autostart OOTB on systemd for various subpackages/configs, for all UIs - post-install scripts that run rc-update only do so when the cmd is present (so this is a no-op on systemd) - systemd-specific subpackages are used, since abuild does not (yet?) support splitting systemd packages automatically. If/when it does, these could be dropped! - Added dependency on systemd-timesyncd when on systemd, for (S)NTP	2024-05-29 11:46:25 -07:00
Oliver Smith	3126954b45	cross/grub-efi-x86: upgrade to 2.12-r5	2024-05-29 00:26:57 +02:00
Oliver Smith	2d1d38e73f	cross/musl-*: upgrade to 1.2.5-r1	2024-05-29 00:26:57 +02:00
Oliver Smith	b4f51af7c8	cross/busybox-static-*: upgrade to 1.36.1-r28	2024-05-29 00:26:57 +02:00
Clayton Craft	59b83d7847	main/postmarketos-ui-: remove hardcoded dependency on pulseaudio (MR 5145) This allows the audio switching backend stuff to work on all UIs (see !5072 / `87d355e08`). For example, users of any UI can switch audio backends by installing one of the pmos-base-ui-audio- metapackages. [ci:skip-build] already built successfully in CI	2024-05-28 13:15:59 -07:00
Clayton Craft	96e61da7a2	main/postmarketos-base-ui: audio backend improvements (MR 5145) - Merge pulseaudio and audio-pulse subpkgs Just general cleanup, there's no reason to have a separate pulseaudio subpackage now since both were being installed anyways (one indirectly depended on the other) - Add 'none' option for audio backend Some users might not want to have an audio backend installed taking up disk space. For example they're running a headless server or just don't want audio I/O, and PA + dependencies, which include mesa(!!) can be a lot... I measured 208MB Note about drop the pulseaudio subpkg and it's "provides="... This was done in `6e325417`, when pmos-base-ui was split off from pmos-base (3 years ago). I'm not sure how many people are still rocking a 3yo pmOS install, but the original package (see `92e43e83`) was only pulled in by install_if, so I think the chance that it's in someone's world file would be really really low.	2024-05-28 13:15:55 -07:00
Clayton Craft	d20a7944bf	main/postmarketos-base-ui-gnome: add weather app to pmb_recommends (MR 5149) [ci:skip-build] already built successfully in CI [ci:skip-vercheck]	2024-05-28 12:07:42 -07:00
Clayton Craft	564429192e	main/postmarketos-ui-gnome: add snapshot to recommends (MR 5149) Snapshot is a useful camera app, currently only useful on webcams and that's why I added it here and not in the base-ui-gnome package	2024-05-28 11:17:20 -07:00
Clayton Craft	1f32b78940	main/postmarketos-base-ui-plasma: enable NM for systemd post-install (MR 5171) [ci:skip-vercheck] [ci:skip-build]: already built successfully in CI	2024-05-28 09:33:54 -07:00
Oliver Smith	333f5f77ce	main/postmarketos-ui-sxmo-*: set pmb:systemd-never (MR 5171) Sxmo maintainers have decided to stay with OpenRC on postmarketOS. Set this option, so pmbootstrap doesn't even ask the user if they want to install Sxmo with systemd. The idea is that users don't end up reporting issues about this unsupported use case.	2024-05-28 09:33:52 -07:00
Bart RibbersandClayton Craft	d0b1579cc7	main/postmarketos-ui-plasma-*: support openrc and systemd installs (MR 5171) Co-authored-by: Clayton Craft <clayton@craftyguy.net>	2024-05-28 09:33:29 -07:00
Sam DayandClayton Craft	7f16b13781	main/postmarketos-ui-phosh: support openrc and systemd installs (MR 5171) Also see: MR 4904 Co-authored-by: Clayton Craft <clayton@craftyguy.net>	2024-05-28 09:33:29 -07:00
Caleb ConnollyandClayton Craft	b18ccab0f5	main/postmarketos-base-ui-gnome: split openrc depends to -openrc subpackage (MR 5171) Allow this package to be used on systemd installs without pulling in a bunch of openrc services. Signed-off-by: Caleb Connolly <caleb@postmarketos.org> Co-authored-by: Clayton Craft <clayton@craftyguy.net>	2024-05-28 09:33:29 -07:00
Caleb Connolly	d35091be52	main/postmarketos-base-ui: initial support for systemd (MR 5171) Not sure if dropping the networkmanager-openrc dependency causes issues. Otherwise, make the elogind subpackage conflict with systemd-logind. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-05-27 13:54:35 -07:00
Stefan Hansson	924c47e1d6	linux-postmarketos-qcom-sm8250: disable CONFIG_RT_GROUP_SCHED (MR 5178) The community check now mandates that this is turned off. Closes https://gitlab.com/postmarketOS/pmaports/-/issues/2848 [ci:skip-build]: already built successfully in CI	2024-05-27 22:50:45 +02:00
Stefan Hansson	fcf8026c83	CI: use latest (stable) Alpine instead of Edge (MR 5174) Alpine 3.20 has released now which should contain everything we need to run our CI. Closes https://gitlab.com/postmarketOS/pmaports/-/issues/2747 [ci:skip-build]: already built successfully in CI	2024-05-27 13:33:23 -07:00
Clayton Craft	d163a56a66	community/lenovo-21bx: move to community (MR 5156) [ci:skip-vercheck] [ci:skip-build] already built successfully in CI	2024-05-27 13:30:13 -07:00
Clayton Craft	cb34a47985	device-lenovo-21bx: Add Jane as co-maintainer (MR 5156)	2024-05-27 13:30:12 -07:00
Clayton Craft	015a3299fa	device/lenovo-21bx: remove Konrad as maintainer (MR 5156) He did an awesome job adding an initial port for this device but hasn't helped to maintain it, so I'm removing him from the list of active maintainers.	2024-05-27 13:29:43 -07:00
Clayton Craft	fd16f66e4f	main/postmarketos-config-nftables: add openrc subpkg (MR 5172) For installing openrc-specific dependencies, specifically nftables-openrc which is needed because the post-install enables the openrc service and expects the initd script to be available then [ci:skip-build] already built successfully in CI	2024-05-27 13:27:16 -07:00
Pablo Correa Gómez	aaa7d267a2	temp/gnome-shell-mobile: rename extensions app to add "mobile" (MR 5176) And add it to pmb_recommends. This way new installations with pmb_recommends will force install the correct version. [ci:skip-build]: already built successfully in CI	2024-05-27 13:23:45 -07:00
Pablo Correa Gómez	5e865cde7e	temp/gnome-shell-mobile: sync with upstream APKBUILD (MR 5176) Most remarkably, in addition to cleaning up a bit, add the gnome-extensions-app subpackage. Fixes #2844	2024-05-27 13:23:45 -07:00
Adam Thiede	006256a0d0	linux-postmarketos-mediatek-mt8173: upgrade to 6.9.2 (MR 5179) [ci:skip-build]: already built successfully in CI	2024-05-27 08:50:10 +02:00
Sergey Lisov	dc948f885a	samsung-a6lte: add workaround for Wi-Fi not connecting (MR 5175) Shamelessly stolen from https://wiki.postmarketos.org/wiki/Samsung_Galaxy_J7_Pro_(samsung-j7y17lte)#Notes_on_WiFi	2024-05-26 10:23:12 +09:00
Dylan Van Assche	6cfa3caffe	temp/iio-sensor-proxy: rebuild against libssc 0.1.5 (MR 5173) See https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/66530	2024-05-26 10:09:36 +09:00
Luca Weiss	568cac3585	firmware-fairphone-fp5: upgrade to 20240417 (MR 5169) [ci:skip-build]: already built successfully in CI	2024-05-25 08:38:38 +02:00
Luca Weiss	fe27e85609	firmware-fairphone-fp4: upgrade to 20240313 (MR 5170) And remove the compatibility symlinks again, all kernels running now should use the .mbn files already. [ci:skip-build]: already built successfully in CI	2024-05-24 15:46:27 +02:00
Luca Weiss	cf513281f9	linux-postmarketos-qcom-msm8974: upgrade to 6.9.1 (MR 5159) Manual config changes: * QCOM_APCS_IPC=y * RT_GROUP_SCHED=n (community check) [ci:skip-build]: already built successfully in CI	2024-05-23 09:25:03 +02:00
Luca Weiss	4d18a89f6f	linux-postmarketos-qcom-msm8226: upgrade to 6.9.1 (MR 5166) Manual config changes: * BMC150_ACCEL=m [ci:skip-build]: already built successfully in CI	2024-05-23 08:46:15 +02:00
				`@@ -0,0 +1 @@`
				`postmarketos-base-ui-gnome-openrc.post-install`
				`@@ -0,0 +1 @@`
				`postmarketos-base-ui-plasma-openrc.post-install`
				`@@ -0,0 +1 @@`
				`postmarketos-ui-plasma-mobile-openrc.post-install`