From ec89a35b5d281dbd53ce361a88bc4faceb544698 Mon Sep 17 00:00:00 2001
From: Peter Chinetti <peter@chinetti.me>
Date: Sun, 13 Jul 2014 16:32:03 -0400
Subject: [PATCH] Fix dkms-mt7601 to use v3.0.0.4 upsteam src.

Fixes build failure on kernel 3.14 caused by kernel data structure change into
an actual C struct.

It also uses the new v3.0.0.4 upstream sources. The source.tar.bz2 has
been rehosted on github.io.
---
 alarm/dkms-mt7601/PKGBUILD            | 16 ++++++++--------
 alarm/dkms-mt7601/dkms-mt7601.install |  8 ++++++--
 alarm/dkms-mt7601/dkms.conf           | 10 ++--------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/alarm/dkms-mt7601/PKGBUILD b/alarm/dkms-mt7601/PKGBUILD
index 368bee088..00a357985 100644
--- a/alarm/dkms-mt7601/PKGBUILD
+++ b/alarm/dkms-mt7601/PKGBUILD
@@ -1,8 +1,8 @@
 pkgname=dkms-mt7601
-pkgver=v3.0.0.3
+pkgver=v3.0.0.4
 pkgrel=1
 pkgdesc="Driver for Ralink MT7601 chipset wireless adaptors"
-arch=('arm')
+arch=('arm' 'armv7h')
 url="http://www.ralinktech.com"
 license=('GPL')
 depends=('dkms' 'linux-headers')
@@ -10,20 +10,20 @@ conflicts=()
 install=${pkgname}.install
 options=(!strip)
 _pkgname="mt7601"
-source=("https://googledrive.com/host/0B_JlgOR4VNe0Sjg4ei0ySEY4aUE/DPA_MT7601U_LinuxSTA_3.0.0.3_20130717_LS.tar.bz2"
+source=("https://ddaygold.github.io/DPO_MT7601U_LinuxSTA_3.0.0.4_20130913.pfc.tar.bz2"
         "dkms.conf")
 
-md5sums=('7597450f4374ecaa5798a8f60c956911'
-         '230952e09ff23d9725fc329a2e9522e3')
+md5sums=('f7984ea77c465a01e89453a8b60f9e4f'
+         'f07b4518d0f1190e0c72230137afadb4')
 
 package() {
 
     # Change src dir name
-    mv ${srcdir}/DPA_MT7601U_LinuxSTA_3.0.0.3_20130717_LS ${srcdir}/$_pkgname-$pkgver
+    mv ${srcdir}/DPO_MT7601U_LinuxSTA_3.0.0.4_20130913 ${srcdir}/$_pkgname-$pkgver
 
     # Copy Makefile to subdir (because symbolic link is not copied for some reason)
-    rm ${srcdir}/$_pkgname-$pkgver/UTIL/Makefile
-    cp ${srcdir}/$_pkgname-$pkgver/Makefile.inc ${srcdir}/$_pkgname-$pkgver/UTIL/Makefile
+    #rm ${srcdir}/$_pkgname-$pkgver/UTIL/Makefile
+    #cp ${srcdir}/$_pkgname-$pkgver/Makefile.inc ${srcdir}/$_pkgname-$pkgver/UTIL/Makefile
 
     installDir="$pkgdir/usr/src/$_pkgname-$pkgver"
 
diff --git a/alarm/dkms-mt7601/dkms-mt7601.install b/alarm/dkms-mt7601/dkms-mt7601.install
index 9368d9712..968a7fcc6 100644
--- a/alarm/dkms-mt7601/dkms-mt7601.install
+++ b/alarm/dkms-mt7601/dkms-mt7601.install
@@ -1,11 +1,12 @@
 post_install (){
 
     MODULE="mt7601"
-    VERSION="v3.0.0.3"
+    VERSION="v3.0.0.4"
     DKMS=$(which dkms)
     MODPROBE=$(which modprobe)
     CP=$(which cp)
     MKDIR=$(which mkdir)
+    DEPMOD=$(which depmod)
 
     # TODO: replace /usr/src with a variable.
     SRCDIR=/usr/src/$MODULE-$VERSION
@@ -20,7 +21,10 @@ post_install (){
     $MKDIR -p $PARAMSDIR
     $CP $SRCDIR/RT2870STA.dat $PARAMSDIR
 
-    $MODPROBE -a mt7601Usta mtutil7601Usta mtnet7601Usta
+    $DEPMOD -a $(uname -r)
+
+    #$MODPROBE -a mt7601Usta mtutil7601Usta mtnet7601Usta
+    $MODPROBE -a mt7601Usta 
 }
 
 pre_upgrade(){
diff --git a/alarm/dkms-mt7601/dkms.conf b/alarm/dkms-mt7601/dkms.conf
index 08ade38f0..ccc89a5f1 100644
--- a/alarm/dkms-mt7601/dkms.conf
+++ b/alarm/dkms-mt7601/dkms.conf
@@ -1,19 +1,13 @@
 PACKAGE_NAME="mt7601"
-PACKAGE_VERSION="v3.0.0.3"
+PACKAGE_VERSION="v3.0.0.4"
 
 AUTOINSTALL="yes"
 
 MAKE[0]="make"
 
 BUILT_MODULE_NAME[0]="mt7601Usta"
-BUILT_MODULE_NAME[1]="mtutil7601Usta"
-BUILT_MODULE_NAME[2]="mtnet7601Usta"
 
-BUILT_MODULE_LOCATION[0]="MODULE/os/linux"
-BUILT_MODULE_LOCATION[1]="UTIL/os/linux"
-BUILT_MODULE_LOCATION[2]="NETIF/os/linux"
+BUILT_MODULE_LOCATION[0]="os/linux"
 
 DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless"
-DEST_MODULE_LOCATION[1]="/kernel/drivers/net/wireless"
-DEST_MODULE_LOCATION[2]="/kernel/drivers/net/wireless"