From 1ff598acd8ca6868ed17a8db1b4e8712e1a7871f Mon Sep 17 00:00:00 2001
From: drebrez <drebrez@gmail.com>
Date: Tue, 17 Oct 2017 18:25:38 +0200
Subject: [PATCH] [huawei-y530] Add firmware-huawei-y530 package with wifi
 required files (#781)

---
 device/device-huawei-y530/APKBUILD     |  4 +--
 firmware/firmware-huawei-y530/APKBUILD | 43 ++++++++++++++++++++++++++
 main/wcnss-wlan/APKBUILD               |  4 +--
 main/wcnss-wlan/wcnss-wlan.initd       |  4 ++-
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 firmware/firmware-huawei-y530/APKBUILD

diff --git a/device/device-huawei-y530/APKBUILD b/device/device-huawei-y530/APKBUILD
index da5646727..11c406b6c 100644
--- a/device/device-huawei-y530/APKBUILD
+++ b/device/device-huawei-y530/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-huawei-y530
 pkgver=1
-pkgrel=3
+pkgrel=4
 pkgdesc="Huawei Ascend Y530"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-huawei-y530 mkbootimg"
+depends="linux-huawei-y530 mkbootimg firmware-huawei-y530"
 makedepends=""
 install=""
 subpackages=""
diff --git a/firmware/firmware-huawei-y530/APKBUILD b/firmware/firmware-huawei-y530/APKBUILD
new file mode 100644
index 000000000..60a241e0e
--- /dev/null
+++ b/firmware/firmware-huawei-y530/APKBUILD
@@ -0,0 +1,43 @@
+_files="wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b06 wcnss.b07 wcnss.b08 wcnss.b09 wcnss.mdt"
+_files1="WCNSS_cfg.dat WCNSS_qcom_cfg.ini WCNSS_qcom_wlan_nv.bin WCNSS_hw_wlan_nv.bin"
+
+pkgname=firmware-huawei-y530
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware files for Huawei Ascend Y530"
+url="https://github.com/postmarketOS"
+arch="noarch"
+license="proprietary"
+depends="wcnss-wlan"
+makedepends=""
+install=""
+subpackages=""
+source=""
+for _i in $_files
+do
+	source="$source https://github.com/drebrez/vendor_huawei_y530/raw/master/wifi/$_i"
+done
+for _i in $_files1
+do
+	source="$source https://github.com/drebrez/vendor_huawei_y530/raw/master/wifi/wlan/prima/$_i"
+done
+options="!strip !check !archcheck"
+
+package() {
+	mkdir -p $pkgdir/lib/firmware/postmarketos
+	for _i in $_files; do install -D -m644 "$srcdir/$_i" "$pkgdir/lib/firmware/postmarketos/$_i"; done
+	for _i in $_files1; do install -D -m644 "$srcdir/$_i" "$pkgdir/lib/firmware/postmarketos/wlan/prima/$_i"; done
+}
+sha512sums="5aa75c4b464d41a04934290b4775497c0866057f28fe94ab1e8c83b417eda38ebdd3fde1c5e72a35f2b76351729580878683415f0095fe2049af2b0deed50dba  wcnss.b00
+2f49d5415b7b2ed8eee4da67119077a08b00b5dfee173d152da0ee2e9a29f8a9f0b9fb03f32738ca925dd6ffa4fe264282df832ad2789ad5aeb259592c0d176a  wcnss.b01
+69a85f26b14096f1a9ac40ba8f14a990c103ae0ddcfb072739236f67ab81ebb584ca6e5baf890074c11a2ba558965b2340a9d25f09408062db2a9b8159f9848d  wcnss.b02
+28cc6eace5c82d0092c9de31abc90b0f50dc30e7e2a007107bea2a7c3306e84565482e6df6293bb30bfd229d96d2af32067b6b66179cf3be54756f8368cb44b2  wcnss.b04
+066455af7422068f2e3d61d3ae568f52ff4c58a0759b213efb943fbf09368a367b943d52665d4110bd34e884030191b14f1bf544f620de44dc0904885355dca0  wcnss.b06
+0b6cbac838dfe7f47ea1bd0df00ec282fdf45510c92161072ccfb84035390c4da743d9c3b954eaa1b0f86fc9861b23cc6c8667ab232c11c686432ebb5c8c3f27  wcnss.b07
+5361df62589fc7c16c18a29a9145aeeb6a29055c000c12709330663b9522ed17cb8c2276ac9a3a24d02b6a4c9d99227daf95311966c816738e831c7eb72441f1  wcnss.b08
+af71139bcf4d1865d59db3617fadd98fdda6912922c9503a481b05615a73d0481fcb962ff907fd88ece596db3c5079ed19790955a06f0d29026ce3c16d5b6326  wcnss.b09
+d3cf41dd6366fa3e860b0769511d762b6599329a2504eb6e1d5e7e5e7068e24e038d94118e966518fd3e00684929af4519d866861cc67132827c8b109a263703  wcnss.mdt
+efb2c90b7a9101c603ceb1bbe3cbf81159b11c2518ad2b0eadf90d7e080f2c7224fe8613fb4ac09088c8d6958d0b88cf23039df3053c9e08fbc94307e4921be5  WCNSS_cfg.dat
+76fef203edbee916d10ebb67e12ec68274e7e8c0d7af43b78dbc5a14aa9a04ac4ce924daf0322fcf67b04dd2b8e41d494d1abf0a576c1f73326f0384f33da343  WCNSS_qcom_cfg.ini
+dc0f0b13859f789196e151b4d87bdca77aae78542df0ac505c06687bf63c5b2943e9adc9f7dabd78731ef49e05a99aa3f6b8578e40ebec63de1ad93a0aaefdf0  WCNSS_qcom_wlan_nv.bin
+dc0f0b13859f789196e151b4d87bdca77aae78542df0ac505c06687bf63c5b2943e9adc9f7dabd78731ef49e05a99aa3f6b8578e40ebec63de1ad93a0aaefdf0  WCNSS_hw_wlan_nv.bin"
diff --git a/main/wcnss-wlan/APKBUILD b/main/wcnss-wlan/APKBUILD
index 7d8c0ee9b..9ac08d903 100644
--- a/main/wcnss-wlan/APKBUILD
+++ b/main/wcnss-wlan/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=wcnss-wlan
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Init script for enabling wcnss wlan driver (downstream Android kernels)"
 url="https://github.com/postmarketOS/pmbootstrap"
 arch="noarch"
@@ -15,5 +15,5 @@ options=""
 package() {
 	install -Dm755 "$srcdir/wcnss-wlan.initd" "$pkgdir/etc/init.d/wcnss-wlan"
 }
-sha512sums="ad063d2cd240ac9e63e80f46b3bac57937071cf59dbfd9937e25d6e3bd15df66e035c80bdf60bdaacbade9e488e7d1a3f7401c031081204611cec80dff9a0640  wcnss-wlan.initd
+sha512sums="d4765230ab163dc1417e8a94a180be93996bb30e43b883b9359d120e8cf9b8714a4f7c7deb082e9b2b18ff86930f53dedfed17985b572119de679801b68f06c5  wcnss-wlan.initd
 767cc4a51fbe52bc8874cd4b74c262b59fb8f1daad529f27bc81795d76e5765a8535dfa5cd5b236d76dcbd675716ee070899cc0bac7cc3dda461991221b0f334  wcnss-wlan.post-install"
diff --git a/main/wcnss-wlan/wcnss-wlan.initd b/main/wcnss-wlan/wcnss-wlan.initd
index f201e5df8..f10c3ad3e 100644
--- a/main/wcnss-wlan/wcnss-wlan.initd
+++ b/main/wcnss-wlan/wcnss-wlan.initd
@@ -12,5 +12,7 @@ start()
 {
 	ebegin "Enabling wlan driver"
 	echo 1 > /dev/wcnss_wlan 2>/dev/null
-	echo sta > /sys/module/wlan/parameters/fwpath
+	if [ -e /sys/module/wlan/parameters/fwpath ]; then
+		echo sta > /sys/module/wlan/parameters/fwpath
+	fi
 }