Date: Wednesday, October 19, 2016 @ 06:17:26 Author: tpowa Revision: 192554
db-move: moved r8168 from [community-testing] to [community] (i686, x86_64) Added: r8168/repos/community-i686/PKGBUILD (from rev 192553, r8168/repos/community-testing-i686/PKGBUILD) r8168/repos/community-i686/linux-4.5.patch (from rev 192553, r8168/repos/community-testing-i686/linux-4.5.patch) r8168/repos/community-i686/r8168.install (from rev 192553, r8168/repos/community-testing-i686/r8168.install) r8168/repos/community-x86_64/PKGBUILD (from rev 192553, r8168/repos/community-testing-x86_64/PKGBUILD) r8168/repos/community-x86_64/linux-4.5.patch (from rev 192553, r8168/repos/community-testing-x86_64/linux-4.5.patch) r8168/repos/community-x86_64/r8168.install (from rev 192553, r8168/repos/community-testing-x86_64/r8168.install) Deleted: r8168/repos/community-i686/PKGBUILD r8168/repos/community-i686/linux-4.5.patch r8168/repos/community-i686/linux-4.7.patch r8168/repos/community-i686/r8168.install r8168/repos/community-testing-i686/ r8168/repos/community-testing-x86_64/ r8168/repos/community-x86_64/PKGBUILD r8168/repos/community-x86_64/linux-4.5.patch r8168/repos/community-x86_64/linux-4.7.patch r8168/repos/community-x86_64/r8168.install ----------------------------------+ /PKGBUILD | 102 +++++++++++++++++++++++++++++++++++++ /linux-4.5.patch | 26 +++++++++ /r8168.install | 34 ++++++++++++ community-i686/PKGBUILD | 54 ------------------- community-i686/linux-4.5.patch | 13 ---- community-i686/linux-4.7.patch | 34 ------------ community-i686/r8168.install | 17 ------ community-x86_64/PKGBUILD | 54 ------------------- community-x86_64/linux-4.5.patch | 13 ---- community-x86_64/linux-4.7.patch | 34 ------------ community-x86_64/r8168.install | 17 ------ 11 files changed, 162 insertions(+), 236 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-10-19 06:17:24 UTC (rev 192553) +++ community-i686/PKGBUILD 2016-10-19 06:17:26 UTC (rev 192554) @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: Bob Fanger < bfanger(at)gmail > -# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail > - -pkgname=r8168 -pkgver=8.042 -pkgrel=4 -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-i686/PKGBUILD (from rev 192553, r8168/repos/community-testing-i686/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-10-19 06:17:26 UTC (rev 192554) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: Bob Fanger < bfanger(at)gmail > +# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail > + +pkgname=r8168 +pkgver=8.043.01 +pkgrel=1 +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) +sha256sums=('517ec3fe3c4d25476f6b7b2bd59c3dee548b8dddfe96d2bbc58f65859155142e' + 'e05a4bccf28beecc97db246064a5fe80d1303476b76086bd262c9c8db82b2e6e') + +prepare() { + cd "$pkgname-$pkgver" + patch -p1 -i ../linux-4.5.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" +} Deleted: community-i686/linux-4.5.patch =================================================================== --- community-i686/linux-4.5.patch 2016-10-19 06:17:24 UTC (rev 192553) +++ community-i686/linux-4.5.patch 2016-10-19 06:17:26 UTC (rev 192554) @@ -1,13 +0,0 @@ -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-i686/linux-4.5.patch (from rev 192553, r8168/repos/community-testing-i686/linux-4.5.patch) =================================================================== --- community-i686/linux-4.5.patch (rev 0) +++ community-i686/linux-4.5.patch 2016-10-19 06:17:26 UTC (rev 192554) @@ -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); + Deleted: community-i686/linux-4.7.patch =================================================================== --- community-i686/linux-4.7.patch 2016-10-19 06:17:24 UTC (rev 192553) +++ community-i686/linux-4.7.patch 2016-10-19 06:17:26 UTC (rev 192554) @@ -1,34 +0,0 @@ ---- 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; - Deleted: community-i686/r8168.install =================================================================== --- community-i686/r8168.install 2016-10-19 06:17:24 UTC (rev 192553) +++ community-i686/r8168.install 2016-10-19 06:17:26 UTC (rev 192554) @@ -1,17 +0,0 @@ -rebuild_module_dependencies() { - EXTRAMODULES='extramodules-4.7-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-i686/r8168.install (from rev 192553, r8168/repos/community-testing-i686/r8168.install) =================================================================== --- community-i686/r8168.install (rev 0) +++ community-i686/r8168.install 2016-10-19 06:17:26 UTC (rev 192554) @@ -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 +} Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-10-19 06:17:24 UTC (rev 192553) +++ community-x86_64/PKGBUILD 2016-10-19 06:17:26 UTC (rev 192554) @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: Bob Fanger < bfanger(at)gmail > -# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail > - -pkgname=r8168 -pkgver=8.042 -pkgrel=4 -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-x86_64/PKGBUILD (from rev 192553, r8168/repos/community-testing-x86_64/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-10-19 06:17:26 UTC (rev 192554) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: Bob Fanger < bfanger(at)gmail > +# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail > + +pkgname=r8168 +pkgver=8.043.01 +pkgrel=1 +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) +sha256sums=('517ec3fe3c4d25476f6b7b2bd59c3dee548b8dddfe96d2bbc58f65859155142e' + 'e05a4bccf28beecc97db246064a5fe80d1303476b76086bd262c9c8db82b2e6e') + +prepare() { + cd "$pkgname-$pkgver" + patch -p1 -i ../linux-4.5.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" +} Deleted: community-x86_64/linux-4.5.patch =================================================================== --- community-x86_64/linux-4.5.patch 2016-10-19 06:17:24 UTC (rev 192553) +++ community-x86_64/linux-4.5.patch 2016-10-19 06:17:26 UTC (rev 192554) @@ -1,13 +0,0 @@ -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-x86_64/linux-4.5.patch (from rev 192553, r8168/repos/community-testing-x86_64/linux-4.5.patch) =================================================================== --- community-x86_64/linux-4.5.patch (rev 0) +++ community-x86_64/linux-4.5.patch 2016-10-19 06:17:26 UTC (rev 192554) @@ -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); + Deleted: community-x86_64/linux-4.7.patch =================================================================== --- community-x86_64/linux-4.7.patch 2016-10-19 06:17:24 UTC (rev 192553) +++ community-x86_64/linux-4.7.patch 2016-10-19 06:17:26 UTC (rev 192554) @@ -1,34 +0,0 @@ ---- 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; - Deleted: community-x86_64/r8168.install =================================================================== --- community-x86_64/r8168.install 2016-10-19 06:17:24 UTC (rev 192553) +++ community-x86_64/r8168.install 2016-10-19 06:17:26 UTC (rev 192554) @@ -1,17 +0,0 @@ -rebuild_module_dependencies() { - EXTRAMODULES='extramodules-4.7-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-x86_64/r8168.install (from rev 192553, r8168/repos/community-testing-x86_64/r8168.install) =================================================================== --- community-x86_64/r8168.install (rev 0) +++ community-x86_64/r8168.install 2016-10-19 06:17:26 UTC (rev 192554) @@ -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 +}