device-oneplus-lemonade: use boot image header v1

Using header v1 and appended dtb simplifies a lot of things. It now
requires flashing dtbo with an empty file of at least 2 bytes, erasing
it might also work. As well as erasing vendor_boot.

It may still be necessary to flash vbmeta.

Signed-off-by: Caleb Connolly <caleb@connolly.tech>

.ci/grep.sh

@@ -45,10 +45,3 @@ if grep --exclude='source_deviceinfo' -qEr 'source /etc/deviceinfo|\. /etc/devic
 	grep --color=always --exclude='rootfs-usr-share-misc-source_deviceinfo' -Er 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *
 	exit 1
 fi
-
-# Removed deviceinfo variable
-if grep -qr 'deviceinfo_modules_initfs' -- *; then
-	echo 'ERROR: deviceinfo_modules_initfs variable has been removed. Use "modules-initfs" file instead.'
-	grep --color=always -r 'deviceinfo_modules_initfs' -- *
-	exit 1
-fi

.ci/shellcheck.sh

@@ -48,5 +48,5 @@ sh_files="
 for file in $sh_files; do
 	echo "Test with shellcheck: $file"
 	cd "$DIR/$(dirname "$file")"
-	shellcheck -e SC1008 -e SC3043 -x "$(basename "$file")"
+	shellcheck -e SC1008 -x "$(basename "$file")"
 done

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=8
+pkgrel=4
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-89b28ab6e676d9c789375a85840c1f1062670992e4e44199c01d2356c439ab4d07c24ea5251d96388e150eb1343d0043a97316128b9603ad3ecb40dfa80e9072  busybox-static-1.36.1-r8-aarch64-edge.apk
+c0ea71bcec70e35de3dcb919c22c02afe7e35b3168845209e93bcd15ff380d62dc807848e36e1e5fef22c16adbbdfc1dc3a3559015d0c4a3b2978e0e303d4413  busybox-static-1.36.1-r4-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=8
+pkgrel=4
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-b9909d463d65476b6ef5766ccf0b5c432f5d6a0209aaef9cb1b838633e8128fd1ddecc821cc63743f9db1f2136b8884ed19986430549660bb89008dd98f986f6  busybox-static-1.36.1-r8-armhf-edge.apk
+701ee52541aee37a075563c430b891860afd205e4446379a4686b3eac57ce8443c1203b06fb90f146c88064e00d99101c86d0d8b3a91377e465d46958c942366  busybox-static-1.36.1-r4-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=8
+pkgrel=4
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-40094ff8b8d45fce75ff872f94cc24da5129c1b2a28da2a7336dd6995ca973cb595d0a46f6346d55c862fb72c6c517fe00f6d6d7b20c604f644d1f8c4fc1afb0  busybox-static-1.36.1-r8-armv7-edge.apk
+e01fdc7edfe06b9b8c30acb0df90f026c49982d378724c8afd4e545f5ab7e9d317a9fd8e1e7ae06d3f89e3ddf5e572ad3f7d2d033225f195d5bc7530e6e4bcd2  busybox-static-1.36.1-r4-armv7-edge.apk
 "

cross/crossdirect/APKBUILD

@@ -1,6 +1,3 @@
-# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
-# https://wiki.postmarketos.org/wiki/Pmbootstrap:_Cross_Compiling
-#
 # Wrapper for the "crossdirect" compilation method.
 # pmbootstrap mounts the native chroot in the foreign arch (e.g. armhf) chroot
 # as /native. This package gets installed into the native chroot, and creates
@@ -19,7 +16,7 @@
 # version is implemented as simple shell wrappers.
 
 pkgname=crossdirect
-pkgver=5.1.0
+pkgver=5
 pkgrel=0
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
@@ -79,10 +76,9 @@ package() {
 		ln -s ../rustc.sh rustc
 	done
 }
-
 sha512sums="
 0f4b48f250425dc57f63955fc8b38477d23db793bee367c3fbe03c3d2a559ba576434d07518310db4cae9d90d501af4051b80038b10fae94b980e537fc9374ad  cargo.sh
 500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
-de2aa6929bbff5db9132673e667f4525b333d062cb1f7a0597dd924de9e5c7215a9f8e2e6263b6fb5ace06f2c4b64f4ebfd0ede9b78add07c2cd08ec8613e98f  rustc.sh
+2c41410a9ef2dab31403545e55e2464f2ee4e7056ffbcd3bc5810d582311801496b88d55307f17ce6acf766e9c867d30d05f2b0d8d46bf77a5e8f0495d6bc24e  rustc.sh
 ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh
 "

cross/crossdirect/rustc.sh

@@ -5,15 +5,8 @@ if [ -n "$CROSSDIRECT_DEBUG" ]; then
 fi
 
 # return the correct host architecture when cargo requests it
-if [ "$*" = "-vV" ] || [ "$*" = "-V" ]; then
-	exec /usr/bin/rustc "$*"
-fi
-
-# pmbootstrap installs sccache when building a rust program, unless --no-ccache
-# is set. In that case it also sets CCACHE_DISABLE.
-SCCACHE=/native/usr/bin/sccache
-if ! [ -e "$SCCACHE" ] || [ -n "$CCACHE_DISABLE" ]; then
-	SCCACHE=""
+if [ "$*" = "-vV" ]; then
+	exec /usr/bin/rustc -vV
 fi
 
 # We expect the right target to be set in the arguments if compiling for the
@@ -21,17 +14,12 @@ fi
 # automatically. If no target is provided, this is probably a macro or a
 # build script, so it should be compiled for the native architecture.
 if echo "$*" | grep -qFe "--target"; then
-	# Not using sccache when building for foreign architecture, as it
-	# doesn't cache the output with "Non-cacheable reasons: --sysroot"
-	LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
-		/native/usr/bin/rustc \
+	LD_LIBRARY_PATH=/native/lib:/native/usr/lib /native/usr/bin/rustc \
 		-Clinker=/native/usr/lib/crossdirect/rust-qemu-linker \
 		--sysroot=/usr \
 		"$@"
 else
-	PATH=/native/usr/bin:/native/bin \
-	LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
-		$SCCACHE \
+	PATH=/native/usr/bin:/native/bin LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
 		/native/usr/bin/rustc \
 		-Clink-arg=-Wl,-rpath,/native/lib:/native/usr/lib \
 		"$@"

cross/gcc-aarch64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=2
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -428,7 +428,6 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 
 	ln -s gcc "$pkgdir"/usr/bin/cc
-	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
 
 	if $LANG_JIT; then
 		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common

cross/gcc-armhf/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=2
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -428,7 +428,6 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 
 	ln -s gcc "$pkgdir"/usr/bin/cc
-	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
 
 	if $LANG_JIT; then
 		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common

cross/gcc-armv7/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=2
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -428,7 +428,6 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 
 	ln -s gcc "$pkgdir"/usr/bin/cc
-	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
 
 	if $LANG_JIT; then
 		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common

cross/gcc-riscv64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-riscv64
-pkgrel=2
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -428,7 +428,6 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 
 	ln -s gcc "$pkgdir"/usr/bin/cc
-	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
 
 	if $LANG_JIT; then
 		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common

cross/musl-aarch64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-aarch64
-pkgver=1.2.4_git20230717
-pkgrel=2
+pkgver=1.2.4
+pkgrel=6
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-4c09316bf7c43332911bd845c1c737fdb032f1c05103db52d7a84a823d3e0ce8aeb2767e544c6121a9b77f64e38d60b98c19a079299ff16cbd79331364a3cc52  musl-1.2.4_git20230717-r2-aarch64-edge.apk
-eb509419fda2d08096b147a66fe4a412d0d5341d26ed78dfacc4aef90b02277072b7b1865f5843386f9c73500eb2984a28252519fe2c264aafe95e4ead2dd8d2  musl-dev-1.2.4_git20230717-r2-aarch64-edge.apk
+8de3c16bb4eb20e8b06f1a4b4aa494fe08b55ccb243bf3ab8972454b158b29debf0d0e137ccb7b838ea0580917d21d7a9c7170fd3d603c2ba940048a1c97ee1f  musl-1.2.4-r6-aarch64-edge.apk
+2030151102c2445f55d1c841f54283e86e8d5440fec220a7a90b3e50e35aa624a01b76dc7659fb7dbd40175c10051ba8793515d7403518dafe3a7e39069ebc42  musl-dev-1.2.4-r6-aarch64-edge.apk
 "

cross/musl-armhf/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-armhf
-pkgver=1.2.4_git20230717
-pkgrel=2
+pkgver=1.2.4
+pkgrel=6
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-3cf75f7d646b721359620549c429025d944d88a57146633b4ca3b9ae4019fcfa2701ceeeb8c93ffa992ff29f19914bb6c6478ef1002032bd046bbd78a244203b  musl-1.2.4_git20230717-r2-armhf-edge.apk
-e7f64f165e5ca3a36dfc233ca10d9609772e29c51a40e0d2dcae518179b4c2f9c86d09884d82e5767fef82ea55bacf5169fd6028f30ca68ba27d984713f37241  musl-dev-1.2.4_git20230717-r2-armhf-edge.apk
+73486b70e66b5dc717bd9b4543996c68449c611b97574a893b990999cabe0531e46645aa403076edbbfdbd3a22f26ef61faf39fa7229fa59a706e5fa9d2d63c3  musl-1.2.4-r6-armhf-edge.apk
+f3d3b71b4f77504e8144d1659e8e05bde18d89dc60502eb947ebee387ed3109c6515175dfd71a9ab5eb478413ed7c13f1cb7789fc6395ba3e6edacc3312564d5  musl-dev-1.2.4-r6-armhf-edge.apk
 "

