From b8129fe127c4c5b9959927e4ed6b3137fa5a25fe Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@bitmessage.ch>
Date: Mon, 26 Feb 2018 22:11:44 +0000
Subject: [PATCH] Make nonfree depends optional part 2: device pkgs (#1268)

* Add nonfree_firmware subpackage to all devices, that depend on
  nonfree firmware.
* Some packages were depending on `linux-firmware`, but without having
  Wifi working. Removed that dependency as it was probably added by
  accident. If it was really necessary, chosing the appropriate
  split linux-firmware package (e.g. linux-firmware-brcm) is better
  anyway (that has been changed recently in Alpine and is possible
  now).
* Add a test case that makes sure we don't have firmware depends
  without subpackages in device aports anymore.
---
 device/device-asus-flo/APKBUILD           | 13 ++++++++++---
 device/device-htc-ace/APKBUILD            | 12 +++++++++---
 device/device-huawei-angler/APKBUILD      | 12 +++++++++---
 device/device-huawei-y530/APKBUILD        | 12 +++++++++---
 device/device-lenovo-karate/APKBUILD      | 11 +++++++++--
 device/device-lg-hammerhead/APKBUILD      | 12 +++++++++---
 device/device-motorola-peregrine/APKBUILD |  9 ++++++++-
 device/device-motorola-titan/APKBUILD     | 12 +++++++++---
 device/device-nokia-n9/APKBUILD           | 10 ++++++++--
 device/device-nokia-n900/APKBUILD         | 17 ++++++++++++++---
 device/device-oneplus-bacon/APKBUILD      |  4 ++--
 device/device-oneplus-onyx/APKBUILD       |  4 ++--
 device/device-samsung-espresso10/APKBUILD | 11 +++++++++--
 device/device-samsung-i747m/APKBUILD      | 13 ++++++++++---
 device/device-samsung-i9070/APKBUILD      | 12 +++++++++---
 device/device-samsung-i9100/APKBUILD      | 12 +++++++++---
 device/device-samsung-i9305/APKBUILD      | 12 +++++++++---
 device/device-samsung-i9505/APKBUILD      | 10 ++++++++--
 device/device-samsung-maguro/APKBUILD     | 12 +++++++++---
 device/device-semc-anzu/APKBUILD          | 11 +++++++++--
 device/device-sony-amami/APKBUILD         | 12 +++++++++---
 device/device-sony-castor-windy/APKBUILD  | 13 ++++++++++---
 device/device-sony-honami/APKBUILD        | 11 +++++++++--
 device/device-t2m-flame/APKBUILD          | 11 +++++++++--
 device/device-teclast-x80pro/APKBUILD     | 11 +++++++++--
 device/device-xiaomi-armani/APKBUILD      | 11 +++++++++--
 26 files changed, 225 insertions(+), 65 deletions(-)

diff --git a/device/device-asus-flo/APKBUILD b/device/device-asus-flo/APKBUILD
index 6ea19f221..142ea9519 100644
--- a/device/device-asus-flo/APKBUILD
+++ b/device/device-asus-flo/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-asus-flo
 pkgver=0
-pkgrel=9
+pkgrel=10
 pkgdesc="Google Nexus 7 2013 flo"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-asus-flo mkbootimg firmware-asus-flo mesa mesa-egl mesa-dri-freedreno"
+depends="postmarketos-base linux-asus-flo mkbootimg mesa mesa-egl mesa-dri-freedreno"
 makedepends=""
 install=""
-subpackages="$pkgname-weston"
+subpackages="$pkgname-weston $pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo 90-android-touch-dev.rules wpa_supplicant.conf pointercal weston.ini"
 
 options="!check"
@@ -29,6 +29,13 @@ weston() {
 	install -Dm644 "$srcdir"/weston.ini \
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
+
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-asus-flo"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="cd112666a2c24fe040dbba4010ffb91b1e573d38ecec15e0fc23e2a7c20879d7eff0d677e2053bcf7896edac58038b4192fef689549f0b0cc701e5304c403509  deviceinfo
 5ac89b627f52d2f1103c3329bd905cdbb906cae5bb332d52e6805d7971fbcc0faabe1fd9d2beb7c6de4e4487c05047eaa17852dbf9e114ee3c5d4b0d57d73859  90-android-touch-dev.rules
 3278921cc1617d10fdd13dfbeaf213cda0078d069e727acd8cfac10bd8ade6f373be1e22fd1e4b50ae71cd2eae09f7d6aad5de42338d9ea9f8c1a34f0b60cb69  wpa_supplicant.conf
diff --git a/device/device-htc-ace/APKBUILD b/device/device-htc-ace/APKBUILD
index ef11bd96c..ebed61ced 100644
--- a/device/device-htc-ace/APKBUILD
+++ b/device/device-htc-ace/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-htc-ace
 pkgver=1
-pkgrel=8
+pkgrel=9
 pkgdesc="HTC Desire HD"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-htc-ace mkbootimg linux-firmware mesa-dri-swrast"
+depends="postmarketos-base linux-htc-ace mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
-subpackages=""
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	initfs-hook.sh
@@ -25,6 +25,12 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="linux-firmware"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="d3df77ec0df3ae5299a554af065abace1ce53bd6c1b55a76c57f68eabc433a41fe037e08c848377f830b62d19a80e0fa2146542bdfe74221cc62f9131ff925b9  deviceinfo
 3ce2d134aa59677e25a160b5985c552fbf048b237169bbeb85e2b8824f734627064b51c097036db10eee0254064d45d804d17372dffcd1ba246938968fe1e225  initfs-hook.sh
 ab8fb357bb45ba44723f1ecb01a10db26f8f74b605499673e1ba90c69a9b11a1555983ce90235e3b636d75461c81c81eea0f8318ded06b72dad17f924d8b9901  90-android-touch-dev.rules"
diff --git a/device/device-huawei-angler/APKBUILD b/device/device-huawei-angler/APKBUILD
index 2222c31a4..72c844e00 100644
--- a/device/device-huawei-angler/APKBUILD
+++ b/device/device-huawei-angler/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-huawei-angler
 pkgver=1
-pkgrel=9
+pkgrel=10
 pkgdesc="Huawei Nexus 6P"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-huawei-angler mkbootimg firmware-aosp-broadcom-wlan msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-huawei-angler mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
-subpackages=""
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	90-android-touch-dev.rules
@@ -29,6 +29,12 @@ package() {
 		"$pkgdir"/etc/wifi/bcmdhd.cal
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-aosp-broadcom-wlan"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="8e1ff6d2a11099b0b95903d400837985b347c0d0bdd1cca744b6ec33ea8ab94b9914ef40c4261a3cd6b47ada19c3f4e3b3bf89122a7c8031aefb2ca2a22b022c  deviceinfo
 262f9f3e28cbb28d236cf6edce4919766baabb18e5b0cf35d672d306efeaf12fd66ffba57e6d9bef0eee90203dc98f95aab17145e4c12383055afb58b922ae58  90-android-touch-dev.rules
 61fe1f91d7b0b570b77fcca76503373cbac2515ca3dcc2f2543b910dfaeb1e935a11975f824f6a72001df4e63329356a6aff2d016e9b4f5d8f7b739fee065c4e  bcmdhd.cal"
diff --git a/device/device-huawei-y530/APKBUILD b/device/device-huawei-y530/APKBUILD
index f4a58462f..41b68d112 100644
--- a/device/device-huawei-y530/APKBUILD
+++ b/device/device-huawei-y530/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-huawei-y530
 pkgver=1
-pkgrel=8
+pkgrel=9
 pkgdesc="Huawei Ascend Y530"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-huawei-y530 mkbootimg firmware-huawei-y530 mesa-dri-swrast"
+depends="postmarketos-base linux-huawei-y530 mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
-subpackages=""
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	90-touchscreen-dev.rules
@@ -22,5 +22,11 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-touchscreen-dev.rules
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-huawei-y530"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="0837c8a4387affc488f3d233c08d3a0602806e81fb6ec77fde1dcd46d7ea25c7f9ebdf6dccbdd0a142f025eaeef44d5a416cddb69926c30a49c13f9d8ef3929b  deviceinfo
 b2ebcd94e54b474d5a0d03f25af0d152583cddbb8ae8a70b72d65e96c9114a11fd535ffc964b23a0852fd541198c940fe6e867dafb6e6a8a12cb6fa5d1538d45  90-touchscreen-dev.rules"
diff --git a/device/device-lenovo-karate/APKBUILD b/device/device-lenovo-karate/APKBUILD
index 1e85422f3..338be8c79 100644
--- a/device/device-lenovo-karate/APKBUILD
+++ b/device/device-lenovo-karate/APKBUILD
@@ -1,14 +1,15 @@
 pkgname="device-lenovo-karate"
 pkgdesc="Lenovo K6 Power"
 pkgver=0.1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="postmarketos-base linux-lenovo-karate firmware-lenovo-karate mkbootimg mdss-fb-init-hack mesa-dri-swrast"
+depends="postmarketos-base linux-lenovo-karate mkbootimg mdss-fb-init-hack mesa-dri-swrast"
 source="deviceinfo 90-android-touch-dev.rules"
 install="$pkgname.post-install"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 package() {
 	install -Dm644 "$srcdir"/deviceinfo \
@@ -17,5 +18,11 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
+nonfree_firmware() {
+	depends="firmware-lenovo-karate"
+	pkgdesc="Wifi firmware"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="dbf14b024f014762f2a52e5cbec94c07cf1184189b813ff9a8d6a458fee3cf812db498fad8493272cd97c53dbf40feb007fa7b42ed9ba6a35a4d8b8de22a4626  deviceinfo
 25086c95c67c27151112efac1dcf7792589c990cc0a93ee910654445a3f9cc66c4a5ab656b3256224b39c49fe104540757cc36abf9de19f47c28c4fa82c4f552  90-android-touch-dev.rules"
diff --git a/device/device-lg-hammerhead/APKBUILD b/device/device-lg-hammerhead/APKBUILD
index b5ec622f4..ea19bcc78 100644
--- a/device/device-lg-hammerhead/APKBUILD
+++ b/device/device-lg-hammerhead/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-lg-hammerhead
 pkgver=1
-pkgrel=18
+pkgrel=19
 pkgdesc="Google Nexus 5"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-lg-hammerhead linux-firmware mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-lg-hammerhead mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
-subpackages="$pkgname-weston $pkgname-x11"
+subpackages="$pkgname-weston $pkgname-x11 $pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	90-android-touch-dev.rules
@@ -50,6 +50,12 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="linux-firmware"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="be2eba28f0b766917c9369c2f72f337bbb987076f6bd0c80b023bcdcc68684077a375209ac967b038dc018f6633c6795544bad87b2180c04b981660a4d713b41  deviceinfo
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
 d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
diff --git a/device/device-motorola-peregrine/APKBUILD b/device/device-motorola-peregrine/APKBUILD
index 0044c9c05..482b81833 100644
--- a/device/device-motorola-peregrine/APKBUILD
+++ b/device/device-motorola-peregrine/APKBUILD
@@ -7,8 +7,9 @@ url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="postmarketos-base linux-motorola-peregrine firmware-motorola-titan mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-motorola-peregrine mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo"
 
 build() {
@@ -19,4 +20,10 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-motorola-titan"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="6dfabb68f4ccf1249ba90becfbdd17bc59ed2656df389f7fcf211ec40b4962597396c45d07112399563b0cd9bad5fba760ee5f8d94bf8cbe432438a938f862d2  deviceinfo"
diff --git a/device/device-motorola-titan/APKBUILD b/device/device-motorola-titan/APKBUILD
index 121f945ae..5f7970a73 100644
--- a/device/device-motorola-titan/APKBUILD
+++ b/device/device-motorola-titan/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-motorola-titan
 pkgver=1
-pkgrel=21
+pkgrel=23
 pkgdesc="Motorola Moto G 2014"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-motorola-titan firmware-motorola-titan mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-motorola-titan mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
-subpackages="$pkgname-weston"
+subpackages="$pkgname-weston $pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo 90-android-touch-dev.rules profile.sh weston.ini"
 options="!check"
 
@@ -31,6 +31,12 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-motorola-titan"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="efdd19f924659b92473d592c501c4ef8622cb09f1de17d1bea0bb371b2880e5da463fbea159ebec3806a5e90a8757cf6e87eb8feab8f2186b26cc198d8fad4bf  deviceinfo
 8406968cd554393ea1e350967c80810d059de2b1d33ea1302e265780c1f0110d64cf15a68c2f374981a88906d0317315e0a71995c85fd5eaf93bb47ed427529c  90-android-touch-dev.rules
 d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
diff --git a/device/device-nokia-n9/APKBUILD b/device/device-nokia-n9/APKBUILD
index 338d63ffb..5c2007cfb 100644
--- a/device/device-nokia-n9/APKBUILD
+++ b/device/device-nokia-n9/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-nokia-n9
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Nokia N9"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-nokia-n9 linux-firmware ofono watchdog-kick"
+depends="postmarketos-base linux-nokia-n9 ofono watchdog-kick"
 makedepends=""
 install=""
 subpackages="$pkgname-weston:weston"
@@ -30,6 +30,12 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="linux-firmware"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="3298afa3312a032836e271d4c6808d304436470545472beb4a4ac1a4b8f93ec25d5b895f5bebf351ffb6e910a155f97a4d96b1d74f1d8ab278c246cb3815bf79  deviceinfo
 61d9e6bf94f3b9cab0ccb2e18c18e5886a08aae5e70fe5e7b7d7cc2a8d655dc11cdec603731c4328dd288f13ba3aa9328f2fc46e7a473be3da31767786978b05  initfs-hook.sh
 df0fe900693e5f176076c59f5379e56aaa96c3df16a4120448f15b71f530170730b43e5fe32733c40c118a00ca3581043231a062a8a1eb0a930bfbfbb6c52a47  weston.ini"
diff --git a/device/device-nokia-n900/APKBUILD b/device/device-nokia-n900/APKBUILD
index b372aee04..14befe7d2 100644
--- a/device/device-nokia-n900/APKBUILD
+++ b/device/device-nokia-n900/APKBUILD
@@ -1,14 +1,19 @@
 pkgname=device-nokia-n900
 pkgver=2
-pkgrel=1
+pkgrel=2
 pkgdesc="Nokia N900"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-postmarketos-stable uboot-tools linux-firmware kbd kbd-bkeymaps ofono mesa-dri-swrast"
+depends="postmarketos-base linux-postmarketos-stable uboot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast"
 makedepends="uboot-tools kbd kbd-bkeymaps"
 install="$pkgname.post-install"
-subpackages="$pkgname-weston $pkgname-x11 $pkgname-i3wm"
+subpackages="
+	$pkgname-weston
+	$pkgname-x11
+	$pkgname-i3wm
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
 source="
 	deviceinfo
 	uboot-script.cmd
@@ -86,6 +91,12 @@ i3wm() {
 		"$subpkgdir"/etc/skel/.config/i3/i3status.conf
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="linux-firmware"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="b8b61cc2a795e59bb11318ddcaeca1c36dbe786a9925fae366c4ab639db0314fb14f5d08e52665df65fabd62db2a580fd3055b9f56f0e61313b96e185af5f79f  deviceinfo
 8f5b68b86f5345698114a2d70fd174699e5729f6c157659e4e57bef1dcab8c1209c13b30df6f5c2e8f31fee077039ffbc7817ca201f0745467b693e7550eaf6b  uboot-script.cmd
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
diff --git a/device/device-oneplus-bacon/APKBUILD b/device/device-oneplus-bacon/APKBUILD
index d3be08bf3..523154685 100644
--- a/device/device-oneplus-bacon/APKBUILD
+++ b/device/device-oneplus-bacon/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-oneplus-bacon
 pkgver=1
-pkgrel=9
+pkgrel=10
 pkgdesc="OnePlus One"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-oneplus-bacon linux-firmware mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-oneplus-bacon mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages="$pkgname-weston"
diff --git a/device/device-oneplus-onyx/APKBUILD b/device/device-oneplus-onyx/APKBUILD
index 60a71692e..e3394d293 100644
--- a/device/device-oneplus-onyx/APKBUILD
+++ b/device/device-oneplus-onyx/APKBUILD
@@ -1,11 +1,11 @@
 pkgname=device-oneplus-onyx
 pkgver=1
-pkgrel=3
+pkgrel=4
 pkgdesc="OnePlus X"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-oneplus-onyx linux-firmware mkbootimg msm-fb-refresher mesa-dri-swrast"
+depends="postmarketos-base linux-oneplus-onyx mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 source="deviceinfo 90-android-touch-dev.rules fb.modes"
diff --git a/device/device-samsung-espresso10/APKBUILD b/device/device-samsung-espresso10/APKBUILD
index 17638483a..5166e9798 100644
--- a/device/device-samsung-espresso10/APKBUILD
+++ b/device/device-samsung-espresso10/APKBUILD
@@ -2,14 +2,15 @@
 pkgname="device-samsung-espresso10"
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
 pkgver=0.1
-pkgrel=4
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="postmarketos-base linux-samsung-espresso10 firmware-samsung-espresso10 mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-espresso10 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -19,4 +20,10 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-samsung-espresso10"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="52b9cd540941d0d4059c90483e0e5d7f6b742ab012201add20a6602836e1831bd5fef8c930f3084f65da4a9c22ebaa5109dfa4d2eacd86c259b967eb4fedb0cb  deviceinfo"
diff --git a/device/device-samsung-i747m/APKBUILD b/device/device-samsung-i747m/APKBUILD
index d10e8f092..463621769 100644
--- a/device/device-samsung-i747m/APKBUILD
+++ b/device/device-samsung-i747m/APKBUILD
@@ -1,13 +1,14 @@
 pkgname="device-samsung-i747m"
-pkgdesc="Samsing Galaxy SIII (USA/Canada)"
+pkgdesc="Samsung Galaxy SIII (USA/Canada)"
 pkgver=0.1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="postmarketos-base linux-samsung-i747m firmware-samsung-i747m mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-i747m mkbootimg mesa-dri-swrast"
 source="deviceinfo 90-android-touch-dev.rules fb.modes"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 package() {
 	install -Dm644 "$srcdir"/deviceinfo \
@@ -18,6 +19,12 @@ package() {
 		"$pkgdir"/etc/fb.modes
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-samsung-i747m"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="049a694e9f88be4a1862e402620abb64210f81860204ff25748bebe6f27090a96430fe5743cca37effd0b86aee2d2278da58031a0bdb9dd8f249d70ad3e67749  deviceinfo
 1ef4aa9206e6aa61cef80dd4fd4dc2d834e3582e40978d2da8a768964bbaa854a4068fb263e4dcc3cb1a745d42ebf5d457084801dd28fa2de50706ed5a5a9c7c  90-android-touch-dev.rules
 bd5aba648930678aea38d2a67e584c94f5ab53d235c8f6ce785bc7e31db00e1cdf08fb84fd3fe78bd7b409a4120b2c7beadf77e028ec8580d4df48248a2c414f  fb.modes"
diff --git a/device/device-samsung-i9070/APKBUILD b/device/device-samsung-i9070/APKBUILD
index 6b8d3356c..bbea5573d 100644
--- a/device/device-samsung-i9070/APKBUILD
+++ b/device/device-samsung-i9070/APKBUILD
@@ -1,15 +1,15 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-i9070
 pkgver=1
-pkgrel=21
+pkgrel=22
 pkgdesc="Samsung Galaxy S Advance"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-samsung-i9070 firmware-samsung-i9070 mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-i9070 mesa-dri-swrast"
 makedepends="devicepkg-dev"
 install=""
-subpackages=""
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	initfs-hook.sh
@@ -30,6 +30,12 @@ package() {
 		"$pkgdir"/etc/modules-load.d/00-${pkgname}.conf
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-samsung-i9070"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="fe7b2af2abd441775705e5d228eab7904194bb3ef6af08a69593849e3380e6c9fc4905b3eac52e851aff0f2364a4425a79da8e6e48416b7a630754a525df3b9e  deviceinfo
 449e5047f9c15d536233fe2836cf10ae3dd2bf46f1c12ad0423f098bd54bff357438747a3c23aec9b1d8826146f87ff39d657c2b48247fb5ac4ebdeed65634fa  initfs-hook.sh
 61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load.conf"
diff --git a/device/device-samsung-i9100/APKBUILD b/device/device-samsung-i9100/APKBUILD
index 469185b79..130b4198e 100644
--- a/device/device-samsung-i9100/APKBUILD
+++ b/device/device-samsung-i9100/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-samsung-i9100
 pkgver=1
-pkgrel=18
+pkgrel=19
 pkgdesc="Samsung Galaxy SII"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-samsung-i9100 firmware-samsung-i9100 libsamsung-ipc mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-i9100 libsamsung-ipc mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
-subpackages=""
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	90-android-touch-dev.rules
@@ -23,6 +23,12 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-samsung-i9100"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="dbad2b2fffc0167aa91b5f56219d84557929f0d58da813b7c1277dc6c37ea05c672a4d0643091d18289fb7e7ffb62aefc295efd00dbbeccb695860a125c564a6  deviceinfo
 089635daddd88eec35451bfe98dc3713035e3623c896dd21305b990ecf422e8fbb54e010cf347919bbb3a7385f639ab119280477fe0783df3228168d97d96fc6  90-android-touch-dev.rules
 03da52725e676bc7db371cbf4b60bff8689eca469dae96a02ca7d6c194ed9f8c4ec9d19d1ac9212eeba0b73384fd213e86f2b93da94f37e5abe4cc3339281205  device-samsung-i9100.post-install"
diff --git a/device/device-samsung-i9305/APKBUILD b/device/device-samsung-i9305/APKBUILD
index ea553cf83..5b4a8659e 100644
--- a/device/device-samsung-i9305/APKBUILD
+++ b/device/device-samsung-i9305/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-samsung-i9305
 pkgver=1
-pkgrel=17
+pkgrel=18
 pkgdesc="Samsung Galaxy SIII LTE"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-samsung-i9305 firmware-samsung-i9305 mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-i9305 mkbootimg mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
-subpackages=""
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	90-android-touch-dev.rules
@@ -23,6 +23,12 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-samsung-i9305"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="43361c58d84463da8bbeab7a5b5756317b890b69253b011549696bda4b25e553217a7af61efd337718e5e791cda9bcc543ffaeba59f9d57245f45aacb8d848af  deviceinfo
 d70a03210458c771f94db920a8d3162a03fc7727f0fbafef4c1575ebc659c937c082f5c7a4dcdd1572925b973d628c6f4cf895c3b8b2a59af8142824468fe7c4  90-android-touch-dev.rules
 03da52725e676bc7db371cbf4b60bff8689eca469dae96a02ca7d6c194ed9f8c4ec9d19d1ac9212eeba0b73384fd213e86f2b93da94f37e5abe4cc3339281205  device-samsung-i9305.post-install"
diff --git a/device/device-samsung-i9505/APKBUILD b/device/device-samsung-i9505/APKBUILD
index 91af122b6..f15cb0a7c 100644
--- a/device/device-samsung-i9505/APKBUILD
+++ b/device/device-samsung-i9505/APKBUILD
@@ -1,12 +1,13 @@
 pkgname="device-samsung-i9505"
 pkgdesc="Samsung Galaxy S4 International"
 pkgver=0.4
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="postmarketos-base linux-samsung-i9505 firmware-samsung-i9505 mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-i9505 mkbootimg mesa-dri-swrast"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo 90-android-sec_touchscreen.rules"
 
 package() {
@@ -14,7 +15,12 @@ package() {
 		"$pkgdir"/etc/deviceinfo
 	install -D -m644 "$srcdir"/90-android-sec_touchscreen.rules \
 		"$pkgdir"/etc/udev/rules.d/90-android-sec_touchscreen.rules
+}
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-samsung-i9505"
+	mkdir "$subpkgdir"
 }
 
 sha512sums="3cf9bdd32bbaa9108dde668fa1c279e5166cd329898cc47d23d951d075feff814b319b5b7c373b16fe16285225ac3082ddc64a74b12a7ce8aa3f872c0bf3b9fd  deviceinfo
diff --git a/device/device-samsung-maguro/APKBUILD b/device/device-samsung-maguro/APKBUILD
index f7fc1b6ae..6ca73a022 100644
--- a/device/device-samsung-maguro/APKBUILD
+++ b/device/device-samsung-maguro/APKBUILD
@@ -1,15 +1,15 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-maguro
 pkgver=2
-pkgrel=18
+pkgrel=19
 pkgdesc="Google Galaxy Nexus (GSM)"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-samsung-maguro mkbootimg firmware-samsung-maguro mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-maguro mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 install=""
-subpackages=""
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo"
 options="!check"
 
@@ -21,4 +21,10 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-samsung-maguro"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="e44e78b362c7414eab0031b559732a18f3adf09cc02b3b9a6c05e1553cfebf91abf9f5364bdbb154d3883bdb71e1b3382b398fa38e1a15385ed2749568329c84  deviceinfo"
diff --git a/device/device-semc-anzu/APKBUILD b/device/device-semc-anzu/APKBUILD
index 28cb46e5e..272681933 100644
--- a/device/device-semc-anzu/APKBUILD
+++ b/device/device-semc-anzu/APKBUILD
@@ -2,13 +2,14 @@
 pkgname=device-semc-anzu
 pkgdesc="Xperia Arc"
 pkgver=1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="postmarketos-base linux-semc-anzu linux-firmware msm-fb-refresher mkbootimg libsparse mesa-dri-swrast"
+depends="postmarketos-base linux-semc-anzu msm-fb-refresher mkbootimg libsparse mesa-dri-swrast"
 makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	modules-load.conf
@@ -24,5 +25,11 @@ package() {
 		"$pkgdir"/etc/modules-load.d/00-${pkgname}.conf
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="linux-firmware"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="290725561229df2c70396a950aff00605122d146def342d9a48fbb282fe238175095d1cfefdb83668da8ef11eaaf048599a807ef06c37e051916a64f2cc25be5  deviceinfo
 fc2241310bfc9777cd2240857d9176c48dbc8bdbd871b280e2703a2dce7c3810c0a36b78557088d81a161900c74ece2015c40b3c7e72f7970b46a3991e7856c2  modules-load.conf"
diff --git a/device/device-sony-amami/APKBUILD b/device/device-sony-amami/APKBUILD
index c63df9427..091e9d4bd 100644
--- a/device/device-sony-amami/APKBUILD
+++ b/device/device-sony-amami/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-sony-amami
 pkgver=1
-pkgrel=17
+pkgrel=18
 pkgdesc="Sony Xperia Z1 Compact"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-sony-amami mkbootimg mdss-fb-init-hack firmware-sony-amami mesa-dri-swrast"
+depends="postmarketos-base linux-sony-amami mkbootimg mdss-fb-init-hack mesa-dri-swrast"
 makedepends=""
 install=""
-subpackages=""
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo 90-android-touch-dev.rules"
 options="!check"
 
@@ -19,5 +19,11 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-sony-amami"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="29e22a8edf9e7efce2231d1ae1de000d65911794ade8317d53b6b26bb1bad022087ec7c5a954c795b85084c622958d0d2a80d41c10c49c5332227d807da4fd7e  deviceinfo
 8b6034c0338ab4c7d648f47983aad6da07e427e7dba47baabf85a1b3ddeeda47c8d7fbcd547a302c9a759b2943ee30d3e82c3b368d8582833a058e4671638a9e  90-android-touch-dev.rules"
diff --git a/device/device-sony-castor-windy/APKBUILD b/device/device-sony-castor-windy/APKBUILD
index f8b34155d..466a9258d 100644
--- a/device/device-sony-castor-windy/APKBUILD
+++ b/device/device-sony-castor-windy/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-sony-castor-windy
 pkgver=1
-pkgrel=11
+pkgrel=12
 pkgdesc="Sony Xperia Z2 Tablet WIFI"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base mkbootimg linux-sony-castor-windy linux-firmware mesa-dri-freedreno firmware-adreno"
+depends="postmarketos-base mkbootimg linux-sony-castor-windy mesa-dri-freedreno"
 makedepends=""
 install=""
-subpackages=""
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="modules-load.conf deviceinfo 90-android-touch-dev.rules brcmfmac4335-sdio.txt"
 options="!check"
 
@@ -22,6 +22,13 @@ package() {
 	install -D -m644 "$srcdir"/modules-load.conf \
 		"$pkgdir"/etc/modules-load.d/00-${pkgname}.conf
 }
+
+nonfree_firmware() {
+	pkgdesc="Wifi, GPU firmware"
+	depends="linux-firmware firmware-adreno"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="d8ce60ea7acaabf627ddca2f0887a4cda46f313b7aaf7934bef2fef8a6e0798ccefab849e4571e4e3fcd06ae34c1a6efe3b58b401e2e443416f6200e6d4ea769  modules-load.conf
 2472ed5ff56825a195ff82e175813e8e4fc581a04255b74db7babc75efc8fe6424488e412d74e12f8d87dbc0cd2e1a7e678ea905aa97ddfbd7f671085c53f452  deviceinfo
 fa0d8b7a17509f5882424e67e66f5f562705a076a12e8d9dd9363215c858d7801216520cf25373110671958b1e1589080b097170c760d18e621849b0b9090e05  90-android-touch-dev.rules
diff --git a/device/device-sony-honami/APKBUILD b/device/device-sony-honami/APKBUILD
index 4a0317a02..31ec308f7 100644
--- a/device/device-sony-honami/APKBUILD
+++ b/device/device-sony-honami/APKBUILD
@@ -1,13 +1,14 @@
 pkgname="device-sony-honami"
 pkgdesc="Sony Xperia Z1"
 pkgver=1.0
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="postmarketos-base linux-sony-honami firmware-sony-amami msm-fb-refresher mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-sony-honami msm-fb-refresher mkbootimg mesa-dri-swrast"
 source="deviceinfo 90-android-touch-dev.rules"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 package() {
 	install -Dm644 "$srcdir"/deviceinfo \
@@ -16,5 +17,11 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
+nonfree_firmware() {
+	depends="firmware-sony-amami"
+	pkgdesc="Wifi firmware"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="21e41e8f92ad3b3c996d3c01d2aea2abab4fa88951ef6e3a4e8c3c5e1f05b8cbb91f64336486a11958944dd652f53d71c9b5c45ce0c566b51386f4927dd002c7  deviceinfo
 1651ac9eda3c97fafe55abe0f0ae429e04f73edcbf2c56aa3259f81837f7adde348bcb385daed05c30cfc61415455a459a917ed3acccbfd9b7a1caa32a851d40  90-android-touch-dev.rules"
diff --git a/device/device-t2m-flame/APKBUILD b/device/device-t2m-flame/APKBUILD
index 7a622ab23..10e302fc0 100644
--- a/device/device-t2m-flame/APKBUILD
+++ b/device/device-t2m-flame/APKBUILD
@@ -1,14 +1,15 @@
 pkgname=device-t2m-flame
 pkgver=1
-pkgrel=10
+pkgrel=11
 pkgdesc="Mozilla Flame"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-t2m-flame firmware-t2m-flame mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-t2m-flame mkbootimg mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 source="deviceinfo 90-android-touch-dev.rules $install"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 options="!check"
 
 package() {
@@ -18,6 +19,12 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-t2m-flame"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="2a674961778b4f9fc5d7fb5186d2fa958ba3659743279f887cbe3008ad7889ff9d9485583637e652b86f94f469bcd0927814c21bc9373228cde97a4f8ffc15e6  deviceinfo
 25256120a19cba6b6f9ae0cda7b2c8c84d168a6457e82afee438d50d2c28b9598bfe690301c15156d866b77cd87652d9b7cc3d9b0637f69414aae09fec159c91  90-android-touch-dev.rules
 0a301a723f2a6ad8285fa8c016a73b0d05ae9811a8c96cd73f6db274e85676f7b3d427ede46484665fd613b67ef42330f0b69413328c04c3f489db86c5aa9038  device-t2m-flame.post-install"
diff --git a/device/device-teclast-x80pro/APKBUILD b/device/device-teclast-x80pro/APKBUILD
index bd83b42e3..eecb93e1d 100644
--- a/device/device-teclast-x80pro/APKBUILD
+++ b/device/device-teclast-x80pro/APKBUILD
@@ -4,14 +4,15 @@
 pkgname="device-teclast-x80pro"
 pkgdesc="Teclast X80Pro"
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="postmarketos-base linux-teclast-x80pro linux-firmware"
+depends="postmarketos-base linux-teclast-x80pro"
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -21,4 +22,10 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="linux-firmware"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="18e6b8d59378fea9eb7f41b9aae755e493ea62dc199eb8f3f25ee4d55a1b823d80e881845941933067aea11e722b4fd0de097e38f32f64392ee1fd21256d08ec  deviceinfo"
diff --git a/device/device-xiaomi-armani/APKBUILD b/device/device-xiaomi-armani/APKBUILD
index 9104cea49..7d8d12f15 100644
--- a/device/device-xiaomi-armani/APKBUILD
+++ b/device/device-xiaomi-armani/APKBUILD
@@ -2,14 +2,15 @@
 pkgname="device-xiaomi-armani"
 pkgdesc="Redmi 1S"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="postmarketos-base linux-xiaomi-armani mkbootimg mesa-dri-swrast msm-fb-refresher firmware-xiaomi-armani"
+depends="postmarketos-base linux-xiaomi-armani mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install $pkgname.pre-deinstall"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo
 	90-touchscreen.rules
 	100-charging.rules
@@ -32,6 +33,12 @@ package() {
 	install -Dm755 "$srcdir"/wlanarmani "$pkgdir"/etc/init.d/wlanarmani
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-xiaomi-armani"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="8fdac59e87ee33d9c7981b46e6236877cd04536572aa14bb67af141dcf25b05656ffadea52fd402681f477c4eaf62ca8f118cbebd0612b63695aa741ac9bcfb9  deviceinfo
 abf694ebe949025268630457ad14ae69f6a33c151236c1a193da32c27f836591e932517f011f6eb7ce750ab74d2f1e9a70724fed7150210d4da1b80a6e86a801  90-touchscreen.rules
 862f9a8d81af74c0a1c99c6255d4ec9d4bdd7828636ee29fbaf4b3ceef53f236fd2b2078e3150baf0f1d78a3da87d7b3a5b975fef33014238eb7658428642571  100-charging.rules