.ci/autoupdate.sh

@@ -83,7 +83,7 @@ update_linux_next() {
 
 	# Commit
 	git add device/testing/linux-next/APKBUILD
-	git commit -S -m "linux-next: update to $latest"
+	git commit -S -m "linux-next: upgrade to $latest"
 }
 
 # For testing

CODEOWNERS

@@ -127,6 +127,7 @@ device/*/u-boot-pinephone/			@Arnavion @PsychoGame
 device/*/wl1251-cal/				@Danct12
 main/postmarketos*gnome*/			@pabloyoyoista @Newbyte
 main/postmarketos-initramfs/			@calebccff @craftyguy
+main/postmarketos-ui-i3wm/			@fossdd
 main/postmarketos-ui-phosh/			@pabloyoyoista @Newbyte
 main/postmarketos-ui-plasma-mobile/		@PureTryOut
 main/shutdown-clear-rtc-wakealarm/		@Arnavion

device/archived/device-samsung-coreprimevelte-downstream/APKBUILD

@@ -4,12 +4,12 @@
 pkgname=device-samsung-coreprimevelte-downstream
 pkgdesc="Samsung Galaxy Core Prime VE LTE downstream"
 pkgver=1
-pkgrel=0
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="mkbootimg linux-samsung-coreprimevelte-downstream postmarketos-base pxa-mkbootimg u-boot-tools"
+depends="mkbootimg linux-samsung-coreprimevelte-downstream postmarketos-base postmarketos-initramfs-minimal pxa-mkbootimg u-boot-tools"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo 90-coreprimevelte.conf"
@@ -25,7 +25,7 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Wi-Fi firmware"
-	depends="firmware-samsung-pxa1908"
+	depends="firmware-samsung-pxa1908-downstream"
 	mkdir "$subpkgdir"
 }
 

device/community/device-fairphone-fp4/81-libssc-fairphone-fp4.rules

+# iio-sensor-proxy with libssc: accelerometer mount matrix
+
+SUBSYSTEM=="misc", KERNEL=="fastrpc-*", ENV{ACCEL_MOUNT_MATRIX}+="-1, 0, 0; 0, -1, 0; 0, 0, -1"

device/community/device-fairphone-fp4/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Luca Weiss <luca@z3ntu.xyz>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=2
-pkgrel=4
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
 	bootmac
+	firmware-fairphone-fp4-adreno
+	firmware-fairphone-fp4-adsp
+	firmware-fairphone-fp4-bluetooth
+	firmware-fairphone-fp4-cdsp
+	firmware-fairphone-fp4-hexagonfs
+	firmware-fairphone-fp4-ipa
+	firmware-fairphone-fp4-modem
+	firmware-fairphone-fp4-wlan
+	firmware-qcom-adreno-a630
+	hexagonrpcd
+	hexagonrpcd-openrc
+	linux-firmware-ath10k
 	linux-postmarketos-qcom-sm6350
 	make-dynpart-mappings
 	mesa-vulkan-freedreno
 	mkbootimg
+	msm-modem
+	msm-modem-uim-selection
+	pd-mapper
+	pd-mapper-openrc
 	postmarketos-base
 	qbootctl
 	qbootctl-openrc
 	swclock-offset
+	tqftpserv
+	tqftpserv-openrc
 "
 makedepends="devicepkg-dev"
+replaces="hexagonrpcd-openrc"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
+	81-libssc-fairphone-fp4.rules
 	90-feedbackd-aw8695.rules
 	deviceinfo
+	hexagonrpcd.confd
 	modules-initfs
 	"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -37,33 +55,18 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 
+	install -Dm644 "$srcdir"/81-libssc-fairphone-fp4.rules \
+		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-fairphone-fp4.rules
 	install -Dm644 "$srcdir"/90-feedbackd-aw8695.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-aw8695.rules
-}
-
-nonfree_firmware() {
-	pkgdesc="Firmware for Modem, WiFi, etc."
-	depends="
-		firmware-fairphone-fp4-adreno
-		firmware-fairphone-fp4-adsp
-		firmware-fairphone-fp4-bluetooth
-		firmware-fairphone-fp4-cdsp
-		firmware-fairphone-fp4-ipa
-		firmware-fairphone-fp4-modem
-		firmware-fairphone-fp4-wlan
-		firmware-qcom-adreno-a630
-		linux-firmware-ath10k
-		msm-modem
-		msm-modem-uim-selection
-		pd-mapper
-		tqftpserv
-		"
-	install="$subpkgname.post-install"
-	mkdir "$subpkgdir"
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
 }
 
 sha512sums="