cross/musl-armv7/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-armv7
-pkgver=1.2.4_git20230717
-pkgrel=2
+pkgver=1.2.4
+pkgrel=6
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-ea0bb9d0b3bf8b36d2e3e12430c1cc21b4e722d3a162fced049dcb8a5f9089c324695c10e8cec181cba73c3c83fc6c9b5b70f38509c60127a6e9bcd6621dca37  musl-1.2.4_git20230717-r2-armv7-edge.apk
-80b71f862149d9d28df52eb73ea1f42d387fe400a5982f751e64323713be86dcb53a7492ea6b24fa56ac0d8e518f07dcc6341b9a026d06c144fe6bbf83bb4b2e  musl-dev-1.2.4_git20230717-r2-armv7-edge.apk
+31378f327c915a1d110f9763b33004ce62e78ef81db5f1fad3d0296f997cc178608dec202f61181034c8588634ba102859721342d1aab7bb14349346eed96f97  musl-1.2.4-r6-armv7-edge.apk
+f62ef6e6dda116e409fb46bea99af3fcc8c04622b1950706fe0fa02a4bf65fbde5bad3147e6f506899c2c279afa588641207a2695f285394f3b65c53574a6ee0  musl-dev-1.2.4-r6-armv7-edge.apk
 "

cross/musl-riscv64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-riscv64
-pkgver=1.2.4_git20230717
-pkgrel=2
+pkgver=1.2.4
+pkgrel=6
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-76da75cb9de40f521ece5518980e28a8bdc7ee108229f574d9e7c61bc7956eae7f8ecf226b93fdd8d5d75ca9392cf6e0fe8b6f8044bfb07a8253ce6082689ca0  musl-1.2.4_git20230717-r2-riscv64-edge.apk
-7faed112e8b521c469acb7aad062beff8637be8ae403d856f3c1c678ce9921239ad4fdbaa196ca7abad88fc8952038627a3c4c741e5368a6de66ea7eb1440f51  musl-dev-1.2.4_git20230717-r2-riscv64-edge.apk
+b6e005d34c75fd0e3de17d7ce37042202daad3d58a24f02ee48544b2a4743f58918cf54db026f6f17288e9b70fc6da4dd60857d815d98a4989b087e8a562e564  musl-1.2.4-r6-riscv64-edge.apk
+8231dca1300b2e141761e982e10e42f6a5558c6b229dd7fcdec476310fd2d768e00cabb27f947c91ad360cf74d53ea73d298e572c1ee2397b8ee6e6467a4fcb5  musl-dev-1.2.4-r6-riscv64-edge.apk
 "

device/community/device-arrow-db410c/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-arrow-db410c
 pkgdesc="Arrow DragonBoard 410c"
 pkgver=3
-pkgrel=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 _pmb_select="soc-qcom-msm8916-rproc"
 
@@ -32,6 +32,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-b8bb88f11bf7f5889a0159e63fac5e38e7ca68a11aa3b89294ee6bc4f6f56a02964d213ce418d7bd5231fb977e4d62a555d587807f5a3ad0d40fb1b5798a6f7d  deviceinfo
-ccd6758cb4954eb0a96c7fb15e732e8147414f8edc498d9faf7d04ddef85d817733669ec1a6003e623e8392f3f6bb85f71160efe4e82f27e300d58aa6f5c8549  modules-initfs
+a75bcb772637cc87c6eacb593e684b8fd8307203f6371dd73c9ac90ee6231a6bef80e0a8b33f072da8cb350d0001388950fc050c2c17122220f506c661399b6a  deviceinfo
 "

device/community/device-arrow-db410c/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_codename="arrow-db410c"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/apq8016-sbc"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="display-connector adv7511 msm"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-arrow-db410c/modules-initfs

@@ -1,3 +0,0 @@
-display-connector
-adv7511
-msm

device/community/device-asus-me176c/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
 pkgver=6
-pkgrel=3
+pkgrel=1
 _commit=3155254999ac36c3051a2118c415de25a072c0f6
 url="https://postmarketos.org"
 license="MIT"
@@ -21,7 +21,6 @@ depends="
 makedepends="devicepkg-dev meson eudev-dev"
 source="https://github.com/me176c-dev/linux-me176c/archive/$_commit.tar.gz
 	deviceinfo
-	modules-initfs
 	phoc.ini
 	sof-workaround.conf
 	"
