Copied from AUR 3

4 files changed, 41 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e1c23cf8f33..f5b10f563eaa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mt7630-pcie-wifi-dkms
 	pkgdesc = MT7630e PCIe Wifi (DKMS)
 	pkgver = 20140625
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.mediatek.com/en/downloads/mt7630-pcie/
 	install = MT7630e-wifi.install
 	arch = i686
@@ -13,10 +13,12 @@ pkgbase = mt7630-pcie-wifi-dkms
 	source = dkms.conf
 	source = MT7630E-3.15.patch
 	source = MT7630E-4.0.patch
+	source = Makefile
 	md5sums = d8583926d6c8ba8c3a1a8dd0b44a066e
-	md5sums = aa288cf135a28dcb2bc90e8f80ea4f97
+	md5sums = f3537d4e8347cbcfe00a277a8818a458
 	md5sums = 561dc16b3df8f48aa15c2ce1ce1e6d3b
 	md5sums = 2997d0c6492e62f25050e92b3643d853
+	md5sums = d727dd9c28d0831c66c776e9af8993cf
 
 pkgname = mt7630-pcie-wifi-dkms
 
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000000..7541b58ff03e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+
+rt7630pci-y	+= rt2x00dev.o
+rt7630pci-y	+= rt2x00mac.o
+rt7630pci-y	+= rt2x00config.o
+rt7630pci-y	+= rt2x00queue.o
+rt7630pci-y	+= rt2x00link.o
+rt7630pci-y	+= mt_linux.o
+rt7630pci-y	+= rt2x00crypto.o
+rt7630pci-y	+= rt2x00firmware.o
+rt7630pci-y	+= rt2x00leds.o
+rt7630pci-y	+= rt2x00mmio.o
+rt7630pci-y	+= rt2x00pci.o
+rt7630pci-y	+= rt2800lib.o
+rt7630pci-y	+= rt2800pci.o
+
+obj-m		+= rt7630pci.o
+
+KVERSION:= $(shell uname -r)
+
+all:
+	$(MAKE) -C /lib/modules/$(KVERSION)/build M=$(PWD) modules
+clean:
+	$(MAKE) -C /lib/modules/$(KVERSION)/build M=$(PWD) clean
diff --git a/PKGBUILD b/PKGBUILD
index 3fbe30072525..a839815abd35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mt7630-pcie-wifi-dkms
 pkgver=20140625
-pkgrel=5
+pkgrel=6
 pkgdesc="MT7630e PCIe Wifi (DKMS)"
 arch=('i686' 'x86_64')
 url="http://www.mediatek.com/en/downloads/mt7630-pcie/"
@@ -13,11 +13,13 @@ install=MT7630e-wifi.install
 source=('http://www.mediatek.com/AmazonS3/Downloads/linux/MT7630E_Wi-Fi_BT_Source_V3.14_20140625_v2.tar.gz'
         'dkms.conf'
         'MT7630E-3.15.patch'
-        'MT7630E-4.0.patch')
+        'MT7630E-4.0.patch'
+        'Makefile')
 md5sums=('d8583926d6c8ba8c3a1a8dd0b44a066e'
-         'aa288cf135a28dcb2bc90e8f80ea4f97'
+         'f3537d4e8347cbcfe00a277a8818a458'
          '561dc16b3df8f48aa15c2ce1ce1e6d3b'
-         '2997d0c6492e62f25050e92b3643d853')
+         '2997d0c6492e62f25050e92b3643d853'
+         'd727dd9c28d0831c66c776e9af8993cf')
 
 prepare() {
     cd "$srcdir/MT7630E_Wi-Fi_BT_Source_V3.14_20140625_v2"
@@ -33,10 +35,11 @@ package() {
     rm "${pkgdir}/usr/src/mt7630-pcie-wifi-${pkgver}"/*.sh
     install -m644 "$srcdir/dkms.conf" "${pkgdir}/usr/src/mt7630-pcie-wifi-${pkgver}/"
     
+    rm "${pkgdir}/usr/src/mt7630-pcie-wifi-${pkgver}/Makefile"
+    install -m644 "$srcdir/Makefile" "${pkgdir}/usr/src/mt7630-pcie-wifi-${pkgver}/"
+    
     install -D -m644 "firmware/Wi-FI/MT7650E234.bin" "$pkgdir/usr/lib/firmware/MT7650E234.bin"
-
-    cd "${pkgdir}/usr/src/mt7630-pcie-wifi-${pkgver}/"
-    echo '#!/bin/sh' > rm-orig-module.sh
-    echo 'rm -f /usr/lib/modules/*/kernel/drivers/net/wireless/rt2x00/*' >> rm-orig-module.sh
-    chmod +x rm-orig-module.sh
+    
+    mkdir -p "$pkgdir/usr/lib/modules-load.d/"
+    echo rt7630pci > "$pkgdir/usr/lib/modules-load.d/mt7630.conf"
 }
diff --git a/dkms.conf b/dkms.conf
index 5eca3db73e6e..2b3294e7cdbe 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,29 +1,6 @@
 PACKAGE_NAME="mt7630-pcie-wifi"
 PACKAGE_VERSION="20140625"
-BUILT_MODULE_NAME[0]="rt2800pci"
-BUILT_MODULE_NAME[1]="rt2400pci"
-BUILT_MODULE_NAME[2]="rt2800lib"
-BUILT_MODULE_NAME[3]="rt2800usb"
-BUILT_MODULE_NAME[4]="rt2x00pci"
-BUILT_MODULE_NAME[5]="rt2x00usb"
-BUILT_MODULE_NAME[6]="rt2x00mmio"
-BUILT_MODULE_NAME[7]="rt2500usb"
-BUILT_MODULE_NAME[8]="rt2x00lib"
-BUILT_MODULE_NAME[9]="rt61pci"
-BUILT_MODULE_NAME[10]="rt2500pci"
-BUILT_MODULE_NAME[11]="rt73usb"
-DEST_MODULE_LOCATION[0]="/kernel/mt7630"
-DEST_MODULE_LOCATION[1]="/kernel/mt7630"
-DEST_MODULE_LOCATION[2]="/kernel/mt7630"
-DEST_MODULE_LOCATION[3]="/kernel/mt7630"
-DEST_MODULE_LOCATION[4]="/kernel/mt7630"
-DEST_MODULE_LOCATION[5]="/kernel/mt7630"
-DEST_MODULE_LOCATION[6]="/kernel/mt7630"
-DEST_MODULE_LOCATION[7]="/kernel/mt7630"
-DEST_MODULE_LOCATION[8]="/kernel/mt7630"
-DEST_MODULE_LOCATION[9]="/kernel/mt7630"
-DEST_MODULE_LOCATION[10]="/kernel/mt7630"
-DEST_MODULE_LOCATION[11]="/kernel/mt7630"
+BUILT_MODULE_NAME[0]="rt7630pci"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless"
 AUTOINSTALL="yes"
 REMAKE_INITRD="yes"
-PRE_INSTALL="rm-orig-module.sh"