[arch-commits] Commit in r8168/trunk (PKGBUILD kernel-5.4.patch)

[Jan Steffens]

    Date: Tuesday, November 26, 2019 @ 00:12:48
  Author: heftig
Revision: 533318

8.047.05-2: linux 5.4.arch1-1

Added:
  r8168/trunk/kernel-5.4.patch
Modified:
  r8168/trunk/PKGBUILD

------------------+
 PKGBUILD         |   18 ++++++++++++------
 kernel-5.4.patch |   12 ++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-26 00:12:45 UTC (rev 533317)
+++ PKGBUILD	2019-11-26 00:12:48 UTC (rev 533318)
@@ -4,15 +4,22 @@
 
 pkgname=r8168
 pkgver=8.047.05
-pkgrel=1
+pkgrel=2
 pkgdesc="A kernel module for Realtek 8168 network cards"
 url="http://www.realtek.com.tw"
 license=("GPL")
 arch=('x86_64')
 makedepends=('linux-headers')
-source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('1344bf3d8a1d01a1be8805b48940be1b946b5e694ca75bd14ed1c76fd4c3d67b')
+source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz
+		kernel-5.4.patch)
+sha256sums=('1344bf3d8a1d01a1be8805b48940be1b946b5e694ca75bd14ed1c76fd4c3d67b'
+            'be79c151c6323bb4d340e31e44fae25a36a93d317812fe5d75c54649ed2508b0')
 
+prepare() {
+	cd "$pkgname-$pkgver"
+	patch -Np1 -i ../kernel-5.4.patch
+}
+
 build() {
 	local KERNEL_VERSION=$(</usr/src/linux/version)
 	msg2 "Kernel = $KERNEL_VERSION"
@@ -20,8 +27,7 @@
 	cd "$pkgname-$pkgver"
 	# avoid using the Makefile directly -- it doesn't understand
 	# any kernel but the current.
-	make -C /usr/lib/modules/$KERNEL_VERSION/build \
-			SUBDIRS="$PWD/src" \
+	make -C /usr/src/linux M="$PWD/src" \
 			EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
 			modules
 }
@@ -38,4 +44,4 @@
 		install -Dm644 /dev/stdin "$pkgdir/usr/lib/modprobe.d/$pkgname.conf"
 }
 
-# vim:set noet:
+# vim:set sw=0 noet:

Added: kernel-5.4.patch
===================================================================
--- kernel-5.4.patch	                        (rev 0)
+++ kernel-5.4.patch	2019-11-26 00:12:48 UTC (rev 533318)
@@ -0,0 +1,12 @@
+diff -u -r r8168-8.047.05/src/r8168_n.c r8168-8.047.05-5.4/src/r8168_n.c
+--- r8168-8.047.05/src/r8168_n.c	2019-11-25 18:01:38.000000000 +0000
++++ r8168-8.047.05-5.4/src/r8168_n.c	2019-11-25 23:36:15.427988367 +0000
+@@ -56,7 +56,7 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/completion.h>
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) && LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
+ #include <linux/pci-aspm.h>
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)