@@ -83,8 +82,7 @@ libva() {
 
 sha512sums="
 75243e3d0bc9a352465683ec8cf8b83566e4131bb7fae0f388267a62bdbf4691c955ed034b30df550f921b771080688123ae8db144b72f786bf1677ef1d83f57  3155254999ac36c3051a2118c415de25a072c0f6.tar.gz
-966d864a951e066180cf44131bfa866cae4f0a272f0f28a882a0af38d7698f7974744e1f34c631a7138f8f5204737d578b665d3010cf145badc0308630f52a40  deviceinfo
-9e9998420a23ae5ff955e0c860913ace9b2228ddd4bb041b3fe86df4611572ed3303e9d483797b1381696094a99cb5f82b3812fe3287025607224bc6e138cbc5  modules-initfs
+2f5bc546336673452413948d3bbed6af45ef08f0b568b6398739a4c6a918e8b4c358191f0a8c84efccde490d559883ceab4ba81dfcf30593f3552dd867930ab5  deviceinfo
 3823556d741a352fc7f43567d7218255a27c45c2c5d4d4bdf23f4d26ce2828c5a1c642519b84fef7f59756c990e6a199d72e6ba0c277939b08a40526c3ff3714  phoc.ini
 3d0dd014ac7c2700c4ceb7adf549b96dd0eaa7e75bc4ebee7aab23dc31679edc822e9f6ab0e51a1500459e7f04683c00b5a5c600aa2e13a61697e415ad4a019d  sof-workaround.conf
 "

device/community/device-asus-me176c/deviceinfo

@@ -6,6 +6,7 @@ deviceinfo_name="ASUS MeMO Pad 7 (ME176C(X))"
 deviceinfo_codename="asus-me176c"
 deviceinfo_manufacturer="ASUS"
 deviceinfo_year="2014"
+deviceinfo_modules_initfs="gpio-crystalcove intel_crystal_cove_charger 8250_dw x86-android-tablets mmc_block sdhci_acpi phy-tusb1210 dwc3 dwc3-pci goodix_ts"
 deviceinfo_arch="x86_64"
 
 # Device related

device/community/device-asus-me176c/modules-initfs

@@ -1,10 +0,0 @@
-gpio-crystalcove
-intel_crystal_cove_charger
-8250_dw
-x86-android-tablets
-mmc_block
-sdhci_acpi
-phy-tusb1210
-dwc3
-dwc3-pci
-goodix_ts

device/community/device-bq-paella/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
-pkgver=7
-pkgrel=1
+pkgver=6
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+source="deviceinfo"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
@@ -38,6 +38,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-b33c075d49febd0bcff4c696214e39f134f7e05dc4770f60bfff52fb7e7b432b53ef69803ac32957e921d45cb7a35cc205112f6691dbdfd1a5032c89d34789fa  deviceinfo
-ebf6a40372329116a25df1407e671365bb2bf0613f61f0a572fc77890fb0a1760259ab35ed9f002ef2a5c6ee8836bc7bbeb50bf5ac3de14c11e6d96872ad3644  modules-initfs
+285087d1309c7bc6d4c11aaf4c89f754e5386cb53e1ab5ee6cfabe8fefa5ad95042d0b55fa12d2615df0bd82b668c6131435d8b770fa751ca5f6bd464e3bdecb  deviceinfo
 "

device/community/device-bq-paella/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_codename="bq-paella"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-longcheer-l8910"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="smb1360 panel-longcheer-yushun-nt35520 panel-longcheer-truly-otm1288a msm himax-hx852x"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-bq-paella/modules-initfs

@@ -1,6 +0,0 @@
-smb1360
-panel-longcheer-truly-otm1288a
-panel-longcheer-yushun-nt35520
-panel-longcheer-yushun-nt35521s
-msm
-himax-hx852x

device/community/device-fairphone-fp4/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=1.2
-pkgrel=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -23,7 +23,6 @@ install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	90-feedbackd-aw8695.rules
 	deviceinfo
-	modules-initfs
 	gtk.css
 	phoc.ini
 	"
@@ -73,8 +72,7 @@ phosh() {
 
 sha512sums="
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
-e223df827d1d18507197d64fc409f527514f7f76b68f784811b7b59452260dbd72133c85277b1e7df38b0058e0f16ac0d1174104a193b7f6c8dcf64577863eba  deviceinfo
-285dcb0011a2114e83621811a4204dfae4310ff9312f727d2cbf5d10712fe7fae7a20f636fc02b7794a41af67864a42d04f8c2f7e241f9f5182827d0a0556179  modules-initfs
+75c47a29ee990845826c5c3f0829a59b210345b79de109572c3d3d15828cc4f5bd8ed5e79c5be22f9af36c5ddb276ed49685c0c4691bbccd720c8b80eef224cc  deviceinfo
 25a93dcbe6dbc6cff24f57cbf5539bc475c5fe0f6bf5e8374c7032b9c38a939bef0aa0cde1707afcc16b1ec2d0859c03c6ee92d80d8048d1c6adc6e25178b85f  gtk.css
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "

device/community/device-fairphone-fp4/deviceinfo

@@ -9,6 +9,7 @@ deviceinfo_codename="fairphone-fp4"
 deviceinfo_year="2021"
 deviceinfo_dtb="qcom/sm7225-fairphone-fp4"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="msm panel-hx83112a-auo"
 deviceinfo_arch="aarch64"
 deviceinfo_flash_kernel_on_update="true"
 

device/community/device-fairphone-fp4/modules-initfs

@@ -1,2 +0,0 @@
-msm
-panel-hx83112a-auo

device/community/device-google-gru/APKBUILD

@@ -1,59 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Jenneron <jenneron@protonmail.com>
-pkgname=device-google-gru
-pkgdesc="Google Gru Chromebooks"
-pkgver=5
-pkgrel=5
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	alsa-ucm-conf-google-gru
-	depthcharge-tools
-	eudev-hwids>=3.2.12-r0
-	linux-postmarketos-rockchip
-	postmarketos-base
-	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
-	soc-rockchip-rk3399
-"
-makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo modules-initfs"
-
-# provides and replaces to switch old installations to this package
-provides="
-	device-google-dru=$pkgver-r$pkgrel
-	device-google-druwl=$pkgver-r$pkgrel
-	device-google-dumo=$pkgver-r$pkgrel
-	device-google-kevin=$pkgver-r$pkgrel
-	device-google-bob=$pkgver-r$pkgrel
-"
-replaces="
-	device-google-dru
-	device-google-druwl
-	device-google-dumo
-	device-google-kevin
-	device-google-bob
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="WiFi/BT and DP firmware"
-	depends="linux-firmware-ath10k linux-firmware-qca linux-firmware-mrvl linux-firmware-rockchip"
-	mkdir "$subpkgdir"
-}
-
-
-sha512sums="
-bf5d1d687e5dd4231eea758611799bfb2aef8caf3314e9469093bf7158ed85dd3aa2fd7894a1a97542a076ddd2ca8a735e54b012f6bee9522fea85d8556a8b90  deviceinfo
-a750a0c41068082e0b82351d5aec91715e1a5215b09b26fec644dfe259cea2d662e878433a732a8c06dab2a9b420baec2bcc6161d8357cf3ed770239c5165090  modules-initfs
-"

device/community/device-google-gru/modules-initfs

@@ -1,8 +0,0 @@
-gpu-sched
-panel-innolux-p079zca
-panel-kingdisplay-kd097d04
-elants-i2c
-elan-i2c
-atmel-mxt-ts
-cros-ec-keyb
-sbs-battery

device/community/device-google-kukui/APKBUILD

@@ -1,79 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Jenneron <jenneron@protonmail.com>
-pkgname=device-google-kukui
-pkgdesc="Google Kukui Chromebooks"
-pkgver=6
-pkgrel=3
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	alsa-ucm-conf-google-kukui
-	depthcharge-tools
-	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
-	postmarketos-base
-	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
-	soc-mediatek-mt8183
-"
-makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-
-# provides and replaces to switch old installations to this package
-provides="
-	device-google-burnet=$pkgver-r$pkgrel
-	device-google-cerise=$pkgver-r$pkgrel
-	device-google-cozmo=$pkgver-r$pkgrel
-	device-google-damu=$pkgver-r$pkgrel
-	device-google-fennel=$pkgver-r$pkgrel
-	device-google-fennel14=$pkgver-r$pkgrel
-	device-google-juniper=$pkgver-r$pkgrel
-	device-google-kakadu=$pkgver-r$pkgrel
-	device-google-kappa=$pkgver-r$pkgrel
-	device-google-katsu=$pkgver-r$pkgrel
-	device-google-kenzo=$pkgver-r$pkgrel
-	device-google-kodama=$pkgver-r$pkgrel
-	device-google-krane=$pkgver-r$pkgrel
-	device-google-makomo=$pkgver-r$pkgrel
-	device-google-stern=$pkgver-r$pkgrel
-	device-google-willow=$pkgver-r$pkgrel
-"
-replaces="
-	device-google-burnet
-	device-google-cerise
-	device-google-cozmo
-	device-google-damu
-	device-google-fennel
-	device-google-fennel14
-	device-google-juniper
-	device-google-kakadu
-	device-google-kappa
-	device-google-katsu
-	device-google-kenzo
-	device-google-kodama
-	device-google-krane
-	device-google-makomo
-	device-google-stern
-	device-google-willow
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="WiFi/BT firmware"
-	depends="linux-firmware-ath10k linux-firmware-qca linux-firmware-mediatek"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-4c7f6c37afbf2fbd9169f158dc8ab2c29599a3eb1f945b51c46dfb3a385ee007c3524b8c689dfc19f51f4e850ec87550f7af6ab3c0590ba713ba14f549a3efb2  deviceinfo
-8e95624610dae7d18684056396c9e82635ddce7303d6770e965f9372ffa101fdfd5f8337bc7368004890e9836798663a98c142c52ed63795877ea37ac8da56af  modules-initfs
-"

device/community/device-google-kukui/deviceinfo

@@ -1,34 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Google Kukui Chromebook"
-deviceinfo_manufacturer="Google"
-deviceinfo_codename="google-kukui"
-deviceinfo_year="2020"
-deviceinfo_dtb="mediatek/mt8183-kukui*"
-deviceinfo_arch="aarch64"
-
-# Device related
-# chassis does not make sense here, will probably be removed (pmb#2255)
-deviceinfo_chassis="convertible"
-deviceinfo_keyboard="true"
-deviceinfo_external_storage="true"
-deviceinfo_gpu_accelerated="true"
-
-# Bootloader related
-deviceinfo_kernel_cmdline="console=null"
-deviceinfo_flash_method="none"
-deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
-deviceinfo_cgpt_kpart_start="8192"
-deviceinfo_cgpt_kpart_size="65536"
-# We are supposed to use "kukui" board here, but lazor dts does
-# not include kukui compatible which results in loading a wrong
-# dtb. "mt8183" board may result in including dtbs that are for
-# mt8183 but not related to Chrome OS devices which would increase
-# image size. This doesn't happen for us because we provide only 
-# dtbs from deviceinfo_dtb variable and nothing more, so use "mt8183"
-# board here.
-deviceinfo_depthcharge_board="mt8183"
-deviceinfo_generate_depthcharge_image="true"

device/community/device-google-kukui/modules-initfs

@@ -1,11 +0,0 @@
-atmel-mxt-ts
-cros-ec-keyb
-elan-i2c
-elants-i2c
-gpu-sched
-hid-generic
-hid-multitouch
-i2c-hid-of
-i2c-hid-of-goodix
-i2-hid-of
-sbs-battery

device/community/device-google-oak/modules-initfs

@@ -1,6 +0,0 @@
-i2c-hid-of
-hid-multitouch
-elants-i2c
-elan-i2c
-melfas-mip4
-cros-ec-keyb

device/community/device-google-peach-pit/modules-initfs

@@ -1,6 +0,0 @@
-drm-dp-aux-bus
-panel-edp
-drm-kms-helper
-cros-ec-keyb
-sbs-battery
-tps65090-charger

device/community/device-google-snow/modules-initfs

@@ -1,6 +0,0 @@
-drm-dp-aux-bus
-panel-edp
-drm-kms-helper
-cros-ec-keyb
-sbs-battery
-tps65090-charger

device/community/device-google-trogdor/modules-initfs

@@ -1,6 +0,0 @@
-i2c-hid-of
-i2c-hid-of-goodix
-elan-i2c
-elants-i2c
-cros-ec-keyb
-sbs-battery

device/community/device-google-veyron/APKBUILD

@@ -1,59 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Jenneron <jenneron@protonmail.com>
-pkgname=device-google-veyron
-pkgdesc="Google Veyron Chromebooks"
-pkgver=5
-pkgrel=4
-url="https://postmarketos.org"
-license="MIT"
-arch="armv7"
-options="!check !archcheck"
-depends="
-	alsa-ucm-conf>=1.2.7.1-r0
-	depthcharge-tools
-	linux-google-veyron
-	postmarketos-base
-	postmarketos-cros-common
-	postmarketos-update-depthcharge-kernel
-"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
-
-# provides and replaces to switch old installations to this package
-provides="
-	device-google-veyron-fievel=$pkgver-r$pkgrel
-	device-google-veyron-jaq=$pkgver-r$pkgrel
-	device-google-veyron-jerry=$pkgver-r$pkgrel
-	device-google-veyron-mickey=$pkgver-r$pkgrel
-	device-google-veyron-mighty=$pkgver-r$pkgrel
-	device-google-veyron-minnie=$pkgver-r$pkgrel
-	device-google-veyron-speedy=$pkgver-r$pkgrel
-	device-google-veyron-tiger=$pkgver-r$pkgrel
-"
-replaces="
-	device-google-veyron-fievel
-	device-google-veyron-jaq
-	device-google-veyron-jerry
-	device-google-veyron-mickey
-	device-google-veyron-mighty
-	device-google-veyron-minnie
-	device-google-veyron-speedy
-	device-google-veyron-tiger
-"
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="WiFi/BT firmware"
-	depends="linux-firmware-mrvl firmware-google-veyron-brcm"
-	mkdir "$subpkgdir"
-}
-
-
-sha512sums="
-5c63bb90fce9fdbc61eedcd6fe0772e731baf0262ec195bc946f8d24cbea630b1e487e030d0557cea9029ca4abfc0d6724b5e21a0fd9e9f3f22d78baa7eec535  deviceinfo
-be3e804fa538d9d377c637094dcf95e503e8a156fa71676a9e78abc0e290595dfdaa70b5642df721ebcdd3daa04d14e0c61d9bab6f78cb1dbd669404abc3a56d  modules-initfs
-"

