device/community/device-generic-x86_64/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
 pkgver=17
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -12,6 +12,7 @@ depends="
 	alsa-ucm-conf
 	postmarketos-base
 	systemd-boot
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="

device/community/device-google-sargo/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
-pkgver=8
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -23,10 +23,10 @@ depends="
 	soc-qcom-sdm845-modem
 	soc-qcom-sdm845-nonfree-firmware
 	soc-qcom-sdm845-qbootctl
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr-msm.conf
 	81-libssc-google-sargo.rules
 	90-feedbackd-drv2624.rules
 	deviceinfo
@@ -47,8 +47,6 @@ package() {
 
 	install -Dm644 "$srcdir"/90-feedbackd-drv2624.rules \
 		-t "$pkgdir"/usr/lib/udev/rules.d
-	install -Dm644 "$srcdir"/10-unl0kr-msm.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr-msm.conf
 	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
 	install -Dm644 "$srcdir"/hexagonrpcd.confd \
 		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
@@ -73,7 +71,6 @@ openrc() {
 }
 
 sha512sums="
-f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr-msm.conf
 089ce0acba4e1d789e337bedfca7570796a6416e7230ae9b8fc6b625747a40dbb064b1a707877cd6b7bdc73844c6571316e2ec0746a77060f13d98c52fdbfc00  81-libssc-google-sargo.rules
 016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
 ad032b1a35cfcd4fc0c8df988430ee97b711e785b86cca68b7552b23a9a2e2b6b97c327e3415a575db47ad6c1f86ded18df5553acaae63010057d89b8c16135e  deviceinfo

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

-[quirks]
-fbdev_force_refresh=true
\ No newline at end of file

device/community/device-oneplus-enchilada/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=14
-pkgrel=6
+pkgver=15
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -20,10 +20,10 @@ depends="
 	soc-qcom-sdm845-nonfree-firmware
 	soc-qcom-sdm845-qbootctl
 	soc-qcom-sdm845-ucm
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr.conf
 	deviceinfo
 	hexagonrpcd.confd
 	modules-initfs
@@ -40,8 +40,6 @@ package() {
 	replaces="$pkgname-nonfree-firmware"
 	devicepkg_package $startdir $pkgname
 
-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
 	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules \
 		-t "$pkgdir"/usr/lib/udev/rules.d/
 	install -Dm644 "$srcdir"/q6voiced.conf \
@@ -66,7 +64,6 @@ pmtest() {
 }
 
 sha512sums="
-e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
 83fc698ebeda6245abc2a653eeff97b3b996d06dd7731386a07d102937f9b005c7277e0dece05ff359d9ff109a1d9ed7791fc510b146354df179804aadb5642c  deviceinfo
 c8d3026e9f803ea823e35f83dab66fa8545e99af9655576476c194567113084d78200feab46f84983a2dad608ca55c0a4a66e36406c6d64023c0aec59307d146  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs

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

-[quirks]
-fbdev_force_refresh=true
\ No newline at end of file

device/community/device-oneplus-fajita/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=14
-pkgrel=4
+pkgver=15
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -16,10 +16,10 @@ depends="
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr.conf
 	deviceinfo
 	hexagonrpcd.confd
 	modules-initfs
@@ -39,8 +39,6 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 
-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
 }
 
 nonfree_firmware() {
@@ -75,7 +73,6 @@ pmtest() {
 }
 
 sha512sums="
-e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
 07e3d79715befccd1e7393908c06f88ac8468d1ce6cb96138e3a04e6f8274889db169f5daf05b04b633bcc9e85d11ea5c2017b84bc0ae86a8fad80b05794d0d8  deviceinfo
 6b5308471fcbb938ac00d6e9a3f8e61073bda1d608f2edf1a2aba4b256dd3f76b1ccee0873dcaa8dc4a8db304d433360a56fe447d70f57ba068428b75ddea236  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs

device/community/device-xiaomi-elish/APKBUILD

@@ -3,12 +3,13 @@
 pkgname=device-xiaomi-elish
 pkgdesc="Xiaomi Mi Pad 5 Pro"
 pkgver=5
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	alsa-ucm-conf
 	bootmac
 	hexagonrpcd>=0.3.2-r3
 	make-dynpart-mappings

device/testing/device-acer-aspire1/APKBUILD

@@ -3,12 +3,13 @@
 pkgname=device-acer-aspire1
 pkgdesc="Acer Aspire 1"
 pkgver=5
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	alsa-ucm-conf
 	linux-postmarketos-qcom-sc7180
 	postmarketos-base
 	soc-qcom-sc7180

device/testing/device-fairphone-fp5/10-unl0kr.conf

-[quirks]
-fbdev_force_refresh=true

device/testing/device-fairphone-fp5/APKBUILD

@@ -2,13 +2,14 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp5
 pkgdesc="Fairphone 5"
-pkgver=6
+pkgver=7
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	alsa-ucm-conf
 	firmware-fairphone-fp5-adreno
 	firmware-fairphone-fp5-adsp
 	firmware-fairphone-fp5-bluetooth
@@ -26,11 +27,11 @@ depends="
 	postmarketos-base
 	soc-qcom-sc7280
 	soc-qcom-sc7280-qbootctl
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 subpackages="$pkgname-openrc"
 source="
-	10-unl0kr.conf
 	81-libssc-fairphone-fp5.rules
 	deviceinfo
 	hexagonrpcd.confd
@@ -56,9 +57,6 @@ package() {
 	ln -s /usr/share/alsa/ucm2/Fairphone/fp5/fp5.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/qcm6490/Fairphone\ 5.conf
 
-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
-
 	install -Dm644 "$srcdir"/hexagonrpcd.confd \
 		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 }
@@ -72,7 +70,6 @@ openrc() {
 }
 
 sha512sums="
-f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr.conf
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp5.rules
 5e4877277bcf3e4f232e96b1edf0bb598b8f16c4820d2db321f502ea9aa339c405458ecd9642c838e4dc4e2dc59d0c57fadd4bc5a9a81c915772b4f244bf1e6d  deviceinfo
 206c7b2616b61c1f7630933d036875985e78cfc23e6a175795b328d251684abeceb06373da4ae211f6f7dd7e45fb3b3238bb8a4b5698906be626d8d918adf5b3  hexagonrpcd.confd

device/testing/device-google-blueline/10-unl0kr.conf

-[quirks]
-fbdev_force_refresh=true
\ No newline at end of file

device/testing/device-google-blueline/APKBUILD

@@ -5,7 +5,7 @@
 
 pkgname=device-google-blueline
 pkgdesc="Google Pixel 3"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -21,10 +21,10 @@ depends="
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
 	soc-qcom-sdm845-nonfree-firmware
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr.conf
 	deviceinfo
 	modules-initfs
 "
@@ -35,13 +35,9 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
 }
 
 sha512sums="
-e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
 1a6c56470ccf94a51d235b011d0069ed028f781eb94863759113b62646138e3a8a34936536715eb908b5bea06c360567b0f217427fc4e5b34a617388072367ec  deviceinfo
 c8b486aefd8b65676a7466d65df9c3e227efb372df3970085f01aff985ea2bb6e545bd83a91d944659b99e08e47770b066c1fdcd731e2d92767f8b35dab97c5b  modules-initfs
 "

device/testing/device-lenovo-q706f/APKBUILD

@@ -3,12 +3,13 @@
 pkgname=device-lenovo-q706f
 pkgdesc="Lenovo Xiaoxin Pad Pro 12.6 (Lenovo Tab P12 Pro)"
 pkgver=4
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	alsa-ucm-conf
 	bootmac
 	hexagonrpcd>=0.3.2-r3
 	linux-lenovo-q706f

device/testing/device-lg-hammerhead/10-unl0kr.conf

-[quirks]
-fbdev_force_refresh=true

device/testing/device-lg-hammerhead/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-hammerhead
-pkgver=11
+pkgver=12
 pkgrel=0
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
@@ -12,15 +12,14 @@ depends="
 	mkbootimg
 	postmarketos-base
 	soc-qcom-msm8974
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-phosh
-	$pkgname-unl0kr
 	$pkgname-x11
 	$pkgname-nonfree-firmware:nonfree_firmware"
 source="
-	10-unl0kr.conf
 	bt-module-deps.conf
 	deviceinfo
 	modules-initfs
@@ -37,13 +36,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-unl0kr() {
-	install_if="$pkgname unl0kr"
-	depends=""
-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		-t "$subpkgdir"/etc/unl0kr.conf.d
-}
-
 x11() {
 	install_if="$pkgname xorg-server"
 	depends="
@@ -80,7 +72,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr.conf
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
 63b0063164d00ae55be967dbc6ad429fe0249385d47e20455563d518f8f3838330978b18b576e7eb1d453257c1114ddd704136977eeaf23673d70a73e07ef779  deviceinfo
 fd639faebbee2c0c2c227710678376e0d039b7d96a62103f7ba7e6304d7060023f09064918e93a125465d20d125c0334225680521a7aeae5a43d77d7360c180c  modules-initfs

device/testing/device-nokia-ant/APKBUILD

+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-nokia-ant
+pkgdesc="HMD Global Nokia 1"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	android-tools
+	linux-nokia-ant
+	msm-fb-refresher
+	mkbootimg
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	generate_signed_boot.sh
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+	install -Dm755 "$srcdir/generate_signed_boot.sh" "$pkgdir/usr/share/mkinitfs/generate_signed_boot.sh"
+}
+
+sha512sums="
+1d11ddebebbaa4a47313000b71cca6d8d1acbb687559b761f60bcb14df30443eac9790e1f8a6d8803b952e9bb660598708bab8d77da6339f238393b24c21bf15  deviceinfo
+ec3d18c68c816ebf2bfa7f0ad2fd158d14ca9fecabc56a6f8961c0a11be8b9af67722bc52ecdb3276abc06dd33f444d29fc3bf95660a21d6dacfd37a276d7d81  generate_signed_boot.sh
+"

device/testing/device-nokia-ant/deviceinfo

+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="HMD Global Nokia 1"
+deviceinfo_manufacturer="HMD Global"
+deviceinfo_codename="nokia-ant"
+deviceinfo_year="2019"
+deviceinfo_dtb="mt6739"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_external_storage="true"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="bootopt=64S3,32S1,32S1 buildvariant=user"
+deviceinfo_generate_bootimg="true"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_header_version="2"
+deviceinfo_append_dtb="false"
+deviceinfo_flash_offset_dtb="0x04000000"
+deviceinfo_flash_offset_base="0x40000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x05000000"
+deviceinfo_flash_offset_second="0xc0000000"
+deviceinfo_flash_offset_tags="0x04000000"
+deviceinfo_mkinitfs_postprocess="/usr/share/mkinitfs/generate_signed_boot.sh"
+
+# usb_idVendor=0x18d1
+# 4EE7 - adb only - fallback
+# 2d00 - USB accessory configuration
+# 2d01 - USB accessory configuration, with adb
+# 2d02 - audio accessory configuration
+# 2d03 - audio accessory configuration, with adb
+# 2d04 - USB and audio accessory configuration
+# 2d05 - USB and audio accessory configuration, with adb
+# usb_idProduct=0x2d05
+

device/testing/device-nokia-ant/generate_signed_boot.sh

+#!/bin/sh
+
+# $1 is path to generated initramfs, we want to work on boot.img
+bootimgfile=$(echo "${1}" | sed 's/initramfs/boot.img/g')
+avbtool add_hash_footer --partition_name boot --image "${bootimgfile}" --dynamic_partition_size

device/testing/device-qualcomm-sdm845/10-unl0kr.conf

-[quirks]
-fbdev_force_refresh=true

device/testing/device-qualcomm-sdm845/APKBUILD

-
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Caleb Connolly <caleb.connolly@linaro.org>
 
 pkgname=device-qualcomm-sdm845
 pkgdesc="Generic device package for Qualcomm SDM845 devices"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -23,10 +22,10 @@ depends="
 	soc-qcom-sdm845-qbootctl
 	soc-qcom-sdm845-ucm
 	systemd-boot
+	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
 source="
-	10-unl0kr.conf
 	deviceinfo
 	q6voiced.conf
 	modules-initfs
@@ -39,14 +38,10 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 
-	install -Dm644 "$srcdir"/10-unl0kr.conf \
-		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
-
 	install -Dm644 q6voiced.conf "$pkgdir"/etc/conf.d/q6voiced
 }
 
 sha512sums="
-f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr.conf
 269d048bbb1b7b0d199c9969f4700c9cae8a7850a5b66cd736c3e93a21a1b0caca0ddc4e97fe3703b39562e771793db9a8e13f11a84957026bc7d00f035c9a4a  deviceinfo
 5f3e1c286baea16a5b0a4a34cef7ad774d3aa5cc384e1deb4fba40d1f9372a708baf3b587e3edac69edcf04b5513f0111c1976b649b424cc721733ce4ddabc19  q6voiced.conf
 3bbacc8c260e2c0af509b9b123218f830610ac7aef82efc9b117fc62ccda4155e588be718dcb399102b5534a25900e53840083add166a7ac5b399ddc702de904  modules-initfs