+2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp4.rules
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
 9549f105f865d230e7b67819c96b7e06a5ed4d5808f083099a408934ffbacdb412984b861f6756fa4fde94b51e6a268b8d2ce9fed6f13ee3e8041bb96492310a  deviceinfo
+6a3d620f2cc60308a62ff651ffb00a5ee1f092131cca9d33b6afd61c8a372a3fd7d46540162213593107e0943b33f3f0119d003d43dcd06dbde757390a6c1729  hexagonrpcd.confd
 52bb7ed829caa4dcff9728bd6e3cdf118b3c7ee7dfe90df0d4e6422dd67bf3258ae2a4d2dc7599da4182fbd8eb47a0e1d20c58198dc17f2bf178b8f01a8887f7  modules-initfs
 "

device/community/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install

-#!/bin/sh
-rc-update add tqftpserv boot
-rc-update add pd-mapper boot

device/community/device-fairphone-fp4/device-fairphone-fp4.post-install

 #!/bin/sh
+rc-update add hexagonrpcd-adsp-sensorspd default
+rc-update add pd-mapper boot
 rc-update add qbootctl default
+rc-update add tqftpserv boot

device/community/device-fairphone-fp4/hexagonrpcd.confd

+# Fairphone 4 specific hexagonrpcd firmware directory
+hexagonrpcd_fw_dir="/usr/share/qcom/sm7225/Fairphone/fairphone4"

device/community/firmware-fairphone-fp4/APKBUILD

 pkgname=firmware-fairphone-fp4
 pkgver=20240313
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Fairphone 4"
 subpackages="
 	$pkgname-adreno
 	$pkgname-adsp
 	$pkgname-bluetooth
 	$pkgname-cdsp
+	$pkgname-hexagonfs
 	$pkgname-ipa
 	$pkgname-modem
 	$pkgname-venus
@@ -16,8 +17,8 @@ url="https://github.com/FairBlobs/FP4-firmware"
 arch="aarch64"
 license="proprietary"
 makedepends="pil-squasher"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="d95bd920afa9084cefe0f69be931a5421e544154"
+options="!check !strip !archcheck !tracedeps textrels pmb:cross-native"
+_commit="222756885ff5eb24ee89684ef8cfe860a45a54ec"
 source="https://github.com/FairBlobs/FP4-firmware/archive/$_commit/FP4-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP4-firmware-$_commit"
 
@@ -68,10 +69,24 @@ cdsp() {
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
 }
 
+hexagonfs() {
+	pkgdesc="Fairphone 4 hexagonfs files"
+
+	mkdir -p "$subpkgdir"/usr/share/qcom/sm7225/Fairphone/
+	cp -r "$builddir"/hexagonfs/ \
+		"$subpkgdir"/usr/share/qcom/sm7225/Fairphone/fairphone4
+
+	# Remove files that we don't need - for now
+	rm -r "$subpkgdir"/usr/share/qcom/sm7225/Fairphone/fairphone4/acdb/
+	rm -r "$subpkgdir"/usr/share/qcom/sm7225/Fairphone/fairphone4/dsp/
+
+	find "$subpkgdir/usr/share/qcom/sm7225/Fairphone/fairphone4/" \
+		-type f -exec chmod 0644 {} \;
+}
+
 ipa() {
 	pkgdesc="Fairphone 4 ipa firmware"
 
-	cd "$builddir"
 	install -Dm644 "$builddir"/lagoon_ipa_fws.mbn \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/ipa_fws.mbn"
 }
@@ -105,5 +120,5 @@ wlan() {
 }
 
 sha512sums="
-3839431922c6250fa76c563183387edbc1370f34d833d5d7c6c08f0d921c0498c93ff376af5d43fecf78d4ac6aff3b90e41345310181826b0a21507dbfba778c  FP4-firmware-d95bd920afa9084cefe0f69be931a5421e544154.tar.gz
+b6836a8770c089615698ec26d397530c75086457c309d7220265da1203f2b06c4021d5a872244ad1e5a4a19d0d8192c13ae2051538e24d1df5292480daa6309d  FP4-firmware-222756885ff5eb24ee89684ef8cfe860a45a54ec.tar.gz
 "

device/community/firmware-motorola-osprey/APKBUILD

-# Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=firmware-motorola-osprey
 pkgver=4
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Motorola Moto G 2015"
 url="https://github.com/pmsourcedump/firmware-motorola-osprey"
 subpackages="$pkgname-wcnss $pkgname-wcnss-nv:wcnss_nv $pkgname-venus"

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

-# Maintainer: Luca Weiss <luca@z3ntu.xyz>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
 
 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
-pkgver=6.9.0
+pkgver=6.9.7
 pkgrel=0
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
@@ -54,6 +54,6 @@ package() {
 }
 
 sha512sums="
-f7c4ce6385ee1f57551cd370ed48d89d138b442daf4934f10273fa86ac25f4ee743be606254c139c19fd5b74cc6739de89e49ff7568ad310c483cad2042adecc  linux-v6.9.0-sm6350.tar.gz
-0e3e1ff83a8064a8371c45b36be66a4773a70955df702f948e0426d596c805de585a972ba206f483a956bf40eafe3d409181b9eecd76a3170216186bb57a8cff  config-postmarketos-qcom-sm6350.aarch64
+2d432d2e9cf681c55a8406d1c9122ebdde8fdd0dee12815b785bfc9446527bec25a812b297e88d893685fa32b45afd752ae13ae2c28bf6e53f9699e4f7021dae  linux-v6.9.7-sm6350.tar.gz
+893f1612c691687f77eee626dddaab9d06bfe7a60a4b2ea2a224110bdfb127dc731767d0df775767f72dc5f2ca94c88637dd387e0574afceee81ec6b9c854d93  config-postmarketos-qcom-sm6350.aarch64
 "

device/community/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64

 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.9.0 Kernel Configuration
+# Linux/arm64 6.9.7 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
@@ -5377,6 +5377,7 @@ CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SIG=y
 CONFIG_CRYPTO_SIG2=y
 CONFIG_CRYPTO_SKCIPHER=y
 CONFIG_CRYPTO_SKCIPHER2=y

device/main/device-purism-librem5/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 _confver=64
 _purismrel=1
 # <librem5-base ver>.<purism release>
@@ -17,6 +17,7 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf
 	bluez
+	bluez-deprecated
 	bm818-tools
 	gnss-share
 	i2c-tools
@@ -206,7 +207,7 @@ a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f
 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616  xorg.conf
 fad386071fc45f9880a94cc8004fabd5d98b3e6a12606c98d8e72e0208f22ab54f03b921f5967a959782507e2bff67d2fa92e46d8cd242011a3afcdbda529279  70-librem5-xwayland-accel.sh
 b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378  0001-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
-d9ebb7acddce8005909505b245140913ea3096a3ab8658ecbe2bf905953ba51aed4188b1d006d4d5bfd10c5e0ebca0150fec67d8c6d156d105021e9e4598b878  l5-brcm-bt-enable.initd
+177ec87ec1f110d7c4253a20375c6771c6cfac41057b02bd673caea5399a799a59c5e087037fccf7a104447e6890499a2194aa34bab14df203fa95168ced75d7  l5-brcm-bt-enable.initd
 f4b314d553655f7975445ac0a33099923e20dabb082c07e2cf6a78e4118c143d777dd4ad2c09cbc388600bdefe8deb3073fbd15b238772ddf09c66ac46415590  l5-lockdown-support.initd
 c723764d507ccd4b04aa5ce79b1d1ebc131873cdc37a943cb0f92b8a08a3c69eb9e0d31fcd4589fd8c40a9676bae9897e4f12ec2ebe4db8214ac85669ef35a53  l5-ship-mode.initd
 e089b0c4320c8cb5a6bd1e85f12b6afb24d035958f2bdc7a8ed2cee5b0f379e6fdfad876d8d22c03c9cb0576b4aa7c20c3e9986ba8147500add6d93b44e5f266  modemmanager.conf

device/main/device-purism-librem5/l5-brcm-bt-enable.initd

 #!/sbin/openrc-run
 name="Purism Librem 5 Sparklan brcm bluetooth enabler"
 supervisor=supervise-daemon
-command="/usr/bin/btattach"
-command_args="-B /dev/ttymxc3 -P bcm"
+command="/usr/bin/hciattach"
+command_args="-s 115200 /dev/ttymxc3 bcm43xx 1500000"

device/main/device-qemu-riscv64/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Minecrell <minecrell@minecrell.net>
-# Co-Maintainer: Luca Weiss <luca@z3ntu.xyz>
+# Co-Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-qemu-riscv64
 pkgver=2
 pkgrel=2

device/main/firmware-pine64-ov5640/APKBUILD

-# Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=firmware-pine64-ov5640
 pkgver=0_git20201028
-pkgrel=1
+pkgrel=2
 _commit="61beaa4eb1ad87ad067cfbe123fbcd0a0cf01246"
 pkgdesc="Firmware for the ov5640 autofocus"
 url="https://github.com/pmsourcedump/ov5640"

device/main/firmware-pine64-rtl8723bt/APKBUILD

-# Maintainer: Martijn Braam <martijn@brixit.nl>
-# Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=firmware-pine64-rtl8723bt
 pkgver=0_git20200705
-pkgrel=1
+pkgrel=2
 _commit="8840b1052b4ee426f348cb35e4994c5cafc5fbbd"
 pkgdesc="Firmware for rtl8723bs and rtl8723cs"
 url="https://github.com/anarsoul/rtl8723bt-firmware/"

device/main/linux-postmarketos-allwinner/APKBUILD

@@ -3,9 +3,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=6.9.0_git20240514
+pkgver=6.9.7_git20240630
 pkgrel=0
-_tag="orange-pi-6.9-20240514-1047"
+_tag="orange-pi-6.9-20240630-2043"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -81,9 +81,9 @@ package() {
 }
 
 sha512sums="
-f820b6757172a0c829488689d9c68a0575aba853b3d190776dac7e21aad3251ed3c392dd48fa3a6596f9ef0ece932104fd957b630386fdbd6ed6f77f90d3a745  linux-postmarketos-allwinner-orange-pi-6.9-20240514-1047.tar.gz
-71b21bb873d304f9f11cb3744301fc4d14c9120d31f44cbf327db4760fb2824d0629077ba9e1f654a516b40fddb9b9e6f2e559636833c9e7e844480a3e5062d7  config-postmarketos-allwinner.aarch64
-978ff33539f0f3cc27e0b1b33377def5445986de3abbfeb3325e341d68f063212bc92edbf7bcafc21ed5b55cc7c0c5e68d1f2a3fa3bb39eae889ddb5c89e4dde  config-postmarketos-allwinner.armv7
+51523e96919d817a14a3b2e9f149e7f0f2b33edac1f5a9c6b72cc31fa69c4d66632404d5851253ad83fa60eb4f56278c50bcd8ba1aca0133ca1796bfdde677e0  linux-postmarketos-allwinner-orange-pi-6.9-20240630-2043.tar.gz
+ed33e7d190d8acee5f8a66ba203dfa04831a14af939d76538f26d0802c47a3145ff44edc9d4a3aa15adbb39ffddbb5edf453c1c69ede9b4ea7cc48d982bf0b6b  config-postmarketos-allwinner.aarch64
+930dab0c58b3885fe6a808b17b470f6a9e26f475e28453c05ec323637ef808465778a2da8487f9db734a2e8bd6d40d6b9e434df12bad61fcf85821ef7391dd5f  config-postmarketos-allwinner.armv7
 a1fe1a21c34062eb92b6a4a9d2ef330d0e745859af283ccf05fc899ec263f9d452c1399c29620a0e4c748eca4b0c13645668b2fc0dc72f5703426d472f1294be  0001-dts-add-dontbeevil-pinephone-devkit.patch
 0ef26b34fa834c119ebff6daa27b1dd3fac27448d6a40c0b2022a00c239dad0ef3e2b3ab3f9eec5460f921c9c6ea21db360adc175a7e658d5c34c5d0aacc498f  0002-dts-add-pinetab-dev-old-display-panel.patch
 d37d929100a9de9431cc3cef6b714b61b5af9633e35a2880fcc8b60279fdc9ab65198fa70d01e070a9f263818d994b9b851973bb079ddea1ca66d2b7964f365d  0003-dts-pinetab-add-missing-ohci1.patch

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64

 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.9.0 Kernel Configuration
+# Linux/arm64 6.9.7 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
@@ -6184,6 +6184,7 @@ CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SIG=y
 CONFIG_CRYPTO_SIG2=y
 CONFIG_CRYPTO_SKCIPHER=y
 CONFIG_CRYPTO_SKCIPHER2=y

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7

 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.9.0 Kernel Configuration
+# Linux/arm 6.9.7 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
@@ -5976,6 +5976,7 @@ CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SIG=y
 CONFIG_CRYPTO_SIG2=y
 CONFIG_CRYPTO_SKCIPHER=y
 CONFIG_CRYPTO_SKCIPHER2=y