device/community/device-google-veyron/modules-initfs

@@ -1,18 +0,0 @@
-analogix-dp
-cros-ec
-cros-ec-keyb
-cros-ec-spi
-drm-dp-aux-bus
-drm-kms-helper
-dw-mipi-dsi
-dw-wdt
-elants-i2c
-gpio-charger
-gpu-sched
-panel-edp
-phy-rockchip-dp
-pwm-bl
-pwm-rockchip
-rockchipdrm
-sbs-battery
-videobuf2-dma-sg

device/community/device-lenovo-a6000/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
 pkgver=7
-pkgrel=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs phoc.ini"
+source="deviceinfo phoc.ini"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
@@ -46,7 +46,6 @@ phosh() {
 }
 
 sha512sums="
-9e9c07835778b92178b8057df5530915a58f8aeb729274e24025a0ba8ee563269836f7790ad40f055fd85564dfa14a812306a6e7caf35369f5ffb522d2004611  deviceinfo
-d433b8376b6e89daf4eac2073cb33627bdcacdcd48b6d4990cc698627dcf3c951bb1874951bc4631ea6b89d22c6002b9d02b77ff24992106061fcecc22fa5f25  modules-initfs
+a73d36985ea77bf01493e8a4dae0e437a0e944254745d71fe8f6ecd5809497a7a93cbbddcde608d83fc5539def887feb0d9dd1920613acc51ec386f7dbdb0b1d  deviceinfo
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "

device/community/device-lenovo-a6000/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_codename="lenovo-a6000"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-wingtech-wt86518"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="pm8916-lbc pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-qimei-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-lenovo-a6000/modules-initfs

@@ -1,7 +0,0 @@
-pm8916-lbc
-pm8916-bms-vm
-panel-wingtech-yassy-ili9881
-panel-wingtech-qimei-ili9881
-panel-wingtech-tianma-hx8394d
-msm
-edt-ft5x06

device/community/device-lenovo-a6010/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
 pkgver=7
-pkgrel=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs phoc.ini"
+source="deviceinfo phoc.ini"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
@@ -46,7 +46,6 @@ phosh() {
 }
 
 sha512sums="
-94429cc24e90642b0110c10098eccff67ac585caf34471d1664a05a1bb55a9428cde35f776ffad64ebe02fce761c74c89d749e4be9ecd127db1e4ee8a2ff2435  deviceinfo
-258464e46872cf221f7ac367766f9b8ead5d5dccbd71f3df5a5555127a42448906247ff2519d1750eec53b3ed37ae96c2409369d7cb8e2fffeb202a8f69bba53  modules-initfs
+ab4d6460d45793c887b4e632b01e7a16a46b7aa3deee7d8b3c7bbc5d1397db54b492c212e15c49c588c1766a265882373324b3e861ce3e0258056a631220b4b5  deviceinfo
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "

device/community/device-lenovo-a6010/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_codename="lenovo-a6010"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-wingtech-wt86528"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-qimei-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-lenovo-a6010/modules-initfs

@@ -1,6 +0,0 @@
-pm8916-bms-vm
-panel-wingtech-yassy-ili9881
-panel-wingtech-qimei-ili9881
-panel-wingtech-tianma-hx8394d
-msm
-edt-ft5x06

device/community/device-motorola-harpia/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
 pkgver=8
-pkgrel=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+source="deviceinfo"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
@@ -41,6 +41,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-53b3a15b67cb81b50afb095172748e6c562a78854b83b59f519bb3915ffdcbc833b494336222f3005f5ac9c8d39afec03097a1ae9003d2f4478f3d0dfdf8d924  deviceinfo
-525a3e20672a7dff26b885b99ee157e0ece33efa10db34c90aed45dc47d7f1c2e90d7082dc84f2724892f199b5adaca04d5864f0aa1d1e4b8ea695f840346d60  modules-initfs
+9cf557543fe876ae42298c2e717298cd03888fadf2d43a2794b1c7b3e13310796a914d59fade9b5421fc3035fd4b69b94b0bb75d30c559386f0cbfee98300bc3  deviceinfo
 "

device/community/device-motorola-harpia/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_codename="motorola-harpia"
 deviceinfo_year="2016"
 deviceinfo_dtb="qcom/msm8916-motorola-harpia"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="panel-motorola-harpia-boe panel-motorola-harpia-tianma msm rmi-i2c"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-motorola-harpia/modules-initfs

@@ -1,4 +0,0 @@
-panel-motorola-harpia-boe
-panel-motorola-harpia-tianma
-msm
-rmi-i2c

device/community/device-nokia-n900/10-noroot-suspend

@@ -0,0 +1,2 @@
+%wheel ALL = NOPASSWD: /usr/sbin/pm-suspend
+

device/community/device-nokia-n900/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=9.2.1
-pkgrel=1
+pkgver=9.1
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -20,6 +20,7 @@ subpackages="
 source="
 	10-initfs-keymap.files
 	10-initfs-keymap.sh
+	10-noroot-suspend
 	acpi.map
 	acpi_handler.sh
 	asound.state.headset
@@ -27,7 +28,7 @@ source="
 	backlight-enable.sh
 	device-nokia-n900.start
 	deviceinfo
-	modules-initfs
+	i3wm/conky.conf
 	i3wm/i3blocks.conf
 	i3wm/i3wm.conf
 	i3wm/protip_shell.sh
@@ -41,17 +42,13 @@ source="
 	keymaps/rx51_it.map
 	keymaps/rx51_us.map
 	lock.sh
-	modem-load.conf
-	modem-opts.conf
 	modules.blocklist
 	n900-wlan-data.initd
 	pointercal
 	uboot-script.cmd
 	udev/10-nokia-modem.rules
 	udev/90-touchscreen-dev.rules
-	upower.conf
 	x11-keymap
-	xdefaults
 	xorg.conf
 "
 options="!check !archcheck"
