Date: Thursday, August 9, 2018 @ 08:29:41 Author: mtorromeo Revision: 370593
archrelease: copy trunk to community-x86_64 Added: r8168/repos/community-x86_64/PKGBUILD (from rev 370592, r8168/trunk/PKGBUILD) Deleted: r8168/repos/community-x86_64/PKGBUILD r8168/repos/community-x86_64/linux-4.15.patch ------------------+ PKGBUILD | 87 ++++++++++++++++++++++++----------------------------- linux-4.15.patch | 81 ------------------------------------------------- 2 files changed, 40 insertions(+), 128 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-08-09 08:29:25 UTC (rev 370592) +++ PKGBUILD 2018-08-09 08:29:41 UTC (rev 370593) @@ -1,47 +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.045.08 -pkgrel=78 -pkgdesc="A kernel module for Realtek 8168 network cards" -url="http://www.realtek.com.tw" -license=("GPL") -arch=('x86_64') -depends=('glibc' 'linux') -makedepends=('linux-headers') -source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz - linux-4.15.patch) -sha256sums=('18161cb72fc872a9aed194514f7b8fb8b255b6fa6ed3d2dd459700eaad575f31' - '6434f0d1fcb08e3605a17859d3b8946c65bcf14737e223315b6468b3394c5cd7') - -prepare() { - cd "$pkgname-$pkgver" - patch -Np1 -i ../linux-4.15.patch -} - -build() { - KERNEL_VERSION=$(</usr/lib/modules/extramodules-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 \ - SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ - EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ - modules -} - -package() { - depends=("linux>=4.17" "linux<4.18") - - cd "$pkgname-$pkgver" - install -Dt "$pkgdir/usr/lib/modules/extramodules-ARCH" -m644 src/*.ko - find "$pkgdir" -name '*.ko' -exec xz {} + - - echo "blacklist r8169" | \ - install -Dm644 /dev/stdin "$pkgdir/usr/lib/modprobe.d/r8168.conf" -} Copied: r8168/repos/community-x86_64/PKGBUILD (from rev 370592, r8168/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-08-09 08:29:41 UTC (rev 370593) @@ -0,0 +1,40 @@ +# $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.046.00 +pkgrel=1 +pkgdesc="A kernel module for Realtek 8168 network cards" +url="http://www.realtek.com.tw" +license=("GPL") +arch=('x86_64') +depends=('glibc' 'linux') +makedepends=('linux-headers') +source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz) +sha256sums=('b2e66b03b696ba55c9fb7c896db8ac5377233d14120520735d31c33147d0d4c3') + +build() { + KERNEL_VERSION=$(</usr/lib/modules/extramodules-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 \ + SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ + EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ + modules +} + +package() { + depends=("linux>=4.17" "linux<4.18") + + cd "$pkgname-$pkgver" + install -Dt "$pkgdir/usr/lib/modules/extramodules-ARCH" -m644 src/*.ko + find "$pkgdir" -name '*.ko' -exec xz {} + + + echo "blacklist r8169" | \ + install -Dm644 /dev/stdin "$pkgdir/usr/lib/modprobe.d/r8168.conf" +} Deleted: linux-4.15.patch =================================================================== --- linux-4.15.patch 2018-08-09 08:29:25 UTC (rev 370592) +++ linux-4.15.patch 2018-08-09 08:29:41 UTC (rev 370593) @@ -1,81 +0,0 @@ -diff -u -r r8168-8.045.08/src/r8168_n.c r8168-8.045.08-4.15/src/r8168_n.c ---- r8168-8.045.08/src/r8168_n.c 2017-09-22 17:31:17.000000000 +0200 -+++ r8168-8.045.08-4.15/src/r8168_n.c 2018-01-29 12:33:34.283394438 +0100 -@@ -407,8 +407,13 @@ - static void rtl8168_sleep_rx_enable(struct net_device *dev); - static void rtl8168_dsm(struct net_device *dev, int dev_state); - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - static void rtl8168_esd_timer(unsigned long __opaque); - static void rtl8168_link_timer(unsigned long __opaque); -+#else -+static void rtl8168_esd_timer(struct timer_list *timer_list); -+static void rtl8168_link_timer(struct timer_list *timer_list); -+#endif - static void rtl8168_tx_clear(struct rtl8168_private *tp); - static void rtl8168_rx_clear(struct rtl8168_private *tp); - -@@ -22964,7 +22969,11 @@ - struct rtl8168_private *tp = netdev_priv(dev); - struct timer_list *timer = &tp->esd_timer; - -- setup_timer(timer, rtl8168_esd_timer, (unsigned long)dev); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) -+ setup_timer(timer, rtl8168_esd_timer, (unsigned long)tp); -+#else -+ timer_setup(timer, rtl8168_esd_timer, 0); -+#endif - mod_timer(timer, jiffies + RTL8168_ESD_TIMEOUT); - } - -@@ -22978,7 +22987,11 @@ - struct rtl8168_private *tp = netdev_priv(dev); - struct timer_list *timer = &tp->link_timer; - -- setup_timer(timer, rtl8168_link_timer, (unsigned long)dev); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) -+ setup_timer(timer, rtl8168_link_timer, (unsigned long)tp); -+#else -+ timer_setup(timer, rtl8168_link_timer, 0); -+#endif - mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT); - } - -@@ -24717,10 +24730,16 @@ - #define PCI_DEVICE_SERIAL_NUMBER (0x0164) - - static void -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - rtl8168_esd_timer(unsigned long __opaque) - { -- struct net_device *dev = (struct net_device *)__opaque; -- struct rtl8168_private *tp = netdev_priv(dev); -+ struct rtl8168_private *tp = (struct rtl8168_private *)__opaque; -+#else -+rtl8168_esd_timer(struct timer_list *timer_list) -+{ -+ struct rtl8168_private *tp = container_of(timer_list, struct rtl8168_private, esd_timer); -+#endif -+ struct net_device *dev = tp->dev; - struct pci_dev *pdev = tp->pci_dev; - struct timer_list *timer = &tp->esd_timer; - unsigned long timeout = RTL8168_ESD_TIMEOUT; -@@ -24856,10 +24875,16 @@ - } - - static void -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - rtl8168_link_timer(unsigned long __opaque) - { -- struct net_device *dev = (struct net_device *)__opaque; -- struct rtl8168_private *tp = netdev_priv(dev); -+ struct rtl8168_private *tp = (struct rtl8168_private *)__opaque; -+#else -+rtl8168_link_timer(struct timer_list *timer_list) -+{ -+ struct rtl8168_private *tp = container_of(timer_list, struct rtl8168_private, link_timer); -+#endif -+ struct net_device *dev = tp->dev; - struct timer_list *timer = &tp->link_timer; - unsigned long flags; -