Date: Monday, September 22, 2014 @ 10:00:38 Author: mtorromeo Revision: 119397
archrelease: copy trunk to community-i686, community-x86_64 Added: r8168-lts/repos/community-i686/PKGBUILD (from rev 119396, r8168-lts/trunk/PKGBUILD) r8168-lts/repos/community-i686/r8168-lts.install (from rev 119396, r8168-lts/trunk/r8168-lts.install) r8168-lts/repos/community-x86_64/PKGBUILD (from rev 119396, r8168-lts/trunk/PKGBUILD) r8168-lts/repos/community-x86_64/r8168-lts.install (from rev 119396, r8168-lts/trunk/r8168-lts.install) Deleted: r8168-lts/repos/community-i686/PKGBUILD r8168-lts/repos/community-i686/linux-3.10.patch r8168-lts/repos/community-i686/r8168-lts.install r8168-lts/repos/community-x86_64/PKGBUILD r8168-lts/repos/community-x86_64/linux-3.10.patch r8168-lts/repos/community-x86_64/r8168-lts.install ------------------------------------+ /PKGBUILD | 66 +++++++++++++++++++++++++++++++++++ /r8168-lts.install | 34 ++++++++++++++++++ community-i686/PKGBUILD | 34 ------------------ community-i686/linux-3.10.patch | 59 ------------------------------- community-i686/r8168-lts.install | 17 --------- community-x86_64/PKGBUILD | 34 ------------------ community-x86_64/linux-3.10.patch | 59 ------------------------------- community-x86_64/r8168-lts.install | 17 --------- 8 files changed, 100 insertions(+), 220 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-09-22 07:59:37 UTC (rev 119396) +++ community-i686/PKGBUILD 2014-09-22 08:00:38 UTC (rev 119397) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> - -pkgname=r8168-lts -_pkgname=r8168 -pkgver=8.038.00 -pkgrel=6 -pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" -url="http://www.realtek.com.tw" -license=("GPL") -arch=('i686' 'x86_64') -depends=('glibc' "linux-lts>=3.14.11" "linux-lts<3.15") -makedepends=("linux-lts-headers>=3.14" "linux-lts-headers<3.15") -source=("https://dl.dropboxusercontent.com/u/362439/archlinux/r8168-$pkgver.tar.bz2") -install=$pkgname.install - -_extramodules=extramodules-3.14-lts - -build() { - cd "$_pkgname-$pkgver" - local _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - make -C /usr/lib/modules/$_kernver/build \ - SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \ - EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ - modules -} - -package() { - cd "$_pkgname-$pkgver" - install -Dm644 src/$_pkgname.ko "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + -} - -sha256sums=('1384bdf4d33b219f937bf1a600c72b22962baf7796e562b08e4da3c000f49072') Copied: r8168-lts/repos/community-i686/PKGBUILD (from rev 119396, r8168-lts/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-09-22 08:00:38 UTC (rev 119397) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> + +pkgname=r8168-lts +_pkgname=r8168 +pkgver=8.039.00 +pkgrel=1 +pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" +url="http://www.realtek.com.tw" +license=("GPL") +arch=('i686' 'x86_64') +depends=('glibc' "linux-lts>=3.14.11" "linux-lts<3.15") +makedepends=("linux-lts-headers>=3.14" "linux-lts-headers<3.15") +install=$pkgname.install +source=("ftp://WebUser:wK9xBuD5@95.130.192.218/cn/nic/r8168-$pkgver.tar.bz2") +sha256sums=('767d922270274e781d8d42493a0021db1cafcb0388ac62564d0c0c3d82703edd') + +_extramodules=extramodules-3.14-lts + +build() { + cd "$_pkgname-$pkgver" + local _kernver="$(cat /usr/lib/modules/$_extramodules/version)" + make -C /usr/lib/modules/$_kernver/build \ + SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \ + EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ + modules +} + +package() { + cd "$_pkgname-$pkgver" + install -Dm644 src/$_pkgname.ko "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + +} Deleted: community-i686/linux-3.10.patch =================================================================== --- community-i686/linux-3.10.patch 2014-09-22 07:59:37 UTC (rev 119396) +++ community-i686/linux-3.10.patch 2014-09-22 08:00:38 UTC (rev 119397) @@ -1,59 +0,0 @@ ---- src/r8168_n.c.orig 2013-07-02 14:20:27.355887286 +0200 -+++ src/r8168_n.c 2013-07-02 14:24:25.302573010 +0200 -@@ -52,6 +52,10 @@ - #include <linux/init.h> - #include <linux/rtnetlink.h> - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+#include <linux/if_ether.h> -+#endif -+ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) - #include <linux/pci-aspm.h> - #endif -@@ -2232,6 +2236,9 @@ - swab16(opts2 & 0xffff)); - ret = 0; - } -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+ if (opts2 & RxVlanTag) -+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), swab16(opts2 & 0xffff)); - #else - if (opts2 & RxVlanTag) - __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff)); -@@ -2295,7 +2302,11 @@ - else - tp->cp_cmd &= ~RxChkSum; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+ if (dev->features & NETIF_F_HW_VLAN_CTAG_RX) -+#else - if (dev->features & NETIF_F_HW_VLAN_RX) -+#endif - tp->cp_cmd |= RxVlan; - else - tp->cp_cmd &= ~RxVlan; -@@ -16195,7 +16206,11 @@ - - #ifdef CONFIG_R8168_VLAN - if (tp->mcfg != CFG_METHOD_DEFAULT) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+ dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX; -+#else - dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; -+#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - dev->vlan_rx_kill_vid = rtl8168_vlan_rx_kill_vid; - #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) -@@ -16210,7 +16225,11 @@ - #else - dev->features |= NETIF_F_RXCSUM; - dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO | -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+ NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX; -+#else - NETIF_F_RXCSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; -+#endif - dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO | - NETIF_F_HIGHDMA; - #endif Deleted: community-i686/r8168-lts.install =================================================================== --- community-i686/r8168-lts.install 2014-09-22 07:59:37 UTC (rev 119396) +++ community-i686/r8168-lts.install 2014-09-22 08:00:38 UTC (rev 119397) @@ -1,17 +0,0 @@ -rebuild_module_dependencies() { - EXTRAMODULES='extramodules-3.14-lts' - depmod $(cat /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-lts/repos/community-i686/r8168-lts.install (from rev 119396, r8168-lts/trunk/r8168-lts.install) =================================================================== --- community-i686/r8168-lts.install (rev 0) +++ community-i686/r8168-lts.install 2014-09-22 08:00:38 UTC (rev 119397) @@ -0,0 +1,17 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.14-lts' + depmod $(cat /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 2014-09-22 07:59:37 UTC (rev 119396) +++ community-x86_64/PKGBUILD 2014-09-22 08:00:38 UTC (rev 119397) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> - -pkgname=r8168-lts -_pkgname=r8168 -pkgver=8.038.00 -pkgrel=6 -pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" -url="http://www.realtek.com.tw" -license=("GPL") -arch=('i686' 'x86_64') -depends=('glibc' "linux-lts>=3.14.11" "linux-lts<3.15") -makedepends=("linux-lts-headers>=3.14" "linux-lts-headers<3.15") -source=("https://dl.dropboxusercontent.com/u/362439/archlinux/r8168-$pkgver.tar.bz2") -install=$pkgname.install - -_extramodules=extramodules-3.14-lts - -build() { - cd "$_pkgname-$pkgver" - local _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - make -C /usr/lib/modules/$_kernver/build \ - SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \ - EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ - modules -} - -package() { - cd "$_pkgname-$pkgver" - install -Dm644 src/$_pkgname.ko "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + -} - -sha256sums=('1384bdf4d33b219f937bf1a600c72b22962baf7796e562b08e4da3c000f49072') Copied: r8168-lts/repos/community-x86_64/PKGBUILD (from rev 119396, r8168-lts/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-09-22 08:00:38 UTC (rev 119397) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> + +pkgname=r8168-lts +_pkgname=r8168 +pkgver=8.039.00 +pkgrel=1 +pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" +url="http://www.realtek.com.tw" +license=("GPL") +arch=('i686' 'x86_64') +depends=('glibc' "linux-lts>=3.14.11" "linux-lts<3.15") +makedepends=("linux-lts-headers>=3.14" "linux-lts-headers<3.15") +install=$pkgname.install +source=("ftp://WebUser:wK9xBuD5@95.130.192.218/cn/nic/r8168-$pkgver.tar.bz2") +sha256sums=('767d922270274e781d8d42493a0021db1cafcb0388ac62564d0c0c3d82703edd') + +_extramodules=extramodules-3.14-lts + +build() { + cd "$_pkgname-$pkgver" + local _kernver="$(cat /usr/lib/modules/$_extramodules/version)" + make -C /usr/lib/modules/$_kernver/build \ + SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \ + EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ + modules +} + +package() { + cd "$_pkgname-$pkgver" + install -Dm644 src/$_pkgname.ko "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + +} Deleted: community-x86_64/linux-3.10.patch =================================================================== --- community-x86_64/linux-3.10.patch 2014-09-22 07:59:37 UTC (rev 119396) +++ community-x86_64/linux-3.10.patch 2014-09-22 08:00:38 UTC (rev 119397) @@ -1,59 +0,0 @@ ---- src/r8168_n.c.orig 2013-07-02 14:20:27.355887286 +0200 -+++ src/r8168_n.c 2013-07-02 14:24:25.302573010 +0200 -@@ -52,6 +52,10 @@ - #include <linux/init.h> - #include <linux/rtnetlink.h> - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+#include <linux/if_ether.h> -+#endif -+ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) - #include <linux/pci-aspm.h> - #endif -@@ -2232,6 +2236,9 @@ - swab16(opts2 & 0xffff)); - ret = 0; - } -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+ if (opts2 & RxVlanTag) -+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), swab16(opts2 & 0xffff)); - #else - if (opts2 & RxVlanTag) - __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff)); -@@ -2295,7 +2302,11 @@ - else - tp->cp_cmd &= ~RxChkSum; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+ if (dev->features & NETIF_F_HW_VLAN_CTAG_RX) -+#else - if (dev->features & NETIF_F_HW_VLAN_RX) -+#endif - tp->cp_cmd |= RxVlan; - else - tp->cp_cmd &= ~RxVlan; -@@ -16195,7 +16206,11 @@ - - #ifdef CONFIG_R8168_VLAN - if (tp->mcfg != CFG_METHOD_DEFAULT) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+ dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX; -+#else - dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; -+#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - dev->vlan_rx_kill_vid = rtl8168_vlan_rx_kill_vid; - #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) -@@ -16210,7 +16225,11 @@ - #else - dev->features |= NETIF_F_RXCSUM; - dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO | -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+ NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX; -+#else - NETIF_F_RXCSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; -+#endif - dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO | - NETIF_F_HIGHDMA; - #endif Deleted: community-x86_64/r8168-lts.install =================================================================== --- community-x86_64/r8168-lts.install 2014-09-22 07:59:37 UTC (rev 119396) +++ community-x86_64/r8168-lts.install 2014-09-22 08:00:38 UTC (rev 119397) @@ -1,17 +0,0 @@ -rebuild_module_dependencies() { - EXTRAMODULES='extramodules-3.14-lts' - depmod $(cat /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-lts/repos/community-x86_64/r8168-lts.install (from rev 119396, r8168-lts/trunk/r8168-lts.install) =================================================================== --- community-x86_64/r8168-lts.install (rev 0) +++ community-x86_64/r8168-lts.install 2014-09-22 08:00:38 UTC (rev 119397) @@ -0,0 +1,17 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.14-lts' + depmod $(cat /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 +}