@@ -118,11 +115,7 @@ package() {
 	install -D -m644 "$srcdir"/keymaps/rx51_se.bmap.gz \
 		"$pkgdir"/usr/share/bkeymaps/se/rx51_se.bmap.gz
 
-	# Kernel module management
-	install -D -m644 "$srcdir"/modem-load.conf \
-		"$pkgdir"/etc/modules-load.d/10-nokia-modem.conf
-	install -D -m644 "$srcdir"/modem-opts.conf \
-		"$pkgdir"/etc/modprobe.d/nokia-modem.conf
+	# Module blocklist
 	install -D -m644 "$srcdir"/modules.blocklist \
 		"$pkgdir"/etc/modprobe.d/n900-module-blocklist.conf
 
@@ -130,7 +123,7 @@ package() {
 }
 
 x11() {
-	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+	install_if="$pkgname xorg-server"
 	depends="xset xinput"
 	install -D -m644 "$srcdir"/40-xkb.conf \
 		"$subpkgdir"/etc/X11/xorg.conf.d/40-xkb.conf
@@ -148,8 +141,8 @@ xkeyboard_config() {
 }
 
 i3wm() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
-	depends="unclutter-xfixes feh i3blocks rxvt-unicode upower"
+	install_if="$pkgname postmarketos-ui-i3wm"
+	depends="unclutter-xfixes conky feh pm-utils i3blocks"
 	install -D -m644 "$srcdir"/i3wm.conf \
 		"$subpkgdir"/etc/skel/.config/i3/config
 	install -D -m644 "$srcdir"/i3blocks.conf \
@@ -164,15 +157,10 @@ i3wm() {
 		"$subpkgdir"/etc/skel/.config/i3blocks/wifi
 	install -D -m755 "$srcdir"/protip_shell.sh \
 		"$subpkgdir"/etc/skel/.protip_shell.sh
-	install -D -m644 "$srcdir"/xdefaults \
-		"$subpkgdir"/etc/skel/.Xdefaults
-}
-
-upower() {
-	install_if="$pkgname=$pkgver-r$pkgrel upower"
-	replaces="upower"
-	install -Dm644 "$srcdir"/upower.conf \
-		"$subpkgdir"/etc/UPower/UPower.conf
+	install -D -m644 "$srcdir"/conky.conf \
+		"$subpkgdir"/etc/skel/.config/conky/conky.conf
+	install -D -m440 "$srcdir"/10-noroot-suspend \
+		"$subpkgdir"/etc/sudoers.d/10-noroot-suspend
 }
 
 nonfree_firmware() {
@@ -187,18 +175,19 @@ nonfree_firmware() {
 sha512sums="
 6b475c12eca8563be48c562a1cb4ad8ca6a05d70fc54b21288b2dd7435a80a6f53351aa870db96d5bbecf1b1c5cb00dfe35f5066e6d3fd0ad0369e66aeef5a21  10-initfs-keymap.files
 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh
+38ecdf876b5aa9df2e5ea61c7ebb6f9ca871bdf433029808d028d563dfd740232b3dc21dba098a7622453212af1272e2e782be861b4a96a49fd475a618442d45  10-noroot-suspend
 b3612348af1465c6dc21ce30153fc7e2cce3ae7f9bf9ff34d5a560e173e174275c1701dd7c45337fa56caaadb252b9494bddf997a698d665d3a8c01cde6955c7  acpi.map
 ac2f8a50280f7d5f8c5ce3ab50d00f1a4c8c1415890347542c684b6e24874a23d57a8f48c62451c46466996decc58276d737bdb892f8b284881d3760948b09bb  acpi_handler.sh
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
 e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef  device-nokia-n900.start
-2463008d270ed09342f15b51f24ea455bd884021f95397991b85616b6840a6608d91cd1fc43186094f5c3d1bd25e88c16aa9ead07b018aea3d93cd2359bba0b1  deviceinfo
-f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
+a4e9196f8ca31fea6f74af078c1e1df1e7be89b63b5d0d292d7f198cfae5f30247dd002536f0f9251ed96518a54aa2b4783870046283e6cd30093115f60cce8e  deviceinfo
+16c31bf28b9dcc256821b153de199bd27decc76e4bde63130c1d1556a63cf2cafb64c4d4df42e00690564fce801c5216e8e97e4262a546440fd4bc2e14eaae1c  conky.conf
 826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f  i3blocks.conf
-2b26f551b86c5d71119a518d18b49c3c6a9a6cfcc1ce4f19bb533ce415c698b1b3f200071e3f54b1abb11d8ae1add348e0a3f01ce21805607dd7beebdebf72c0  i3wm.conf
+7e8a92b828a3cb823b8df0c67ff3cb72d220f2fdc4557a613ad051baaf7e6e3d0865cdfb5eadff7f4b04302ac650bc485863e26f4d54485d5a1c2389ac0793e3  i3wm.conf
 0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8  protip_shell.sh
-6c6a70667f37807089adbb343c09d1f62d47b8e6c9c0a54f44790b822f8bff3dccae73341ef736b799fd6740bbd6e1f48e6e122c2e08520f71f6ad7434a47d2c  battery-bq27200
+2ae4771eda9b151de3b47dc4e3081eb86b92fc04c4be4b4fbb98c28016762d24008e935bbba8f95ea0732019f615ee43f5d93dacb21bdc3471e505a07a684e26  battery-bq27200
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar
 82038d38f94cb975a8d38914afca49b64957446bef7490ab684efa1df47ede2ea1c769045789bb9fded673345eea01911fbbf85fdb54c28685cad8022bfaafac  ofono
 d7f79fa0887110b85dfb676bd426fa76764fbbb8093df89184552838ddb703b62500f61d7cfa8decdb75a542e3ef577cc71ee4c12ed14d6a76827a3f5aa13073  wifi
@@ -208,16 +197,12 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
 caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f  lock.sh
-157b27feebcfddf800a1ffd8c6e369d2b58e5db25b1a44b4443dada8d9fe74abb91d036b9f0e97769bbafbdc72020b5637313682c6932fe7b0bddb9ebebbad42  modem-load.conf
-695feac7f69a0ec8c5e007cdb651adcc3492f1c6236e7fd183edec2a5e25cb957d3ace630ea5fdb87fd703e35ac368f1d097c2f881ecb52c9cfd433564db2a6c  modem-opts.conf
-72b1554929843990a7665fdf1e45f7ef304fc45d3fa3b1082dcb9dd6cb9d3e9f6799659a8e2fdbd24a809319654543d1c20a0528856002c3de319d5546e2af8b  modules.blocklist
+b76958bcba6e704bdf06194998f05bc5c86c0678329438b784bd77eaac9cab352aadc912bda8f3780406ff50fd3e05f6d32d021c49987285d1c0dc05ad5e73c4  modules.blocklist
 b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66  n900-wlan-data.initd
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
-239a54ae5c5effb53ccf4d658652c0462da57604b16b77a63627a17caa171caf82e3d1769f9c5afea8756415acbbf3b73db9b57715fce6c70ea3f29e5c6ac84a  uboot-script.cmd
+9aaae66ae159236346f67818c44da61aed84a63b3bac0c706492f198db82fc67c2378bcabaf260b695b980bf2faf144472f15355bb097b021551db9547f2e1bc  uboot-script.cmd
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
-d46adf47194c02b434cb46751003e67ee008d60978458e69b1f59dc709a7135a70f542918c29e359ba8308bdeda58a21e8efa446d06625511af05403db90e455  upower.conf
 737d9e57e219a0220c5b1943375f325309323344fdf06973546c7d88ed9aec857657abd6b7861669873574f865e1c99719d411e0564dbfebe028f9e77d308491  x11-keymap
-19694204f2f370a4132762ac1888eaf5736939bba2f12ec2bccd18dde0645cdb621dda3a0772d2ef6d26a65d14e39a628e0d23321fe3064777ad2b76ce45ed2d  xdefaults
 a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef29f636f99c8f8da8b992f746eab6424aac04260c16158bcc2  xorg.conf
 "

device/community/device-nokia-n900/deviceinfo

@@ -9,6 +9,7 @@ deviceinfo_year="2009"
 deviceinfo_chassis="handset"
 deviceinfo_dtb="omap3-n900"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="tsc2005 tsc200x-core omap_wdt twl4030_wdt omap-sham"
 deviceinfo_arch="armv7"
 
 # Device related

device/community/device-nokia-n900/i3wm/conky.conf

@@ -0,0 +1,31 @@
+-- vim: ts=4 sw=4 noet ai cindent syntax=lua
+
+conky.config = {
+    alignment = 'middle_left',
+    background = false,
+    default_color = 'white',
+    default_outline_color = 'black',
+    draw_graph_borders = true,
+    draw_outline = true,
+    use_xft = true,
+    font = 'DejaVu Sans Mono:size=20',
+    default_bar_height = 6,
+    gap_x = 30,
+    gap_y = -50,
+    double_buffer = true,
+    out_to_console = false,
+    out_to_stderr = false,
+    extra_newline = false,
+    update_interval = 3.0,
+}
+
+conky.text = [[
+${if_running mpd}${if_mpd_playing}${mpd_title}
+${color gray}${mpd_artist}
+${mpd_bar}
+${else}postmarketOS
+${color gray}Linux ${kernel}
+${endif}${else}postmarketOS
+${color gray}Linux ${kernel}
+${endif}
+]]

device/community/device-nokia-n900/i3wm/i3wm.conf

@@ -1,4 +1,4 @@
-font pango:monospace 10
+font pango:monospace 8
 
 new_window 1pixel
 
@@ -28,12 +28,12 @@ mode "mpd" {
         bindsym Up exec mpc vol +2
         bindsym Down exec mpc vol -2
 
-        bindsym n exec urxvt -e ncmpcpp; mode "default"
+        bindsym n exec st -f "Liberation Mono-12" -e ncmpcpp; mode "default"
         bindsym q mode "command"
 }
 
 mode "command" {
-        bindsym t exec urxvt -e ~/.protip_shell.sh; mode "default"
+        bindsym t exec st -f "Liberation Mono-12" -e ~/.protip_shell.sh; mode "default"
         bindsym d exec dmenu_run; mode "default"
         bindsym q mode "default"
         bindsym k kill; mode "default"
@@ -63,12 +63,8 @@ bindsym Shift+space mode "command"
 # This is the slidey button on the side
 bindsym XF86ScreenSaver exec --no-startup-id lock.sh
 
-# Pressing the power button offers reboot, shutdown, or suspend choice
-bindsym XF86PowerOff exec --no-startup-id i3-nagbar \
-        -m 'Choose Power Button Action:' \
-        -B 'Reboot' 'loginctl reboot' \
-        -B 'Suspend' 'loginctl suspend' \
-        -B 'Shutdown' 'loginctl poweroff'
+# Pressing the power button suspends the device
+bindsym XF86PowerOff exec --no-startup-id sudo pm-suspend
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
@@ -91,3 +87,5 @@ exec_always --no-startup-id feh --bg-fill /usr/share/wallpapers/postmarketos.jpg
 # Hide mouse cursor
 exec --no-startup-id unclutter-xfixes --fork
 
+# Display various information on desktop (see conky config)
+exec --no-startup-id conky --daemonize

device/community/device-nokia-n900/i3wm/scripts/battery-bq27200

@@ -1,14 +1,37 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-3.0-only
-upower_batt="/org/freedesktop/UPower/devices/battery_bq27200_0"
-upower_data=$(upower -i "$upower_batt" 2> /dev/null)
-capacity=$(echo "$upower_data" | awk '/percentage/ {print $NF}')
-state=$(echo "$upower_data" | awk '/state/ {print $NF}')
-echo "$capacity"
-echo "$capacity"
 
-if [ "$state" = "charging" ] || [ "$state" = "fully-charged" ]; then
-        echo "#0099FF"
+# i3status wrapper for displaying correct battery status on N900/bq27200
+#
+# Author:
+# - Sicelo A. Mhlongo <absicsz@gmail.com> (2018)
+# - Martijn Braam <martijn@brixit.nl> (2019, updated for i3blocks)
+# Based on i3status/contrib/net-speed.sh by
+#
+# - Moritz Warning <moritzwarning@web.de> (2016)
+# - Zhong Jianxin <azuwis@gmail.com> (2014)
+#
+# See file LICENSE in the i3status root directory for license information.
+#
+
+battery_path="/sys/class/power_supply/bq27200-0/"
+
+read capacity < "${battery_path}capacity"
+read chg_full < "${battery_path}charge_full"
+read voltage < "${battery_path}voltage_now"
+read disch_rate < "${battery_path}current_now"
+
+if [[ "x$capacity" == "x" ]]; then
+	notification="$(( ( chg_full / 1000 ) ))mAh -- $(( ( voltage / 1000 ) ))mV @ $(( ( disch_rate / -1000 ) ))mA"
 else
-        echo "#FFFFFF"
+	notification="$capacity%/$(( ( chg_full / 1000 ) ))mAh -- $(( ( voltage / 1000 ) ))mV @ $(( ( disch_rate / -1000 ) ))mA"
 fi
+
+echo $notification
+echo $notification
+
+if [[ $disch_rate -gt 1 ]]; then
+	echo "#FFFFFF"
+else
+	echo "#0099FF"
+fi
+

device/community/device-nokia-n900/modem-load.conf

@@ -1 +0,0 @@
-nokia-modem

device/community/device-nokia-n900/modem-opts.conf

@@ -1 +0,0 @@
-options nokia-modem pm=1

device/community/device-nokia-n900/modules-initfs

@@ -1,7 +0,0 @@
-matrix_keymap
-omap_wdt
-omap-sham
-tsc2005
-tsc200x-core
-twl4030_keypad
-twl4030_wdt

device/community/device-nokia-n900/modules.blocklist

@@ -1,3 +1,11 @@
+# Modem is suspected to be partly responsible for dma crashes.
+# It is probably safe to probe manually later as needed
+blacklist omap_ssi
+blacklist nokia_modem
+blacklist ssi_protocol
+blacklist cmt_speech
+blacklist hsi_char
+blacklist hsi
 # rx51-battery is not absolutely necessary to running system, but can be
 # useful to keep around since it can detect battery design capacity
 blacklist rx51_battery

device/community/device-nokia-n900/uboot-script.cmd

@@ -2,7 +2,7 @@ setenv mmcnum 0
 setenv mmcpart 1
 setenv mmctype ext2
 setenv setup_omap_atag 1
-setenv bootargs init=/init.sh rw console=tty0 console=ttyS2 maxcpus=0 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
+setenv bootargs init=/init.sh rw console=tty0 console=ttyS2 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
 setenv mmckernfile /uImage
 setenv mmcinitrdfile /uInitrd
 setenv mmcscriptfile

device/community/device-nokia-n900/upower.conf

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

device/community/device-nokia-n900/xdefaults

@@ -1,4 +0,0 @@
-URxvt*foreground: White
-URxvt*background: Black
-URxvt*font: xft:DejaVu Sans Mono:style=Book:pixelsize=15:antialias=true:hinting=true
-URxvt*boldFont: xft:DejaVu Sans Mono:style=Bold:pixelsize=15:antialias=true:hinting=true

device/community/device-odroid-xu4/modules-initfs

@@ -1,5 +0,0 @@
-uas
-usb-storage
-scsi_mod
-sd_mod
-t10_pi

device/community/device-oneplus-enchilada/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=10
-pkgrel=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -21,7 +21,6 @@ depends="
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	modules-initfs
 	q6voiced.conf
 "
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -44,7 +43,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-71b4d74cebe22556b2c819fdb6b279366c9a566cb077f6e6e80c0c0b2e7c7fca48ea23ffbacca5cce4c636d8f3e66ad8f66ce36e954644242f6b5a71c89f9ed6  deviceinfo
-ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
+5a1771d1c2c70ae18e1ae11fe94617c5899995c3848c38f359232d587c076f36fb159bd654cfea0510a343e44c50b39d20148e650b1cbb3629d6fdc371ad8dc5  deviceinfo
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 "

device/community/device-oneplus-enchilada/deviceinfo

@@ -40,4 +40,5 @@ deviceinfo_initfs_compression="zstd:fast"
 deviceinfo_rootfs_image_sector_size="4096"
 
 # osk-sdl
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"

device/community/device-oneplus-enchilada/modules-initfs

@@ -1,4 +0,0 @@
-i2c_qcom_geni
-rmi_core
-rmi_i2c
-qcom_spmi_haptics

device/community/device-oneplus-fajita/10-unl0kr.conf

@@ -1,2 +0,0 @@
-[quirks]
-fbdev_force_refresh=true

device/community/device-oneplus-fajita/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=11
-pkgrel=1
+pkgver=10
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -20,9 +20,7 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr.conf
 	deviceinfo
-	modules-initfs
 	q6voiced.conf
 "
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -33,9 +31,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
 }
 
 nonfree_firmware() {
@@ -48,8 +43,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
-53f2c5223fd708990b7642c3c83a5a58388e810d179aa24fae4e9fe0f187008a32511c8294819f8933c3377a0c2ebd5512fb03a3900fde78662bd93d034338df  deviceinfo
-ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
+6884b6911cebea9a4ee9926b9af8a5670a298535abb774e935a780d7939a1956dfe23e5f596e442a75d62cba1083b4c85a2d657f16f2fc48b9d68e833af74f71  deviceinfo
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 "

device/community/device-oneplus-fajita/deviceinfo

@@ -40,4 +40,5 @@ deviceinfo_initfs_compression="zstd:fast"
 deviceinfo_rootfs_image_sector_size="4096"
 
 # osk-sdl
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"

device/community/device-oneplus-fajita/modules-initfs

@@ -1,4 +0,0 @@
-i2c_qcom_geni
-rmi_core
-rmi_i2c
-qcom_spmi_haptics

device/community/device-pine64-pinebookpro/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=16
-pkgrel=4
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,6 @@ depends="
 	linux-postmarketos-rockchip>=5.14
 	nvme-cli
 	postmarketos-base>=25-r1
-	soc-rockchip-rk3399
 	u-boot-pinebookpro
 	iw
 	"
@@ -28,7 +27,6 @@ install="
 "
 source="
 	deviceinfo
-	modules-initfs
 	nvme-powersave.initd
 	wlan-powersave-off.start
 	enable-s2idle.conf
@@ -60,8 +58,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 sha512sums="
-7ebb7e00ae1566fd4c176839c4cd6501f237b577e8db1180aa9934d70101807f8f9b513e529da3f0e96b73d682708b1f51a94430bc90d655f0d7ac059b076a04  deviceinfo
-6e3d97855a1f898db46b87ae1eb190d23d841fcb72332fcac4d11cd27c8f7d50eb8fd73007ed0447f106d19ff2e0fc1f34da1baf890e1465135dd692d65df2ba  modules-initfs
+0933548a542098458c0beab4c90ae51a325b284a6c699015ff1179bef607aa9398171e1abc5e851111e0b097ef848577a41ca6b45f2d8349726563f265b8e8f5  deviceinfo
 2abfa31fa56028339efc6d2b6cb838f310990d7110ac4dd996bc4cfcf90f0a8770e70f28f77f7b6929d110e494bc33731302f16b9717729f991c2732be0731d5  nvme-powersave.initd
 0fd7580e197e409978c219726af627cabe347404ee826e32892b61f3da1775b0fd81f8ed5e9a0f0bfaad87faa434d7a73ddaebf475ed0ad8fdcef6690cd692d3  wlan-powersave-off.start
 811af9c79151f41e25916c0f0bb130e82ebfb7d4d5b63413a3fed6700f829c1c017a12e85da230ed2f47a6bd49ed2bf5da19bbc4576ce485a48a2d3808a3a691  enable-s2idle.conf

device/community/device-pine64-pinebookpro/deviceinfo

@@ -7,6 +7,7 @@ deviceinfo_manufacturer="PINE64"
 deviceinfo_codename="pine64-pinebookpro"
 deviceinfo_year="2019"
 deviceinfo_dtb="rockchip/rk3399-pinebook-pro"
+deviceinfo_modules_initfs="gpu_sched dw_wdt fusb302"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-pine64-pinebookpro/modules-initfs

@@ -1,3 +0,0 @@
-gpu_sched
-dw_wdt
-fusb302

device/community/device-pine64-pinephonepro/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
 pkgver=3.8
-pkgrel=4
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ depends="
 	linux-pine64-pinephonepro
 	postmarketos-base>=25-r1
 	fwupd>=1.8.6
-	soc-rockchip-rk3399
 	"
 makedepends="
 	devicepkg-dev
@@ -36,7 +35,6 @@ source="
 	51_keyboard.gschema.override
 	90-modem-eg25.rules
 	deviceinfo
-	modules-initfs
 	modemmanager.conf
 	ppkb.sh
 	setup-modem.sh
@@ -138,14 +136,13 @@ x11() {
 sha512sums="
 2d68ffe143f633a86670f30e45dbad1cc313f219f22b7cd3319ab44bb7209c20cb29f2ff2c60c92390154af9c9a6815c4186be555364cf31552005eba024c0e7  51_keyboard.gschema.override
 98e9dcfb36dd5843ff441b148e3bffb70757c59601c5f01f55a584e8f017c7ca73f2275c1bff46e4236dd8174df36a43d10abf9b8dadee988b962036846dc6ed  90-modem-eg25.rules
-aa33c497b145f0e840ccf646814cc7f53c49e7472c013b3cb951614766d568e70578869305dfd5bbc87490927e2b5b5798437b5cf31efe7baca8089f0b7b7771  deviceinfo
-3ab1a9482d97739b03299f9237d15cb1d1d76ca2298bc6c1b4d1214590464cb13139d1a9c98c3eb7761ef8a5db060d5e365b38efcac57ed9ae34a1d12657e3f5  modules-initfs
+a2fec232778b5ba493c7a8b85b2121cdd19778cce0dac25f51ac3d2f1b48fb55b602ae62ae7d6a1a39af9310e4c05f04faf82c2b3f24698a0bee8cf303a115bb  deviceinfo
 c5006c38828eb519917d57756f7831c4552feffef2d4922a384073f6a551535f615ad397d784e313818e0b943e1f6212bcca0aff9ce37da60b29547b1631f24b  modemmanager.conf
 43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh
 420ee1d7522d4d56c2909580fd6ba7580483ca5455b13eb6d22e700063ce0c1a5c6d2f5b161dfce0d777636fe9a712aa82f38a0585f2feabea3785b02bae7515  setup-modem.sh
 1684514a6b814a83473e9da8855fd776cf3f31a2be1f8834c370f710428b4ee305559e275be52894d167ccd1e32f8f1c8586f8a072f19e44b46caec9f504d453  HiFi.conf
 9c6edbe7ea387baf9bfa6c4a46b28c4fe274ab0994e0a1640012048407e6679c437de43cc50e6778c9a852132eaa680de3fd4e0256d36455d1dd57aa729ac8be  PINE64-PinePhonePro-.conf
 e4d721163a844c68c0240be62a4692e7b9983054aee6d717f70687b901f569c6008e0c64a5bddf37e20f41b3936b4ef80909d7cbf09feeb0813303b3b46de80f  VoiceCall.conf
-bb11151e246d16e071761ebb35ca7f8b8cedbad8366e9bac6aed30554a795877cc9dccbe69ecca4b19b6f72bd87e613705f3ae4f2f40d2f9c2d09cc179999d59  sway-pinephone-keyboard.conf
 a7b49a638f664f7682ce6b00eb4d1ae26a429e89354056de05fb49d25fc9555d7f80e6d8f4b0a250878a4e7823860fd156068ed6604ce6cf58badef45c545161  x11-pinephone-keyboard.conf
+bb11151e246d16e071761ebb35ca7f8b8cedbad8366e9bac6aed30554a795877cc9dccbe69ecca4b19b6f72bd87e613705f3ae4f2f40d2f9c2d09cc179999d59  sway-pinephone-keyboard.conf
 "

device/community/device-pine64-pinephonepro/deviceinfo

@@ -7,6 +7,7 @@ deviceinfo_manufacturer="PINE64"
 deviceinfo_codename="pine64-pinephonepro"
 deviceinfo_year="2021"
 deviceinfo_dtb="rockchip/rk3399-pinephone-pro"
+deviceinfo_modules_initfs="gpu_sched dw_wdt fusb302 panel_himax_hx8394 goodix_ts"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-pine64-pinephonepro/modules-initfs

@@ -1,5 +0,0 @@
-gpu_sched
-dw_wdt
-fusb302
-panel_himax_hx8394
-goodix_ts

device/community/device-pine64-rockpro64/APKBUILD

@@ -2,13 +2,13 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=device-pine64-rockpro64
 pkgver=3
-pkgrel=5
+pkgrel=3
 pkgdesc="PINE64 ROCKPro64"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base>=25-r1 linux-postmarketos-rockchip soc-rockchip-rk3399 u-boot-rockchip"
+depends="postmarketos-base>=25-r1 linux-postmarketos-rockchip u-boot-rockchip"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo"

device/community/device-samsung-a3/APKBUILD

@@ -4,8 +4,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-a3
 pkgdesc="Samsung Galaxy A3 (2015)"
-pkgver=11.2
-pkgrel=1
+pkgver=11.1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,6 @@ depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	modules-initfs
 	phoc.ini
 "
 subpackages="
@@ -57,7 +56,6 @@ phosh() {
 }
 
 sha512sums="
-69e0c697ea7c082f578cc412ca8da918ad39114a8f61ac3c39fd003f361eebf4cdbb568252bc38fbeb78334e5b660d1e25a3969c961c967d8154e14eee7fe126  deviceinfo
-3754688b2a61c204f37944d700b6fc273f68a01e25d444a3c3f2dd2531d8538650a2e571657e18e7a96a2db96b19f2f738d6f465bde477efd66ab31a78edfb91  modules-initfs
+68f0855574aca23d078509e2afd525faa81ae76529dadf703d75f8b6b25be4d8a443b6a4832bca01f0d05efd7124f5ef398f1954bb3357b09725811f3f49c038  deviceinfo
 e8f734a2f8d154813dbb493f0d58af50a7f624ffed41967a81493b975a6211efc6d30743b23825562cfd126791cbdd3348bfbed32eeece9b8acec0a37c3c51b6  phoc.ini
 "

device/community/device-samsung-a3/deviceinfo

@@ -10,6 +10,7 @@ deviceinfo_year="2014"
 # All A3 variants seem to use mostly the same hardware so using a3u-eur works.
 deviceinfo_dtb="qcom/msm8916-samsung-a3u-eur"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="panel-samsung-s6e88a0-ams452ef01 msm zinitix"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-samsung-a3/modules-initfs

@@ -1,5 +0,0 @@
-panel-samsung-s6e88a0-ams452ef01
-msm
-zinitix
-rt5033
-rt5033-charger

device/community/device-samsung-a5/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Alexey Min <alexey.min@gmail.com>
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
-pkgver=10.2
-pkgrel=1
+pkgver=10.1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround"
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+source="deviceinfo"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
@@ -42,6 +42,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-9740a2ed7187c596d60da355a7423a800a1cc5a1c71c88ed80eb25837a1051d5e3edfca3e12d4f098b5b43e31d403984817569a0916ec0aaa9b652928cb837d8  deviceinfo
-13ba472485d757332b46a21fe771ae2779d0c5f1e997b6e51a4c0acce902256f0a2c724828251acf0150d7de919b691053de59041fea0b983569a004dcb75256  modules-initfs
+6af9b3ef868bfc398e645746bf1e95829eb0900bd78b8b7f68bf1eae8248f70a49287f49bc79deaf690b6a3b73c899c120518006f9552693b6d8a123b5641354  deviceinfo
 "

device/community/device-samsung-a5/deviceinfo

@@ -10,6 +10,7 @@ deviceinfo_year="2015"
 # However, the differences are minimal, so for now a5u-eur works fine.
 deviceinfo_dtb="qcom/msm8916-samsung-a5u-eur"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="panel-samsung-ea8061v-ams497ee01 msm mms114"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-samsung-a5/modules-initfs

@@ -1,5 +0,0 @@
-panel-samsung-ea8061v-ams497ee01
-msm
-mms114
-rt5033
-rt5033-charger

device/community/device-samsung-e7/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Raymond Hackley <raymondhackley@protonmail.com>
 pkgname=device-samsung-e7
 pkgdesc="Samsung Galaxy E7"
-pkgver=1.2
-pkgrel=1
+pkgver=1.1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -16,7 +16,7 @@ depends="
 	soc-qcom-msm8916-rproc
 "
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+source="deviceinfo"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
@@ -37,6 +37,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-42ca0cf76fc0d7122925dd8fa4297ef0f5160fdb99cff960e5eab19dbe00d9e824d18e72c05699006a28079818f61085fc97945ccabee90cb385ca3a0d16490d  deviceinfo
-659b6cdc0e9be756cfae34031d407175356edc331a8d4f51fb70b0beea4f8067c5ded39e158054c02811df0964d967d3a790bfef99675ca2587ef867d02db8db  modules-initfs
+8ca80e24c3a83b39b4fe5f8ae4b77732009dec40dc686feb996c9f7d1da82090f166f0bf374434dc4d3ee3c9976107e3bbb638b37b05e2dd5de1f45208c0c173  deviceinfo
 "

device/community/device-samsung-e7/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_codename="samsung-e7"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom-msm8916-samsung-e7"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="panel-samsung-ea8061-ams549bu19-id400418 msm stmfts"
 deviceinfo_arch="armv7"
 
 # Device related

device/community/device-samsung-e7/modules-initfs

@@ -1,5 +0,0 @@
-panel-samsung-ea8061-ams549bu19-id400418
-msm
-stmfts
-rt5033
-rt5033-charger

device/community/device-samsung-espresso10/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-samsung-espresso10
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
 pkgver=1
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"

device/community/device-samsung-espresso7/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-samsung-espresso7
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
 pkgver=1
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"

device/community/device-samsung-grandmax/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Raymond Hackley <raymondhackley@protonmail.com>
 pkgname=device-samsung-grandmax
 pkgdesc="Samsung Galaxy Grand Max"
-pkgver=1.2
-pkgrel=1
+pkgver=1.1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -16,7 +16,7 @@ depends="
 	soc-qcom-msm8916-rproc
 "
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+source="deviceinfo"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
@@ -37,6 +37,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-f37451a95c8a2a045feb4b319332fae6fecbb3cec370415a3ba04362d12060b4a67420a9378df3a27d24780bd42865516cba4c3154dcf8d3818e5423e06df7ca  deviceinfo
-24b1b199ca26d902807038faa20b44d6060c039900df5c7aa263cdb22b35930e726c2bfd86e32b1f1dd6fa8ab3b57a6c8ff430ce9aae2dd04c04565ea56c8a43  modules-initfs
+774c964bd2cd332cee18e09c4a59cc500ccecb26f8c2b78bc72d21b4f3fff1ce4413455aba1e52d816139abd6900f20695b6d877f8d54aab6b94858692bdfa60  deviceinfo
 "

device/community/device-samsung-grandmax/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_codename="samsung-grandmax"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom-msm8916-samsung-grandmax"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="panel-samsung-s6d2aa0x62-lpm053a250a msm imagis"
 deviceinfo_arch="armv7"
 
 # Device related

device/community/device-samsung-grandmax/modules-initfs

@@ -1,5 +0,0 @@
-panel-samsung-s6d2aa0x62-lpm053a250a
-msm
-imagis
-rt5033
-rt5033-charger

device/community/device-samsung-gt510/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt510
 pkgdesc="Samsung Galaxy Tab A 9.7 (2015)"
-pkgver=5
-pkgrel=1
+pkgver=4.1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,6 @@ depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	modules-initfs
 	pointercal
 	phoc.ini
 "
@@ -51,8 +50,7 @@ phosh() {
 }
 
 sha512sums="
-1a74a79351173ab960846474b5b60c82becc2291ff34cc0cc528e830c9ce7e036268a41dfd34e76d966ba84b204a1b3cbb9fa6edbbb710f58efb40e5f068e872  deviceinfo
-77e32266772a201ba42d91586dce32bd93ff81f1a49c5f5b157847e3107d0b2c9a2f0478b383416ca37ddfb820fe6c9147abe8ccd7e07ad704c3c4c9d4683f3a  modules-initfs
+f347a088c69dfcc5ca72ad0ae0563af0c293ad935543ebfc85ac136640ebf36e752bef4081b2078802a8d629d44c58be02f1465eec7f78771bb4df162724fe93  deviceinfo
 6aedd5eeac4d21356678f5399f3f0946392c9a7477ac21d39b8e761133dc8ed67adb4966647314f71d5263483ab68cad92847dacff95ffa45eabfc33c9f405b5  pointercal
 ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
 "

device/community/device-samsung-gt510/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_codename="samsung-gt510"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-samsung-gt510"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="panel-samsung-s6d7aa0-ltl101at01 msm atmel_mxt_ts"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-samsung-gt510/modules-initfs

@@ -1,3 +0,0 @@
-panel-samsung-s6d7aa0
-msm
-atmel_mxt_ts

device/community/device-samsung-gt58/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
-pkgver=5
-pkgrel=1
+pkgver=4.1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,6 @@ depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 makedepends="devicepkg-dev dtbtool"
 source="
 	deviceinfo
-	modules-initfs
 	phoc.ini
 "
 subpackages="
@@ -47,7 +46,6 @@ phosh() {
 }
 
 sha512sums="
-7f3a261029ecf69b490f804db9ef3ff642d173e2a0a441f6a81d65ad374db2066de23306bb468746a271886d820ee22991a5a3e0b83f4c1fc3911b7d111bb181  deviceinfo
-8071b89c832619c74d3bb50d638653aeaab99fee209cde425a7e8425d46d424bad9e8ab76d2d7360bd4c7ff093a712d51c3ca1b6086e1f70812224bbb115b04f  modules-initfs
+fb4ffa1b0fd76edb0d9769f36cba6dff2f937cb493f3e0fec01206319489839bde951327ea5bc8c677ec626c393c827eeb6bda739867bbfe3ded65dde34a1339  deviceinfo
 ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
 "

device/community/device-samsung-gt58/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_codename="samsung-gt58"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-samsung-gt58"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="panel-samsung-s6d7aa0-lsl080al03 msm zinitix"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-samsung-gt58/modules-initfs

@@ -1,3 +0,0 @@
-panel-samsung-s6d7aa0
-msm
-zinitix

device/community/device-samsung-m0/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-samsung-m0
 pkgdesc="Samsung Galaxy S III"
 pkgver=6.3
-pkgrel=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -43,11 +43,10 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="WiFi, Bluetooth, MFC firmware"
+	pkgdesc="WiFi and Bluetooth firmware"
 	depends="
 		firmware-samsung-midas-bluetooth
 		firmware-samsung-midas-wifi
-		linux-firmware-s5p-mfc
 		"
 	mkdir "$subpkgdir"
 }

device/community/device-samsung-serranove/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
-pkgver=12.2
-pkgrel=1
+pkgver=12.1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,7 +13,6 @@ depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	modules-initfs
 	phoc.ini
 "
 subpackages="
@@ -53,7 +52,6 @@ phosh() {
 }
 
 sha512sums="
-7066d3f1ad316ff776efbf4ad2d36f82ef25a6a3489aec0bd4c01d4b81c0b9769a0b34ecabc64c180ede0883d81c78e606dca276195879a77fdc2d46bf59e546  deviceinfo
-0c92ace5c522d039d356e8914c0e0237e11fc38dd05390ba7a89532be659707d2b499ae77b263c5984345caac11fd007bd6d1e279d3426126bc276a0bcd9348b  modules-initfs
+97e284d05d40bcf90a01a7da01d31664b748678b23cf90eeba74b6ccec7e19249f6bf939d900277ec20ac796c21cbf79ed09be9d05aaf408f61a31df9d73b361  deviceinfo
 1bc90a1a67309b43435039332b2a1d7e606408c6429b3cb8991a57f53dd4de36fbe471481b6481fbdb098c3819344e8093dd8eab0d34eb3c091ab6d8abd5c087  phoc.ini
 "

device/community/device-samsung-serranove/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_codename="samsung-serranove"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom-msm8916-samsung-serranove"
 deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs="panel-samsung-s6e88a0-ams427ap24 msm zinitix"
 deviceinfo_arch="armv7"
 
 # Device related

device/community/device-samsung-serranove/modules-initfs

@@ -1,5 +0,0 @@
-panel-samsung-s6e88a0-ams427ap24
-msm
-zinitix
-rt5033
-rt5033-charger

device/community/device-shift-axolotl/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
-pkgver=12
+pkgver=9999
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -24,7 +24,6 @@ depends="
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	modules-initfs
 	q6voiced.conf
 "
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -47,7 +46,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-88e5a1f014e48c811df46e94e09016f4f65cd99eb7e0baff4f7aaf9ee9cec2f8d9d9849aa23b6a28dac9631eeace530c5d914b538f186acbbd1e907d9041cc7e  deviceinfo
-4dc84207c5ca84b33b74139c8b0c9ce5baa8bcb1068df9943c478c02abcf8daccb88e06af63f120a434a115e277008e899305bd5239d8669436cb269889040e9  modules-initfs
+71e4ca72615e85300f2ab48585c9bb5ada0af89957a27d293ba8f39380afafaf0efa11762ee541113844dacb7ce30ce001e541c78a584852a45021896e25e071  deviceinfo
 2a3cbdad5aa91181d24a4e56e63986af6accf887c64fa4d1b6ddad1926e29050243c4b1e2fd892d38ca7c16e24dff8545a16552e5749ae31b6d01bf428468e51  q6voiced.conf
 "