upgpkg: mt76-git r1915.g5f3ccc7-4

distinguish between firmwares and compiled drivers

2 files changed, 25 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7779fe453ff0..b06e4359117b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,7 @@
 pkgbase = mt76-git
 	pkgver = r1915.g5f3ccc7
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/openwrt/mt76
-	arch = x86_64
-	arch = i686
-	arch = arm
-	arch = armv6h
-	arch = armv7h
-	arch = aarch64
-	license = GPL2
-	license = ISC
 	makedepends = git
 	source = git+https://github.com/openwrt/mt76.git
 	source = wireless-mediatek-Replace-rcu_swap_protected-with-rc.patch
@@ -19,12 +11,23 @@ pkgbase = mt76-git
 	sha256sums = 1c4a61f05b090bd982d21f85568f28bdff6d3a26a9a8853603dcffdd4260cec0
 
 pkgname = mt76-dkms-git
-	pkgdesc = mac80211 driver for MediaTek MT76x2e, MT7603, MT7628 and MT7688
+	pkgdesc = mac80211 driver for MediaTek MT76x0e, MT76x2e, MT7603, MT7615, MT7628 and MT7688
+	arch = x86_64
+	arch = i686
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
+	license = GPL2
+	license = ISC
 	depends = dkms
-	depends = mt76-firmware-git
+	optdepends = linux-firmware: basic set of firmwares
+	optdepends = mt76-firmware-git: complementary set of firmwares
 	provides = mt76-dkms
 
 pkgname = mt76-firmware-git
-	pkgdesc = Firmware for MediaTek MT76x2e, MT7603, MT7628 and MT7688
+	pkgdesc = Firmware for MediaTek MT76x2e, MT7603, MT7628
+	arch = any
+	license = custom:Ralink Limited Patent License
 	provides = mt76-firmware
 
diff --git a/PKGBUILD b/PKGBUILD
index ca4a37e71a90..97f86394ee80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,8 @@
 pkgbase=mt76-git
 pkgname=('mt76-dkms-git' 'mt76-firmware-git')
 pkgver=r1915.g5f3ccc7
-pkgrel=3
-arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
+pkgrel=4
 url='https://github.com/openwrt/mt76'
-license=('GPL2' 'ISC')
 makedepends=('git')
 source=("git+${url}.git"
         'wireless-mediatek-Replace-rcu_swap_protected-with-rc.patch'
@@ -23,9 +21,13 @@ pkgver() {
 }
 
 package_mt76-dkms-git() {
-	pkgdesc='mac80211 driver for MediaTek MT76x2e, MT7603, MT7628 and MT7688'
+	pkgdesc='mac80211 driver for MediaTek MT76x0e, MT76x2e, MT7603, MT7615, MT7628 and MT7688'
+	arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
+	license=('GPL2' 'ISC')
 	provides=('mt76-dkms')
-	depends=('dkms' 'mt76-firmware-git')
+	depends=('dkms')
+	optdepends=('linux-firmware: basic set of firmwares'
+	            'mt76-firmware-git: complementary set of firmwares')
 
 	install -dm755 ${pkgdir}/usr/src/mt76-${pkgver}/patches
 	cp -r ${srcdir}/mt76/* ${pkgdir}/usr/src/mt76-${pkgver}/
@@ -35,7 +37,9 @@ package_mt76-dkms-git() {
 }
 
 package_mt76-firmware-git() {
-	pkgdesc='Firmware for MediaTek MT76x2e, MT7603, MT7628 and MT7688'
+	pkgdesc='Firmware for MediaTek MT76x2e, MT7603, MT7628'
+	arch=('any')
+	license=('custom:Ralink Limited Patent License')
 	provides=('mt76-firmware')
 
 	install -dm755 ${pkgdir}/usr/lib/firmware/mediatek