upgpkg: mt76-git r1970.gf85c1f3-1

add new drivers and break overly long make line

3 files changed, 41 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d8420d1f6af4..4496b018dd99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mt76-git
-	pkgver = r1915.g5f3ccc7
-	pkgrel = 5
+	pkgver = r1970.gf85c1f3
+	pkgrel = 1
 	url = https://github.com/openwrt/mt76
 	arch = x86_64
 	arch = i686
@@ -14,7 +14,7 @@ pkgbase = mt76-git
 	source = dkms.conf
 	sha256sums = SKIP
 	sha256sums = 464dcf601bbfbce3e0dd7fcb5008f44b979c6ad85325244d0e0aa3cdea7fb13e
-	sha256sums = 1c4a61f05b090bd982d21f85568f28bdff6d3a26a9a8853603dcffdd4260cec0
+	sha256sums = f98eb3f3a0b20ec76490aae595d264f770489c4ab8e17de6353b35ae579a92a1
 
 pkgname = mt76-dkms-git
 	pkgdesc = mac80211 driver for MediaTek MT76x0e, MT76x2e, MT7603, MT7615, MT7628 and MT7688
diff --git a/PKGBUILD b/PKGBUILD
index 812334b15cff..dd772b7d6831 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbase=mt76-git
 pkgname=('mt76-dkms-git' 'mt76-firmware-git')
-pkgver=r1915.g5f3ccc7
-pkgrel=5
+pkgver=r1970.gf85c1f3
+pkgrel=1
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://github.com/openwrt/mt76'
 makedepends=('git')
@@ -14,7 +14,7 @@ source=("git+${url}.git"
         'dkms.conf')
 sha256sums=('SKIP'
             '464dcf601bbfbce3e0dd7fcb5008f44b979c6ad85325244d0e0aa3cdea7fb13e'
-            '1c4a61f05b090bd982d21f85568f28bdff6d3a26a9a8853603dcffdd4260cec0')
+            'f98eb3f3a0b20ec76490aae595d264f770489c4ab8e17de6353b35ae579a92a1')
 
 pkgver() {
 	cd ${srcdir}/mt76
diff --git a/dkms.conf b/dkms.conf
index 92583eab0b64..14f5cbf4823d 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -2,7 +2,25 @@ PACKAGE_NAME="mt76"
 PACKAGE_VERSION="@PKGVER@"
 AUTOINSTALL="yes"
 
-MAKE[0]="make -C $kernel_source_dir M=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build NOSTDINC_FLAGS=-I$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build CONFIG_MT76_USB=m CONFIG_MT76x02_LIB=m CONFIG_MT76x02_USB=m CONFIG_MT76x0_COMMON=m CONFIG_MT76x0E=m CONFIG_MT76x0U=m CONFIG_MT76x2_COMMON=m CONFIG_MT76x2E=m CONFIG_MT76x2U=m CONFIG_MT7603E=m CONFIG_MT7615_COMMON=m CONFIG_MT7615E=m modules"
+MAKE[0]="make \
+	-C $kernel_source_dir \
+	M=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build \
+	NOSTDINC_FLAGS=-I$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build \
+	CONFIG_MT76_USB=m \
+	CONFIG_MT76x02_LIB=m \
+	CONFIG_MT76x02_USB=m \
+	CONFIG_MT76x0_COMMON=m \
+	CONFIG_MT76x0E=m \
+	CONFIG_MT76x0U=m \
+	CONFIG_MT76x2_COMMON=m \
+	CONFIG_MT76x2E=m \
+	CONFIG_MT76x2U=m \
+	CONFIG_MT7603E=m \
+	CONFIG_MT7615_COMMON=m \
+	CONFIG_MT7615E=m \
+	CONFIG_MT7663U=m \
+	CONFIG_MT7915E=m \
+	modules"
 
 BUILT_MODULE_NAME[0]="mt76"
 DEST_MODULE_LOCATION[0]="/extramodules/mt76"
@@ -24,28 +42,36 @@ BUILT_MODULE_NAME[4]="mt7615e"
 BUILT_MODULE_LOCATION[4]="mt7615"
 DEST_MODULE_LOCATION[4]="/extramodules/mt76"
 
-BUILT_MODULE_NAME[5]="mt76x0-common"
-BUILT_MODULE_LOCATION[5]="mt76x0"
+BUILT_MODULE_NAME[5]="mt7663u"
+BUILT_MODULE_LOCATION[5]="mt7615"
 DEST_MODULE_LOCATION[5]="/extramodules/mt76"
 
-BUILT_MODULE_NAME[6]="mt76x0e"
+BUILT_MODULE_NAME[6]="mt76x0-common"
 BUILT_MODULE_LOCATION[6]="mt76x0"
 DEST_MODULE_LOCATION[6]="/extramodules/mt76"
 
-BUILT_MODULE_NAME[7]="mt76x0u"
+BUILT_MODULE_NAME[7]="mt76x0e"
 BUILT_MODULE_LOCATION[7]="mt76x0"
 DEST_MODULE_LOCATION[7]="/extramodules/mt76"
 
-BUILT_MODULE_NAME[8]="mt76x2-common"
-BUILT_MODULE_LOCATION[8]="mt76x2"
+BUILT_MODULE_NAME[8]="mt76x0u"
+BUILT_MODULE_LOCATION[8]="mt76x0"
 DEST_MODULE_LOCATION[8]="/extramodules/mt76"
 
-BUILT_MODULE_NAME[9]="mt76x2e"
+BUILT_MODULE_NAME[9]="mt76x2-common"
 BUILT_MODULE_LOCATION[9]="mt76x2"
 DEST_MODULE_LOCATION[9]="/extramodules/mt76"
 
-BUILT_MODULE_NAME[10]="mt76x2u"
+BUILT_MODULE_NAME[10]="mt76x2e"
 BUILT_MODULE_LOCATION[10]="mt76x2"
 DEST_MODULE_LOCATION[10]="/extramodules/mt76"
 
+BUILT_MODULE_NAME[11]="mt76x2u"
+BUILT_MODULE_LOCATION[11]="mt76x2"
+DEST_MODULE_LOCATION[11]="/extramodules/mt76"
+
+BUILT_MODULE_NAME[12]="mt7915e"
+BUILT_MODULE_LOCATION[12]="mt7915"
+DEST_MODULE_LOCATION[12]="/extramodules/mt76"
+
 PATCH[0]="wireless-mediatek-Replace-rcu_swap_protected-with-rc.patch"