[arch-commits] Commit in r8168/repos (10 files)
Tobias Powalowski
tpowa at archlinux.org
Wed Oct 5 10:44:41 UTC 2016
Date: Wednesday, October 5, 2016 @ 10:44:41
Author: tpowa
Revision: 191363
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
r8168/repos/community-testing-i686/
r8168/repos/community-testing-i686/PKGBUILD
(from rev 191362, r8168/trunk/PKGBUILD)
r8168/repos/community-testing-i686/linux-4.5.patch
(from rev 191362, r8168/trunk/linux-4.5.patch)
r8168/repos/community-testing-i686/linux-4.7.patch
(from rev 191362, r8168/trunk/linux-4.7.patch)
r8168/repos/community-testing-i686/r8168.install
(from rev 191362, r8168/trunk/r8168.install)
r8168/repos/community-testing-x86_64/
r8168/repos/community-testing-x86_64/PKGBUILD
(from rev 191362, r8168/trunk/PKGBUILD)
r8168/repos/community-testing-x86_64/linux-4.5.patch
(from rev 191362, r8168/trunk/linux-4.5.patch)
r8168/repos/community-testing-x86_64/linux-4.7.patch
(from rev 191362, r8168/trunk/linux-4.7.patch)
r8168/repos/community-testing-x86_64/r8168.install
(from rev 191362, r8168/trunk/r8168.install)
------------------------------------------+
community-testing-i686/PKGBUILD | 54 +++++++++++++++++++++++++++++
community-testing-i686/linux-4.5.patch | 13 ++++++
community-testing-i686/linux-4.7.patch | 34 ++++++++++++++++++
community-testing-i686/r8168.install | 17 +++++++++
community-testing-x86_64/PKGBUILD | 54 +++++++++++++++++++++++++++++
community-testing-x86_64/linux-4.5.patch | 13 ++++++
community-testing-x86_64/linux-4.7.patch | 34 ++++++++++++++++++
community-testing-x86_64/r8168.install | 17 +++++++++
8 files changed, 236 insertions(+)
Copied: r8168/repos/community-testing-i686/PKGBUILD (from rev 191362, r8168/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2016-10-05 10:44:41 UTC (rev 191363)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Bob Fanger < bfanger(at)gmail >
+# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
+
+pkgname=r8168
+pkgver=8.042
+pkgrel=5
+pkgdesc="A kernel module for Realtek 8168 network cards"
+url="http://www.realtek.com.tw"
+license=("GPL")
+arch=('i686' 'x86_64')
+depends=('glibc' 'linux')
+makedepends=('linux-headers')
+install=$pkgname.install
+source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz
+ linux-4.5.patch
+ linux-4.7.patch)
+sha256sums=('9dd8ae22115bcbef98c15b0b1e2160300cce3129ef7e0485d7e577188ba3fcc2'
+ 'e05a4bccf28beecc97db246064a5fe80d1303476b76086bd262c9c8db82b2e6e'
+ 'bbdc817278b17a1803c74228eaccbddb347ae92424a9a6cc92a68946f5392969')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -p1 -i ../linux-4.5.patch
+ patch -p1 -i ../linux-4.7.patch
+}
+
+build() {
+ _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+ KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/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 \
+ SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
+ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
+ modules
+}
+
+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 {} +
+
+ sed -i "s|extramodules-.*-ARCH|extramodules-$_kernver-ARCH|" "$startdir/$pkgname.install"
+}
Copied: r8168/repos/community-testing-i686/linux-4.5.patch (from rev 191362, r8168/trunk/linux-4.5.patch)
===================================================================
--- community-testing-i686/linux-4.5.patch (rev 0)
+++ community-testing-i686/linux-4.5.patch 2016-10-05 10:44:41 UTC (rev 191363)
@@ -0,0 +1,13 @@
+diff --git a/src/r8168_n.c b/src/r8168_n.c
+index d197630..b47419d 100755
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -4209,7 +4209,7 @@ static netdev_features_t rtl8168_fix_features(struct net_device *dev,
+ spin_lock_irqsave(&tp->lock, flags);
+ if (dev->mtu > ETH_DATA_LEN) {
+ features &= ~NETIF_F_ALL_TSO;
+- features &= ~NETIF_F_ALL_CSUM;
++ features &= ~NETIF_F_CSUM_MASK;
+ }
+ spin_unlock_irqrestore(&tp->lock, flags);
+
Copied: r8168/repos/community-testing-i686/linux-4.7.patch (from rev 191362, r8168/trunk/linux-4.7.patch)
===================================================================
--- community-testing-i686/linux-4.7.patch (rev 0)
+++ community-testing-i686/linux-4.7.patch 2016-10-05 10:44:41 UTC (rev 191363)
@@ -0,0 +1,34 @@
+--- r8168-8.042.00/src/r8168_n.c.orig 2016-08-01 21:20:42.000000000 +0200
++++ r8168-8.042.00/src/r8168_n.c 2016-08-01 21:32:49.488072441 +0200
+@@ -22800,7 +22800,9 @@
+ dev->hw_features &= ~NETIF_F_IPV6_CSUM;
+ netif_set_gso_max_size(dev, LSO_32K);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+ dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
++#endif
+ dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO_64K;
+ #endif
+ } else {
+@@ -22808,7 +22810,9 @@
+ dev->features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
+ netif_set_gso_max_size(dev, LSO_64K);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+ dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
++#endif
+ dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO2;
+ #endif
+ }
+@@ -24970,7 +24974,11 @@
+ wmb();
+ txd->opts1 = cpu_to_le32(opts1);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+ dev->trans_start = jiffies;
++#else
++ netif_trans_update(dev);
++#endif
+
+ tp->cur_tx += frags + 1;
+
Copied: r8168/repos/community-testing-i686/r8168.install (from rev 191362, r8168/trunk/r8168.install)
===================================================================
--- community-testing-i686/r8168.install (rev 0)
+++ community-testing-i686/r8168.install 2016-10-05 10:44:41 UTC (rev 191363)
@@ -0,0 +1,17 @@
+rebuild_module_dependencies() {
+ EXTRAMODULES='extramodules-4.8-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
+}
Copied: r8168/repos/community-testing-x86_64/PKGBUILD (from rev 191362, r8168/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2016-10-05 10:44:41 UTC (rev 191363)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Bob Fanger < bfanger(at)gmail >
+# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
+
+pkgname=r8168
+pkgver=8.042
+pkgrel=5
+pkgdesc="A kernel module for Realtek 8168 network cards"
+url="http://www.realtek.com.tw"
+license=("GPL")
+arch=('i686' 'x86_64')
+depends=('glibc' 'linux')
+makedepends=('linux-headers')
+install=$pkgname.install
+source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz
+ linux-4.5.patch
+ linux-4.7.patch)
+sha256sums=('9dd8ae22115bcbef98c15b0b1e2160300cce3129ef7e0485d7e577188ba3fcc2'
+ 'e05a4bccf28beecc97db246064a5fe80d1303476b76086bd262c9c8db82b2e6e'
+ 'bbdc817278b17a1803c74228eaccbddb347ae92424a9a6cc92a68946f5392969')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -p1 -i ../linux-4.5.patch
+ patch -p1 -i ../linux-4.7.patch
+}
+
+build() {
+ _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+ KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/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 \
+ SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
+ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
+ modules
+}
+
+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 {} +
+
+ sed -i "s|extramodules-.*-ARCH|extramodules-$_kernver-ARCH|" "$startdir/$pkgname.install"
+}
Copied: r8168/repos/community-testing-x86_64/linux-4.5.patch (from rev 191362, r8168/trunk/linux-4.5.patch)
===================================================================
--- community-testing-x86_64/linux-4.5.patch (rev 0)
+++ community-testing-x86_64/linux-4.5.patch 2016-10-05 10:44:41 UTC (rev 191363)
@@ -0,0 +1,13 @@
+diff --git a/src/r8168_n.c b/src/r8168_n.c
+index d197630..b47419d 100755
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -4209,7 +4209,7 @@ static netdev_features_t rtl8168_fix_features(struct net_device *dev,
+ spin_lock_irqsave(&tp->lock, flags);
+ if (dev->mtu > ETH_DATA_LEN) {
+ features &= ~NETIF_F_ALL_TSO;
+- features &= ~NETIF_F_ALL_CSUM;
++ features &= ~NETIF_F_CSUM_MASK;
+ }
+ spin_unlock_irqrestore(&tp->lock, flags);
+
Copied: r8168/repos/community-testing-x86_64/linux-4.7.patch (from rev 191362, r8168/trunk/linux-4.7.patch)
===================================================================
--- community-testing-x86_64/linux-4.7.patch (rev 0)
+++ community-testing-x86_64/linux-4.7.patch 2016-10-05 10:44:41 UTC (rev 191363)
@@ -0,0 +1,34 @@
+--- r8168-8.042.00/src/r8168_n.c.orig 2016-08-01 21:20:42.000000000 +0200
++++ r8168-8.042.00/src/r8168_n.c 2016-08-01 21:32:49.488072441 +0200
+@@ -22800,7 +22800,9 @@
+ dev->hw_features &= ~NETIF_F_IPV6_CSUM;
+ netif_set_gso_max_size(dev, LSO_32K);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+ dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
++#endif
+ dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO_64K;
+ #endif
+ } else {
+@@ -22808,7 +22810,9 @@
+ dev->features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
+ netif_set_gso_max_size(dev, LSO_64K);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+ dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
++#endif
+ dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO2;
+ #endif
+ }
+@@ -24970,7 +24974,11 @@
+ wmb();
+ txd->opts1 = cpu_to_le32(opts1);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+ dev->trans_start = jiffies;
++#else
++ netif_trans_update(dev);
++#endif
+
+ tp->cur_tx += frags + 1;
+
Copied: r8168/repos/community-testing-x86_64/r8168.install (from rev 191362, r8168/trunk/r8168.install)
===================================================================
--- community-testing-x86_64/r8168.install (rev 0)
+++ community-testing-x86_64/r8168.install 2016-10-05 10:44:41 UTC (rev 191363)
@@ -0,0 +1,17 @@
+rebuild_module_dependencies() {
+ EXTRAMODULES='extramodules-4.8-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
+}
More information about the arch-commits
mailing list