[arch-commits] Commit in r8168/repos/community-x86_64 (3 files)
Date: Saturday, May 30, 2020 @ 11:17:28 Author: mtorromeo Revision: 637408 archrelease: copy trunk to community-x86_64 Added: r8168/repos/community-x86_64/PKGBUILD (from rev 637407, r8168/trunk/PKGBUILD) Deleted: r8168/repos/community-x86_64/0001-linux-5.6.patch r8168/repos/community-x86_64/PKGBUILD --+ 0001-linux-5.6.patch | 71 -- PKGBUILD | 81 ++--- 2 files changed, 37 insertions(+), 115 deletions(-) Deleted: 0001-linux-5.6.patch === --- 0001-linux-5.6.patch2020-05-30 11:17:20 UTC (rev 637407) +++ 0001-linux-5.6.patch2020-05-30 11:17:28 UTC (rev 637408) @@ -1,71 +0,0 @@ -diff --git a/src/r8168_n.c b/src/r8168_n.c -index 0df6041..557823e 100755 a/src/r8168_n.c -+++ b/src/r8168_n.c -@@ -456,7 +456,11 @@ static void rtl8168_hw_config(struct net_device *dev); - static void rtl8168_hw_start(struct net_device *dev); - static int rtl8168_close(struct net_device *dev); - static void rtl8168_set_rx_mode(struct net_device *dev); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int new_mtu); -+#else - static void rtl8168_tx_timeout(struct net_device *dev); -+#endif - static struct net_device_stats *rtl8168_get_stats(struct net_device *dev); - static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget); - static int rtl8168_change_mtu(struct net_device *dev, int new_mtu); -@@ -1615,7 +1619,14 @@ static int rtl8168_proc_open(struct inode *inode, struct file *file) - - return single_open(file, show, dev); - } -- -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+static const struct proc_ops rtl8168_proc_ops = { -+.proc_open = rtl8168_proc_open, -+.proc_read = seq_read, -+.proc_lseek = seq_lseek, -+.proc_release= single_release, -+}; -+#else - static const struct file_operations rtl8168_proc_fops = { - .open = rtl8168_proc_open, - .read = seq_read, -@@ -1623,6 +1634,7 @@ static const struct file_operations rtl8168_proc_fops = { - .release= single_release, - }; - #endif -+#endif - - /* - * Table of proc files we need to create. -@@ -1665,9 +1677,15 @@ static void rtl8168_proc_init(struct net_device *dev) - tp->proc_dir = dir; - proc_init_num++; - --for (f = rtl8168_proc_files; f->name[0]; f++) { --if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -- _proc_fops, f->show)) { -+ for (f = rtl8168_proc_files; f->name[0]; f++) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+ if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -+ _proc_ops, f->show)) -+#else -+ if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -+ _proc_fops, f->show)) -+#endif -+ { - printk("Unable to initialize " -"/proc/net/%s/%s/%s\n", -MODULENAME, dev->name, f->name); -@@ -27844,7 +27861,11 @@ static void rtl8168_reset_task(struct work_struct *work) - } - - static void -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue) -+#else - rtl8168_tx_timeout(struct net_device *dev) -+#endif - { - struct rtl8168_private *tp = netdev_priv(dev); - unsigned long flags; Deleted: PKGBUILD === --- PKGBUILD2020-05-30 11:17:20 UTC (rev 637407) +++ PKGBUILD2020-05-30 11:17:28 UTC (rev 637408) @@ -1,44 +0,0 @@ -# Maintainer: Massimiliano Torromeo -# Contributor: Bob Fanger < bfanger(at)gmail > -# Contributor: Filip , Det < nimetonmaili(at)gmail > - -pkgname=r8168 -pkgver=8.048.02 -pkgrel=17 -pkgdesc="A kernel module for Realtek 8168 network cards" -url="http://www.realtek.com.tw; -license=("GPL") -arch=('x86_64') -makedepends=('linux-headers') -source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz -0001-linux-5.6.patch) -sha256sums=('0f209762fa37b90c6ba347a815fd083c9d342e38dbec14273059a419e671df70' -'7d0c468036a6acd83d056d6c243b3ace8be34bf3d633aa24bf54b9c3595f8a0d') - -prepare() { - cd "$pkgname-$pkgver" - patch -Np1 < ../0001-linux-5.6.patch -} - -build() { - cd "$pkgname-$pkgver" - # avoid using the Makefile directly -- it doesn't understand - # any kernel but the current. - make -C /usr/src/linux M="$PWD/src" \ - EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ -
[arch-commits] Commit in r8168/repos/community-x86_64 (3 files)
Date: Friday, January 17, 2020 @ 08:38:25 Author: mtorromeo Revision: 552824 archrelease: copy trunk to community-x86_64 Added: r8168/repos/community-x86_64/PKGBUILD (from rev 552823, r8168/trunk/PKGBUILD) Deleted: r8168/repos/community-x86_64/PKGBUILD r8168/repos/community-x86_64/kernel-5.4.patch --+ PKGBUILD | 87 - kernel-5.4.patch | 12 --- 2 files changed, 40 insertions(+), 59 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2020-01-17 08:38:03 UTC (rev 552823) +++ PKGBUILD2020-01-17 08:38:25 UTC (rev 552824) @@ -1,47 +0,0 @@ -# Maintainer: Massimiliano Torromeo -# Contributor: Bob Fanger < bfanger(at)gmail > -# Contributor: Filip , Det < nimetonmaili(at)gmail > - -pkgname=r8168 -pkgver=8.047.05 -pkgrel=15 -pkgdesc="A kernel module for Realtek 8168 network cards" -url="http://www.realtek.com.tw; -license=("GPL") -arch=('x86_64') -makedepends=('linux-headers') -source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz - kernel-5.4.patch) -sha256sums=('1344bf3d8a1d01a1be8805b48940be1b946b5e694ca75bd14ed1c76fd4c3d67b' -'be79c151c6323bb4d340e31e44fae25a36a93d317812fe5d75c54649ed2508b0') - -prepare() { - cd "$pkgname-$pkgver" - patch -Np1 -i ../kernel-5.4.patch -} - -build() { - local KERNEL_VERSION=$( +# Contributor: Bob Fanger < bfanger(at)gmail > +# Contributor: Filip , Det < nimetonmaili(at)gmail > + +pkgname=r8168 +pkgver=8.048.00 +pkgrel=1 +pkgdesc="A kernel module for Realtek 8168 network cards" +url="http://www.realtek.com.tw; +license=("GPL") +arch=('x86_64') +makedepends=('linux-headers') +source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz) +sha256sums=('0aacba20d985ba5e67e21bdad89a099e102f7bef3027adb647ffbb80b01ac8d0') + +build() { + local KERNEL_VERSION=$( - #include - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) && LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) - #include - #endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
[arch-commits] Commit in r8168/repos/community-x86_64 (3 files)
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 === --- PKGBUILD2018-08-09 08:29:25 UTC (rev 370592) +++ PKGBUILD2018-08-09 08:29:41 UTC (rev 370593) @@ -1,47 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo -# Contributor: Bob Fanger < bfanger(at)gmail > -# Contributor: Filip , 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=$(=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) +++ PKGBUILD2018-08-09 08:29:41 UTC (rev 370593) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo +# Contributor: Bob Fanger < bfanger(at)gmail > +# Contributor: Filip , 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=$(=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.patch2018-08-09 08:29:25 UTC (rev 370592) +++ linux-4.15.patch2018-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.0 +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 = >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 = >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