[arch-commits] Commit in r8168/trunk (PKGBUILD r8168.install)

[Evangelos Foutras]

    Date: Monday, June 9, 2014 @ 14:14:03
  Author: foutrelis
Revision: 112890

upgpkg: r8168 8.038.00-5

Linux 3.15 rebuild.

Modified:
  r8168/trunk/PKGBUILD
  r8168/trunk/r8168.install

---------------+
 PKGBUILD      |   15 ++++++++++++++-
 r8168.install |    2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-09 12:13:59 UTC (rev 112889)
+++ PKGBUILD	2014-06-09 12:14:03 UTC (rev 112890)
@@ -5,7 +5,7 @@
 
 pkgname=r8168
 pkgver=8.038.00
-pkgrel=4
+pkgrel=5
 pkgdesc="A kernel module for Realtek 8168 network cards"
 url="http://www.realtek.com.tw"
 license=("GPL")
@@ -15,6 +15,19 @@
 source=("https://dl.dropboxusercontent.com/u/362439/archlinux/r8168-$pkgver.tar.bz2")
 install=$pkgname.install
 
+prepare(){
+	cd "$pkgname-$pkgver"
+
+	# Fix build with Linux 3.15
+	# https://code.google.com/p/r8168/issues/detail?id=19
+	if grep -q PREPARE_DELAYED_WORK src/r8168_n.c; then
+		sed -i 's/PREPARE_DELAYED_WORK/INIT_DELAYED_WORK/' src/r8168_n.c
+	else
+		error 'PREPARE_DELAYED_WORK fix for Linux 3.15 is no longer needed.'
+		return 1
+	fi
+}
+
 build() {
 	_kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
 	KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)

Modified: r8168.install
===================================================================
--- r8168.install	2014-06-09 12:13:59 UTC (rev 112889)
+++ r8168.install	2014-06-09 12:14:03 UTC (rev 112890)
@@ -1,5 +1,5 @@
 rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-3.13-ARCH'
+	EXTRAMODULES='extramodules-3.15-ARCH'
 	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }