wl1251-cal: drop wl1251 module blacklist

Since /lib/firmware is always mounted as soon as / is mounted, wl1251-cal can
still be effective without the module blacklist, as long as care is taken to
ensure the service runs as soon as possible, and strictly before udev starts.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6943>

device/community/wl1251-cal/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Dang Huynh <danct12@disroot.org>
 pkgname=wl1251-cal
 pkgver=1.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Retrieve wl1251 calibration data from a CAL partition and feed it to the driver"
 url="https://github.com/maemo-leste/wl1251-cal"
 arch="armv7"
@@ -9,7 +9,6 @@ license="LGPL-2.1-only"
 makedepends="linux-headers"
 subpackages="$pkgname-openrc $pkgname-systemd"
 source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/wl1251-cal/archive/refs/tags/$pkgver.tar.gz
-	wl1251-blacklist
 	wl1251-cal.initd
 	wl1251-cal.service
 	calibrate-wl1251"
@@ -22,7 +21,6 @@ build() {
 package() {
 	make install DESTDIR="$pkgdir"
 	install -Dm755 "$srcdir/calibrate-wl1251" "$pkgdir/usr/bin/calibrate-wl1251"
-	install -Dm644 "$srcdir/wl1251-blacklist" "$pkgdir/etc/modprobe.d/wl1251.conf"
 	install -Dm644 "$srcdir/wl1251-cal.service" "$pkgdir/usr/lib/systemd/system/wl1251-cal.service"
 }
 
@@ -34,8 +32,7 @@ openrc() {
 
 sha512sums="
 1a402553fc98fa8f2d81d34a548f96be91d13bdcb77ec8e9d8373732b27a6e908895f6044aef8e88dbcd9fa6fa04f0a3d62bed877be91ba6207f68440c3ce758  wl1251-cal-1.2.tar.gz
-d14fd2816a8d55592907f1cf1f702d86095c8d2581b336460eb7d5bfc6ab8cece37a53c0a181b9f75ef5050bc612ce7443992158d36fc03939b39010cd33de4c  wl1251-blacklist
-39fec86cb13d34a605ad1a76eb3a6ae6e242a01427f477008a3ff066e0b59fb804f0d8379909f81d015aa053ccf9850505dbe3124062ed707a663ae5e2ccd9f1  wl1251-cal.initd
-0c266dbb0c5a5313177e1cc7b08368c546c69aa365eb4fa375e720729eff36c9939e366114499971bba6ea456e3e56465ce589af78e36a2bf76b383b6c0ea9de  wl1251-cal.service
+350d10f21b3d66ff9fa72e7af8696e67fa04c21f4eba02e977339c35d00e6e71735125d3d341f249b86541f7f0719e3218efaa344cc5bed727316bdf6864577c  wl1251-cal.initd
+3bc9f4476693d891cec72e736e67a2daccc22af61333aa392896173bd2307620036596392f89ff2e46dc2aea59f2c8fc7828fc448fb32d6f78b68c0e8a37cd43  wl1251-cal.service
 b6ee8ab642d2c70444851c6c57c4460f9712a423c8b655ea960563a143ea5609dc9f2bc2af5549b35c4a34ecae5597a382d0d6e4a829b72f0e76b77ab51edaf6  calibrate-wl1251
 "

device/community/wl1251-cal/wl1251-blacklist

@@ -1,3 +0,0 @@
-# Ensure wl1251 does not load until wl1251-cal has finished running
-blacklist wl1251_spi
-blacklist wl1251

device/community/wl1251-cal/wl1251-cal.initd

@@ -3,13 +3,12 @@ description="Update wl1251 calibration data"
 
 depend()
 {
-	need localmount
+	before udev
 }
 
 start()
 {
-	calibrate-wl1251
-	# Probe wl1251 once the nvs is ready
-	modprobe wl1251_spi
+	# attempt to fetch NVS, but allow it to fail
+	calibrate-wl1251 || true
 	eend $?
 }

device/community/wl1251-cal/wl1251-cal.service

@@ -1,12 +1,12 @@
 [Unit]
 Description=Update wl1251 calibration data
-After=local-fs.target
-Before=network-pre.target
+RequiresMountsFor=/lib/firmware
+Before=udev.service
 
 [Service]
 Type=oneshot
-ExecStart=/bin/sh -c '/usr/bin/calibrate-wl1251 || true; /sbin/modprobe wl1251_spi'
+ExecStart=/bin/sh -c '/usr/bin/calibrate-wl1251 || true'
 RemainAfterExit=yes
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sysinit.target