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

[Jan Steffens]

    Date: Friday, October 11, 2019 @ 20:32:58
  Author: heftig
Revision: 515178

8.047.04-4: extramodules-lts removal

Modified:
  r8168-lts/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-11 20:32:57 UTC (rev 515177)
+++ PKGBUILD	2019-10-11 20:32:58 UTC (rev 515178)
@@ -1,32 +1,34 @@
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
 
 pkgname=r8168-lts
-_pkgname=r8168
 pkgver=8.047.04
-pkgrel=3
+pkgrel=4
 pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts"
 url="http://www.realtek.com.tw"
 license=("GPL")
 arch=('x86_64')
-depends=('glibc' "linux-lts>=4.19.78" "linux-lts<4.20")
-makedepends=("linux-lts-headers>=4.19.78" "linux-lts-headers<4.20")
+depends=('glibc' "linux-lts>=4.19.79" "linux-lts<4.20")
+makedepends=("linux-lts-headers>=4.19.79" "linux-lts-headers<4.20")
 source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz)
 sha256sums=('4a201c7691b66e47f19172367c70a14b8b38d600f0739719c57dba9c0cf3f17a')
 
-_extramodules=extramodules-lts
+build() {
+	local KERNEL_VERSION=$(</usr/src/linux-lts/version)
+	msg2 "Kernel = $KERNEL_VERSION"
 
-build() {
-	cd "$_pkgname-$pkgver"
-	KERNEL_VERSION="$(</usr/lib/modules/$_extramodules/version)"
+	cd "r8168-$pkgver"
+	# avoid using the Makefile directly -- it doesn't understand
+	# any kernel but the current.
 	make -C /usr/lib/modules/$KERNEL_VERSION/build \
-			SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \
+			SUBDIRS="$PWD/src" \
 			EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
 			modules
 }
 
 package() {
-	cd "$_pkgname-$pkgver"
-	install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 src/*.ko
+	local extradir=/usr/lib/modules/$(</usr/src/linux-lts/version)/extramodules
+	cd "r8168-$pkgver"
+	install -Dt "$pkgdir$extradir" -m644 src/*.ko
 	find "$pkgdir" -name '*.ko' -exec xz {} +
 
 	echo "blacklist r8169" | \