[arch-commits] Commit in r8168/repos/community-staging-x86_64 (4 files)

Jan Steffens heftig at archlinux.org
Sat May 9 20:01:22 UTC 2020


    Date: Saturday, May 9, 2020 @ 20:01:22
  Author: heftig
Revision: 626083

archrelease: copy trunk to community-staging-x86_64

Added:
  r8168/repos/community-staging-x86_64/0001-linux-5.6.patch
    (from rev 626075, r8168/trunk/0001-linux-5.6.patch)
  r8168/repos/community-staging-x86_64/PKGBUILD
    (from rev 626075, r8168/trunk/PKGBUILD)
Deleted:
  r8168/repos/community-staging-x86_64/0001-linux-5.6.patch
  r8168/repos/community-staging-x86_64/PKGBUILD

----------------------+
 0001-linux-5.6.patch |  142 ++++++++++++++++++++++++-------------------------
 PKGBUILD             |   88 +++++++++++++++---------------
 2 files changed, 115 insertions(+), 115 deletions(-)

Deleted: 0001-linux-5.6.patch
===================================================================
--- 0001-linux-5.6.patch	2020-05-09 20:01:20 UTC (rev 626082)
+++ 0001-linux-5.6.patch	2020-05-09 20:01:22 UTC (rev 626083)
@@ -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,
--                                              &rtl8168_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,
-+                                              &rtl8168_proc_ops, f->show)) 
-+#else        
-+         if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,
-+                                              &rtl8168_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;

Copied: r8168/repos/community-staging-x86_64/0001-linux-5.6.patch (from rev 626075, r8168/trunk/0001-linux-5.6.patch)
===================================================================
--- 0001-linux-5.6.patch	                        (rev 0)
+++ 0001-linux-5.6.patch	2020-05-09 20:01:22 UTC (rev 626083)
@@ -0,0 +1,71 @@
+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,
+-                                              &rtl8168_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,
++                                              &rtl8168_proc_ops, f->show)) 
++#else        
++         if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,
++                                              &rtl8168_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
===================================================================
--- PKGBUILD	2020-05-09 20:01:20 UTC (rev 626082)
+++ PKGBUILD	2020-05-09 20:01:22 UTC (rev 626083)
@@ -1,44 +0,0 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: Bob Fanger < bfanger(at)gmail >
-# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
-
-pkgname=r8168
-pkgver=8.048.02
-pkgrel=12
-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" \
-			modules
-}
-
-package() {
-	depends=('glibc' 'linux')
-
-	local extradir=/usr/lib/modules/$(</usr/src/linux/version)/extramodules
-	cd "$pkgname-$pkgver"
-	install -Dt "$pkgdir$extradir" -m644 src/*.ko
-	find "$pkgdir" -name '*.ko' -exec xz {} +
-
-	echo "blacklist r8169" | \
-		install -Dm644 /dev/stdin "$pkgdir/usr/lib/modprobe.d/$pkgname.conf"
-}
-
-# vim:set sw=0 noet:

Copied: r8168/repos/community-staging-x86_64/PKGBUILD (from rev 626075, r8168/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-09 20:01:22 UTC (rev 626083)
@@ -0,0 +1,44 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Bob Fanger < bfanger(at)gmail >
+# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
+
+pkgname=r8168
+pkgver=8.048.02
+pkgrel=13
+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" \
+			modules
+}
+
+package() {
+	depends=('glibc' 'linux')
+
+	local extradir=/usr/lib/modules/$(</usr/src/linux/version)/extramodules
+	cd "$pkgname-$pkgver"
+	install -Dt "$pkgdir$extradir" -m644 src/*.ko
+	find "$pkgdir" -name '*.ko' -exec xz {} +
+
+	echo "blacklist r8169" | \
+		install -Dm644 /dev/stdin "$pkgdir/usr/lib/modprobe.d/$pkgname.conf"
+}
+
+# vim:set sw=0 noet:


More information about the arch-commits mailing list