[arch-commits] Commit in rt3562sta/trunk (PKGBUILD)

[Massimiliano Torromeo]

    Date: Monday, March 16, 2015 @ 10:40:44
  Author: mtorromeo
Revision: 129350

upgpkg: rt3562sta 2.4.1.1_r2-1

Updated patchset release

Modified:
  rt3562sta/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-16 08:54:20 UTC (rev 129349)
+++ PKGBUILD	2015-03-16 09:40:44 UTC (rev 129350)
@@ -3,12 +3,12 @@
 # Based on SUSE spec https://build.opensuse.org/package/files?package=rt3562sta&project=driver%3Awireless
 
 pkgname=rt3562sta
-pkgver=2.4.1.1_r1
+pkgver=2.4.1.1_r2
 _patchrel=${pkgver/*_r/}
-pkgrel=21
+pkgrel=1
 pkgdesc="Ralink RT3562 PCI WLAN adaptors kernel module"
 arch=(i686 x86_64)
-url="http://www.mediatek.com/en/Products/support.php?sn=501"
+url="http://www.mediatek.com/en/products/connectivity/wifi/consumer-electronics/pcie/rt3562/"
 license=('GPL')
 depends=('linux')
 makedepends=('linux-headers')
@@ -16,45 +16,31 @@
 source=($pkgname-$pkgver.tar.gz::https://github.com/mtorromeo/rt3562sta-linux/archive/r${_patchrel}.tar.gz)
 
 build() {
-	_kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
-	KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
+	_kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+	KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version)
 
-	cd "$srcdir/rt3562sta-linux-r$_patchrel"
+	cd "$srcdir"/rt3562sta-linux-r$_patchrel
 
-	# clean up this mess of mixing RT2860STA with RT3562STA
-	# in documentation files
-	mv RT2860STA.dat RT3562STA.dat
-	mv RT2860STACard.dat RT3562STACard.dat
-	sed -i 's/2860/3562/g' *STA* iwpriv_usage.txt
-
-	# as we change the default name of the interface from raX to wlanX, change respective references in documentation, too
-	sed -i 's|ra0|wlan0|g' *.txt README* *.dat
-	sed -i 's|ra1|wlan1|g' *.txt README* *.dat
-	sed -i 's|ra2|wlan2|g' *.txt README* *.dat
-
-	export EXTRA_CFLAGS="-DVERSION=$pkgver"
-
-	# this Makefile is far too strict...
-	echo "LINUX_SRC = /usr/lib/modules/$KERNEL_RELEASE/build" >> Makefile
-
-	make
+	EXTRA_CFLAGS="-DVERSION=$pkgver" \
+	LINUX_SRC="/usr/lib/modules/$KERNEL_RELEASE/build" \
+		make
 }
 
 package() {
-	_kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
-	depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)")
-	KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
+	_kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+	depends=("linux>=$_kernver" "linux<${_kernver/.*}.$(expr ${_kernver/.*} + 1)")
+	KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version)
 	msg "Kernel = $KERNEL_VERSION"
 
-	cd "$srcdir/rt3562sta-linux-r$_patchrel"
+	cd "$srcdir"/rt3562sta-linux-r$_patchrel
 
 	install -Dm 0640 RT3562STA.dat "$pkgdir/etc/Wireless/RT3562STA/RT3562STA.dat"
-	install -Dm 0644 os/linux/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko"
+	install -Dm 0644 os/linux/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-$_kernver-ARCH/$pkgname.ko"
 	install -dm 0755 "$pkgdir/usr/share/doc/$pkgname"
 	install -m 0644 iwpriv_usage.txt README* RT3562STA* sta_ate_iwpriv_usage.txt "$pkgdir/usr/share/doc/$pkgname"
 
 	find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
-	sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
+	sed -i "s|extramodules-.*-ARCH|extramodules-$_kernver-ARCH|" "$startdir/$pkgname.install"
 }
 
-sha256sums=('6fd6306b6fb3886bbf9d284a28cc065a4cdfea18a03708e99aa4c7a038bcf02f')
+sha256sums=('fbb31034fac14d63f9ed16039b79743746d91e0587e3bdd036697f7fd39cef9a')