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

[Jan Steffens]

    Date: Saturday, November 18, 2017 @ 23:23:42
  Author: heftig
Revision: 267372

8.045.08-6

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

---------------+
 PKGBUILD      |   14 ++++++--------
 r8168.install |   17 -----------------
 2 files changed, 6 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-18 23:22:56 UTC (rev 267371)
+++ PKGBUILD	2017-11-18 23:23:42 UTC (rev 267372)
@@ -5,7 +5,7 @@
 
 pkgname=r8168
 pkgver=8.045.08
-pkgrel=5
+pkgrel=6
 pkgdesc="A kernel module for Realtek 8168 network cards"
 url="http://www.realtek.com.tw"
 license=("GPL")
@@ -12,7 +12,6 @@
 arch=('x86_64')
 depends=('glibc' 'linux')
 makedepends=('linux-headers')
-install=$pkgname.install
 source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz)
 sha256sums=('18161cb72fc872a9aed194514f7b8fb8b255b6fa6ed3d2dd459700eaad575f31')
 
@@ -19,9 +18,9 @@
 build() {
 	_kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
 	KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version)
+	msg2 "Kernel = $KERNEL_VERSION"
 
 	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 \
@@ -33,12 +32,11 @@
 package() {
 	_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 "$pkgname-$pkgver"
-	install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-$_kernver-ARCH/$pkgname.ko"
-	find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+	install -Dt "$pkgdir/usr/lib/modules/extramodules-$_kernver-ARCH" -m644 src/r8168.ko
+	find "$pkgdir" -name '*.ko' -exec gzip -n {} +
 
-	sed -i "s|extramodules-.*-ARCH|extramodules-$_kernver-ARCH|" "$startdir/$pkgname.install"
+	echo "blacklist r8169" | \
+		install -Dm644 /dev/stdin "$pkgdir/usr/lib/modprobe.d/r8168.conf"
 }

Deleted: r8168.install
===================================================================
--- r8168.install	2017-11-18 23:22:56 UTC (rev 267371)
+++ r8168.install	2017-11-18 23:23:42 UTC (rev 267372)
@@ -1,17 +0,0 @@
-rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-4.13-ARCH'
-	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  rebuild_module_dependencies
-	echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:'
-	echo '>>>  `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`'
-}
-post_upgrade() {
-	rebuild_module_dependencies
-}
-
-post_remove() {
-	rebuild_module_dependencies
-}