Date: Wednesday, August 13, 2014 @ 08:39:46 Author: tpowa Revision: 117342
db-move: moved r8168 from [community-testing] to [community] (i686, x86_64) Added: r8168/repos/community-i686/PKGBUILD (from rev 117339, r8168/repos/community-testing-i686/PKGBUILD) r8168/repos/community-i686/delayed_work_ethtool_ops_fix2.patch (from rev 117339, r8168/repos/community-testing-i686/delayed_work_ethtool_ops_fix2.patch) r8168/repos/community-i686/r8168.install (from rev 117339, r8168/repos/community-testing-i686/r8168.install) r8168/repos/community-x86_64/PKGBUILD (from rev 117339, r8168/repos/community-testing-x86_64/PKGBUILD) r8168/repos/community-x86_64/delayed_work_ethtool_ops_fix2.patch (from rev 117339, r8168/repos/community-testing-x86_64/delayed_work_ethtool_ops_fix2.patch) r8168/repos/community-x86_64/r8168.install (from rev 117339, r8168/repos/community-testing-x86_64/r8168.install) Deleted: r8168/repos/community-i686/PKGBUILD 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/r8168.install ------------------------------------------------------+ /PKGBUILD | 110 +++++++++++++++++ /r8168.install | 34 +++++ community-i686/PKGBUILD | 58 -------- community-i686/delayed_work_ethtool_ops_fix2.patch | 26 ++++ community-i686/r8168.install | 17 -- community-x86_64/PKGBUILD | 58 -------- community-x86_64/delayed_work_ethtool_ops_fix2.patch | 26 ++++ community-x86_64/r8168.install | 17 -- 8 files changed, 196 insertions(+), 150 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-08-13 06:39:45 UTC (rev 117341) +++ community-i686/PKGBUILD 2014-08-13 06:39:46 UTC (rev 117342) @@ -1,58 +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.038.00 -pkgrel=9 -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') -source=("https://dl.dropboxusercontent.com/u/362439/archlinux/r8168-$pkgver.tar.bz2") -install=$pkgname.install - -prepare(){ - cd "$pkgname-$pkgver" - - # Fix build with Linux 3.15 - # https://code.google.com/p/r8168/issues/detail?id=19 - if grep -q PREPARE_DELAYED_WORK src/r8168_n.c; then - sed -i 's/PREPARE_DELAYED_WORK/INIT_DELAYED_WORK/' src/r8168_n.c - else - error 'PREPARE_DELAYED_WORK fix for Linux 3.15 is no longer needed.' - return 1 - fi -} - -build() { - _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) - KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_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_RELEASE/build \ - SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ - EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ - modules -} - -package() { - _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) - depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)") - KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) - msg "Kernel = $KERNEL_VERSION" - - cd "$pkgname-$pkgver" - install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - - sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install" -} - -sha256sums=('1384bdf4d33b219f937bf1a600c72b22962baf7796e562b08e4da3c000f49072') Copied: r8168/repos/community-i686/PKGBUILD (from rev 117339, r8168/repos/community-testing-i686/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-08-13 06:39:46 UTC (rev 117342) @@ -0,0 +1,55 @@ +# $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.038.00 +pkgrel=10 +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://dl.dropboxusercontent.com/u/362439/archlinux/r8168-$pkgver.tar.bz2" + delayed_work_ethtool_ops_fix2.patch) +sha256sums=('1384bdf4d33b219f937bf1a600c72b22962baf7796e562b08e4da3c000f49072' + '2a03fa65e476cb7dd3ed5976037e0218260ff2660b6a4c495a824865eb10c303') + +prepare(){ + cd "$pkgname-$pkgver" + + # Fix build with Linux 3.15 and 3.16 + # https://code.google.com/p/r8168/issues/detail?id=19 + patch -Np1 -i "$srcdir/delayed_work_ethtool_ops_fix2.patch" +} + +build() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_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_RELEASE/build \ + SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ + EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ + modules +} + +package() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)") + KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) + msg "Kernel = $KERNEL_VERSION" + + cd "$pkgname-$pkgver" + install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + + sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install" +} + Copied: r8168/repos/community-i686/delayed_work_ethtool_ops_fix2.patch (from rev 117339, r8168/repos/community-testing-i686/delayed_work_ethtool_ops_fix2.patch) =================================================================== --- community-i686/delayed_work_ethtool_ops_fix2.patch (rev 0) +++ community-i686/delayed_work_ethtool_ops_fix2.patch 2014-08-13 06:39:46 UTC (rev 117342) @@ -0,0 +1,26 @@ +--- r8168-8.038.00/src/r8168_n.c.orig ++++ r8168-8.038.00/src/r8168_n.c +@@ -17542,7 +17542,11 @@ rtl8168_init_one(struct pci_dev *pdev, + + RTL_NET_DEVICE_OPS(rtl8168_netdev_ops); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0) + SET_ETHTOOL_OPS(dev, &rtl8168_ethtool_ops); ++#else ++ dev->ethtool_ops = &rtl8168_ethtool_ops; ++#endif + + dev->watchdog_timeo = RTL8168_TX_TIMEOUT; + dev->irq = pdev->irq; +@@ -19119,7 +19123,11 @@ static void rtl8168_schedule_work(struct + { + struct rtl8168_private *tp = netdev_priv(dev); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) + PREPARE_DELAYED_WORK(&tp->task, task); ++#else ++ INIT_DELAYED_WORK(&tp->task, task); ++#endif + schedule_delayed_work(&tp->task, 4); + } + #endif Deleted: community-i686/r8168.install =================================================================== --- community-i686/r8168.install 2014-08-13 06:39:45 UTC (rev 117341) +++ community-i686/r8168.install 2014-08-13 06:39:46 UTC (rev 117342) @@ -1,17 +0,0 @@ -rebuild_module_dependencies() { - EXTRAMODULES='extramodules-3.15-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 117339, r8168/repos/community-testing-i686/r8168.install) =================================================================== --- community-i686/r8168.install (rev 0) +++ community-i686/r8168.install 2014-08-13 06:39:46 UTC (rev 117342) @@ -0,0 +1,17 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.16-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 2014-08-13 06:39:45 UTC (rev 117341) +++ community-x86_64/PKGBUILD 2014-08-13 06:39:46 UTC (rev 117342) @@ -1,58 +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.038.00 -pkgrel=9 -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') -source=("https://dl.dropboxusercontent.com/u/362439/archlinux/r8168-$pkgver.tar.bz2") -install=$pkgname.install - -prepare(){ - cd "$pkgname-$pkgver" - - # Fix build with Linux 3.15 - # https://code.google.com/p/r8168/issues/detail?id=19 - if grep -q PREPARE_DELAYED_WORK src/r8168_n.c; then - sed -i 's/PREPARE_DELAYED_WORK/INIT_DELAYED_WORK/' src/r8168_n.c - else - error 'PREPARE_DELAYED_WORK fix for Linux 3.15 is no longer needed.' - return 1 - fi -} - -build() { - _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) - KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_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_RELEASE/build \ - SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ - EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ - modules -} - -package() { - _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) - depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)") - KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) - msg "Kernel = $KERNEL_VERSION" - - cd "$pkgname-$pkgver" - install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - - sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install" -} - -sha256sums=('1384bdf4d33b219f937bf1a600c72b22962baf7796e562b08e4da3c000f49072') Copied: r8168/repos/community-x86_64/PKGBUILD (from rev 117339, r8168/repos/community-testing-x86_64/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-08-13 06:39:46 UTC (rev 117342) @@ -0,0 +1,55 @@ +# $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.038.00 +pkgrel=10 +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://dl.dropboxusercontent.com/u/362439/archlinux/r8168-$pkgver.tar.bz2" + delayed_work_ethtool_ops_fix2.patch) +sha256sums=('1384bdf4d33b219f937bf1a600c72b22962baf7796e562b08e4da3c000f49072' + '2a03fa65e476cb7dd3ed5976037e0218260ff2660b6a4c495a824865eb10c303') + +prepare(){ + cd "$pkgname-$pkgver" + + # Fix build with Linux 3.15 and 3.16 + # https://code.google.com/p/r8168/issues/detail?id=19 + patch -Np1 -i "$srcdir/delayed_work_ethtool_ops_fix2.patch" +} + +build() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_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_RELEASE/build \ + SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ + EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ + modules +} + +package() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)") + KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) + msg "Kernel = $KERNEL_VERSION" + + cd "$pkgname-$pkgver" + install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + + sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install" +} + Copied: r8168/repos/community-x86_64/delayed_work_ethtool_ops_fix2.patch (from rev 117339, r8168/repos/community-testing-x86_64/delayed_work_ethtool_ops_fix2.patch) =================================================================== --- community-x86_64/delayed_work_ethtool_ops_fix2.patch (rev 0) +++ community-x86_64/delayed_work_ethtool_ops_fix2.patch 2014-08-13 06:39:46 UTC (rev 117342) @@ -0,0 +1,26 @@ +--- r8168-8.038.00/src/r8168_n.c.orig ++++ r8168-8.038.00/src/r8168_n.c +@@ -17542,7 +17542,11 @@ rtl8168_init_one(struct pci_dev *pdev, + + RTL_NET_DEVICE_OPS(rtl8168_netdev_ops); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0) + SET_ETHTOOL_OPS(dev, &rtl8168_ethtool_ops); ++#else ++ dev->ethtool_ops = &rtl8168_ethtool_ops; ++#endif + + dev->watchdog_timeo = RTL8168_TX_TIMEOUT; + dev->irq = pdev->irq; +@@ -19119,7 +19123,11 @@ static void rtl8168_schedule_work(struct + { + struct rtl8168_private *tp = netdev_priv(dev); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) + PREPARE_DELAYED_WORK(&tp->task, task); ++#else ++ INIT_DELAYED_WORK(&tp->task, task); ++#endif + schedule_delayed_work(&tp->task, 4); + } + #endif Deleted: community-x86_64/r8168.install =================================================================== --- community-x86_64/r8168.install 2014-08-13 06:39:45 UTC (rev 117341) +++ community-x86_64/r8168.install 2014-08-13 06:39:46 UTC (rev 117342) @@ -1,17 +0,0 @@ -rebuild_module_dependencies() { - EXTRAMODULES='extramodules-3.15-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 117339, r8168/repos/community-testing-x86_64/r8168.install) =================================================================== --- community-x86_64/r8168.install (rev 0) +++ community-x86_64/r8168.install 2014-08-13 06:39:46 UTC (rev 117342) @@ -0,0 +1,17 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.16-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 +}