summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorindra17r2018-06-21 00:04:15 +0700
committerindra17r2018-06-21 00:04:15 +0700
commit656458ba213c77cfa385621b7503952f3a162996 (patch)
treec87990cdcc9885f55ea457766dff71ccf26fca05
parentbe581990c532fa43af623b9eb75b566e417c1c73 (diff)
downloadaur-mt7601u-ap-dkms.tar.gz
fix error on reinstall/upgrade
-rw-r--r--.SRCINFO10
-rw-r--r--001-MT7601u-Linux-4.x.patch12
-rw-r--r--PKGBUILD4
-rw-r--r--mt7601u-ap-dkms.install16
4 files changed, 16 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9a3ce5a54d4c..bb83ddcac5e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,22 @@
pkgbase = mt7601u-ap-dkms
pkgdesc = Kernel module for Ralink MT7601U chipset wireless adaptors with Access Point (AP / Master) support.
pkgver = 3.0.0.3
- pkgrel = 2
+ pkgrel = 3
url = http://www.ralinktech.com
install = mt7601u-ap-dkms.install
arch = any
license = GPL
depends = dkms
options = !strip
- source = https://github.com/housq/mt7601u/archive/master.zip
+ source = https://github.com/setarcos/MT7601u/archive/master.zip
source = mt7601u-ap.conf
+ source = blacklist-mt7601u.conf
+ source = 001-MT7601u-Linux-4.x.patch
source = dkms.conf
- sha256sums = 952e6200163132fd1ee3f01b739b842129dfc05282e6366c80ac191d87b38da6
+ sha256sums = 53a0b97563b61396b0bcde9ffeb677f7dbe46db764fb367517e0c99e90fd6e2f
sha256sums = 5cb57146dcbc238feff1c0e1836dea995c33180892327eba02804a0755ce9a81
+ sha256sums = 2c14cefbb3fe1229412f09129675948db40e60550ad8413dd31e8e24c9d7b189
+ sha256sums = 1dbb027a32cffafbaf457f8d8672be669d1bdcac7d6184003afb6a11c70663f6
sha256sums = a4d4f94c9492f344d4baa05d5f5ce132eb3bf0f9fb6eec161a87eea9450ebc12
pkgname = mt7601u-ap-dkms
diff --git a/001-MT7601u-Linux-4.x.patch b/001-MT7601u-Linux-4.x.patch
index 61ccc2edc9ac..c22bd30b48eb 100644
--- a/001-MT7601u-Linux-4.x.patch
+++ b/001-MT7601u-Linux-4.x.patch
@@ -1,6 +1,6 @@
-diff -ru MT7601u-2/src/include/os/rt_linux.h MT7601u/src/include/os/rt_linux.h
---- MT7601u-2/src/include/os/rt_linux.h 2018-06-17 19:34:56.006528978 +0700
-+++ MT7601u/src/include/os/rt_linux.h 2018-06-18 04:09:48.253593046 +0700
+diff -ru a/src/include/os/rt_linux.h b/src/include/os/rt_linux.h
+--- a/src/include/os/rt_linux.h
++++ b/src/include/os/rt_linux.h
@@ -83,6 +83,8 @@
#include <linux/kthread.h>
#endif /* KTHREAD_SUPPORT */
@@ -10,9 +10,9 @@ diff -ru MT7601u-2/src/include/os/rt_linux.h MT7601u/src/include/os/rt_linux.h
#include "os/rt_linux_cmm.h"
-diff -ru MT7601u-2/src/os/linux/rt_linux.c MT7601u/src/os/linux/rt_linux.c
---- MT7601u-2/src/os/linux/rt_linux.c 2018-06-17 19:34:56.026529050 +0700
-+++ MT7601u/src/os/linux/rt_linux.c 2018-06-18 05:15:53.294949852 +0700
+diff -ru a/src/os/linux/rt_linux.c b/src/os/linux/rt_linux.c
+--- a/src/os/linux/rt_linux.c
++++ b/src/os/linux/rt_linux.c
@@ -1165,7 +1165,7 @@
/* The object must have a read method */
if (osfd->f_op /*&& osfd->f_op->read*/) {
diff --git a/PKGBUILD b/PKGBUILD
index 6f64f7063be5..2f5a809078c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname=mt7601u-ap
pkgname=${_pkgname}-dkms
pkgver=3.0.0.3
_pkg=${_pkgname}-${pkgver}
-pkgrel=2
+pkgrel=3
pkgdesc="Kernel module for Ralink MT7601U chipset wireless adaptors with Access Point (AP / Master) support."
arch=('any')
url="http://www.ralinktech.com"
@@ -26,7 +26,7 @@ source=("https://github.com/setarcos/MT7601u/archive/master.zip"
sha256sums=('53a0b97563b61396b0bcde9ffeb677f7dbe46db764fb367517e0c99e90fd6e2f'
'5cb57146dcbc238feff1c0e1836dea995c33180892327eba02804a0755ce9a81'
'2c14cefbb3fe1229412f09129675948db40e60550ad8413dd31e8e24c9d7b189'
- '3eacca3e1b034aba788ced29f452c47706e9b31ed7c624fb5c006ce751406f40'
+ '1dbb027a32cffafbaf457f8d8672be669d1bdcac7d6184003afb6a11c70663f6'
'a4d4f94c9492f344d4baa05d5f5ce132eb3bf0f9fb6eec161a87eea9450ebc12')
prepare() {
diff --git a/mt7601u-ap-dkms.install b/mt7601u-ap-dkms.install
index bf5a5c2ae25d..26ec7aedc69d 100644
--- a/mt7601u-ap-dkms.install
+++ b/mt7601u-ap-dkms.install
@@ -1,23 +1,9 @@
-# old version (without -$pkgrel): ${1%%-*}
-# new version (without -$pkgrel): ${2%%-*}
+#!/bin/sh
post_install() {
- dkms install mt7601u-ap/${1%%-*}
echo ">>> You might need to modprobe mt7601Uap manually."
echo ">>> Also, you *must* change the default values (especially WPAPSK)"
echo ">>> in /etc/Wireless/RT2870AP/RT2870AP.dat"
echo ">>> Read the documentation in /usr/src/mt7601u-ap-3.0.0.3/doc."
}
-pre_upgrade() {
- pre_remove ${2%%-*}
-}
-
-post_upgrade() {
- post_install ${1%%-*}
-}
-
-pre_remove() {
- dkms remove mt7601u-ap/${1%%-*} --all
-}
-