[gentoo-commits] repo/gentoo:master commit in: net-misc/r8168/, net-misc/r8168/files/
commit: 9ff4293235593b372f1602d9d1e299618d2aa352 Author: Pacho Ramos gentoo org> AuthorDate: Wed Apr 1 23:00:01 2020 + Commit: Pacho Ramos gentoo org> CommitDate: Wed Apr 1 23:06:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff42932 net-misc/r8168: Drop old Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Pacho Ramos gentoo.org> net-misc/r8168/Manifest | 2 - net-misc/r8168/files/linux-4.15-2.patch | 85 - net-misc/r8168/files/linux-5.4.patch| 12 - net-misc/r8168/r8168-8.045.08.ebuild| 33 - net-misc/r8168/r8168-8.047.05.ebuild| 38 --- 5 files changed, 170 deletions(-) diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index 856f3c7114f..fe7c83a9a60 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,3 +1 @@ -DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563 -DIST r8168-8.047.05.tar.bz2 108933 BLAKE2B 03e0bd90c970fc5f98f3e2e2a5d724891a6ffdfe53dc9de1e30b6c855658d53944ed1d8f996edf63ac448194d917685ef8902d6960fafebfe695453e8ea34e51 SHA512 a58cbbdfd836373ad65607908bd84e48a93222966c65d190ae5dff20621b55976c044c31a18e1c00ea5c4c6d66ac300acdc7537d4dec5dd1e281f0ad33bb24e6 DIST r8168-8.048.00.tar.bz2 109018 BLAKE2B e3587fda9cdad8a8433933daef7f05b123b661e6079703c840fb20562ff8511424bf183781970957fa3b0371ebcb4c7a5b7ef84101c3ac5bed7d3eee1236194c SHA512 425d3e0fc56006e9371c31078d32f6fd135a038b13ec1c4f1b809f68e73e8fd15e4a4c2d027c0b4a2cee9ef0dda348b478cc855fb123eb05e4157564ab9de12a diff --git a/net-misc/r8168/files/linux-4.15-2.patch b/net-misc/r8168/files/linux-4.15-2.patch deleted file mode 100644 index 5f5f17c551c..000 --- a/net-misc/r8168/files/linux-4.15-2.patch +++ /dev/null @@ -1,85 +0,0 @@ -Author: Alois Nespor -Description: fix module build for Linux 4.15 -Origin: vendor, https://aur.archlinux.org/cgit/aur.git/tree/linux-4.15-2.patch?h=r8168-dkms - a/src/r8168_n.c -+++ b/src/r8168_n.c -@@ -407,8 +407,14 @@ MODULE_VERSION(RTL8168_VERSION); - 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(struct timer_list *timer); -+static void rtl8168_link_timer(struct timer_list *timer); -+#else - static void rtl8168_esd_timer(unsigned long __opaque); - static void rtl8168_link_timer(unsigned long __opaque); -+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+ - static void rtl8168_tx_clear(struct rtl8168_private *tp); - static void rtl8168_rx_clear(struct rtl8168_private *tp); - -@@ -22964,7 +22970,11 @@ static inline void rtl8168_request_esd_t - struct rtl8168_private *tp = netdev_priv(dev); - struct timer_list *timer = &tp->esd_timer; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+timer_setup(timer, rtl8168_esd_timer, 0); -+#else - setup_timer(timer, rtl8168_esd_timer, (unsigned long)dev); -+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) - mod_timer(timer, jiffies + RTL8168_ESD_TIMEOUT); - } - -@@ -22978,7 +22988,11 @@ static inline void rtl8168_request_link_ - struct rtl8168_private *tp = netdev_priv(dev); - struct timer_list *timer = &tp->link_timer; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+timer_setup(timer, rtl8168_link_timer, 0); -+#else - setup_timer(timer, rtl8168_link_timer, (unsigned long)dev); -+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) - mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT); - } - -@@ -24717,12 +24731,19 @@ err_out: - #define PCI_DEVICE_SERIAL_NUMBER (0x0164) - - static void -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+rtl8168_esd_timer(struct timer_list *timer) -+{ -+struct rtl8168_private *tp = from_timer(tp, timer, esd_timer); -+struct net_device *dev = tp->dev; -+#else - rtl8168_esd_timer(unsigned long __opaque) - { - struct net_device *dev = (struct net_device *)__opaque; - struct rtl8168_private *tp = netdev_priv(dev); --struct pci_dev *pdev = tp->pci_dev; - struct timer_list *timer = &tp->esd_timer; -+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+struct pci_dev *pdev = tp->pci_dev; - unsigned long timeout = RTL8168_ESD_TIMEOUT; - unsigned long flags; - u8 cmd; -@@ -24856,11 +24877,18 @@ rtl8168_esd_timer(unsigned long __opaque - } - - static void -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) -+rtl8168_link_timer(struct timer_list *timer) -+{ -+struct rtl8168_private *tp = from_timer(tp, timer, link_timer); -+struct n
[gentoo-commits] repo/gentoo:master commit in: net-misc/r8168/, net-misc/r8168/files/
commit: e7e2b380d2ca4eaa70a011507e90bc7dc4729d58 Author: James Le Cuirot gentoo org> AuthorDate: Fri Dec 27 15:22:03 2019 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Dec 27 15:22:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e2b380 net-misc/r8168: Fix building 8.047.05 on Linux 5.4 Closes: https://bugs.gentoo.org/701200 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: James Le Cuirot gentoo.org> net-misc/r8168/files/linux-5.4.patch | 12 net-misc/r8168/r8168-8.047.05.ebuild | 4 2 files changed, 16 insertions(+) diff --git a/net-misc/r8168/files/linux-5.4.patch b/net-misc/r8168/files/linux-5.4.patch new file mode 100644 index 000..197983597be --- /dev/null +++ b/net-misc/r8168/files/linux-5.4.patch @@ -0,0 +1,12 @@ +diff -Naur r8168-8.047.05.orig/src/r8168_n.c r8168-8.047.05/src/r8168_n.c +--- r8168-8.047.05.orig/src/r8168_n.c 2019-07-23 10:22:09.0 +0800 r8168-8.047.05/src/r8168_n.c 2019-12-23 00:55:34.121947346 +0800 +@@ -56,7 +56,7 @@ + #include + #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) diff --git a/net-misc/r8168/r8168-8.047.05.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild index 5d05429e616..152d2ec6ffc 100644 --- a/net-misc/r8168/r8168-8.047.05.ebuild +++ b/net-misc/r8168/r8168-8.047.05.ebuild @@ -19,6 +19,10 @@ BUILD_TARGETS="modules" CONFIG_CHECK="!R8169" ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" +PATCHES=( + "${FILESDIR}"/linux-5.4.patch +) + pkg_nofetch() { einfo "Please download ${SRC_URI} from:" einfo " ${HOMEPAGE}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/r8168/, net-misc/r8168/files/
commit: 111b4f5bee7a6ac6538c8df1ae1f427c3cf5ddcb Author: James Le Cuirot gentoo org> AuthorDate: Thu Feb 1 22:26:32 2018 + Commit: James Le Cuirot gentoo org> CommitDate: Thu Feb 1 22:26:32 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111b4f5b net-misc/r8168: Version bump to 8.045.08 Includes patch for 4.15. Thanks to Alois Nespor from Arch Linux. Bug: https://bugs.gentoo.org/646114 Package-Manager: Portage-2.3.21, Repoman-2.3.6 net-misc/r8168/Manifest | 1 + net-misc/r8168/files/linux-4.15-2.patch | 85 + net-misc/r8168/r8168-8.045.08.ebuild| 33 + 3 files changed, 119 insertions(+) diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index 337f96ab143..3455812608f 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1 +1,2 @@ DIST r8168-8.044.02.tar.bz2 95880 BLAKE2B f153b077f8112c2b3c81a923a9a9c7d5096d141adb1cc8dd220f9fdf5df32af90c30f19512dc95bb2761febcfe3a59b6634e9fdec8fbb08b6b493a15aad99d0f SHA512 d7e4fd73ee4f17440613b78163777fc0b9e472490a900fdf8e66c4e16f413cc01f49991a68c7bfb19ddf9577e706d0410ff7c8e85ced53e9740e69efda729512 +DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563 diff --git a/net-misc/r8168/files/linux-4.15-2.patch b/net-misc/r8168/files/linux-4.15-2.patch new file mode 100644 index 000..5f5f17c551c --- /dev/null +++ b/net-misc/r8168/files/linux-4.15-2.patch @@ -0,0 +1,85 @@ +Author: Alois Nespor +Description: fix module build for Linux 4.15 +Origin: vendor, https://aur.archlinux.org/cgit/aur.git/tree/linux-4.15-2.patch?h=r8168-dkms + +--- a/src/r8168_n.c b/src/r8168_n.c +@@ -407,8 +407,14 @@ MODULE_VERSION(RTL8168_VERSION); + 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(struct timer_list *timer); ++static void rtl8168_link_timer(struct timer_list *timer); ++#else + static void rtl8168_esd_timer(unsigned long __opaque); + static void rtl8168_link_timer(unsigned long __opaque); ++#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) ++ + static void rtl8168_tx_clear(struct rtl8168_private *tp); + static void rtl8168_rx_clear(struct rtl8168_private *tp); + +@@ -22964,7 +22970,11 @@ static inline void rtl8168_request_esd_t + struct rtl8168_private *tp = netdev_priv(dev); + struct timer_list *timer = &tp->esd_timer; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) ++timer_setup(timer, rtl8168_esd_timer, 0); ++#else + setup_timer(timer, rtl8168_esd_timer, (unsigned long)dev); ++#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) + mod_timer(timer, jiffies + RTL8168_ESD_TIMEOUT); + } + +@@ -22978,7 +22988,11 @@ static inline void rtl8168_request_link_ + struct rtl8168_private *tp = netdev_priv(dev); + struct timer_list *timer = &tp->link_timer; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) ++timer_setup(timer, rtl8168_link_timer, 0); ++#else + setup_timer(timer, rtl8168_link_timer, (unsigned long)dev); ++#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) + mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT); + } + +@@ -24717,12 +24731,19 @@ err_out: + #define PCI_DEVICE_SERIAL_NUMBER (0x0164) + + static void ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) ++rtl8168_esd_timer(struct timer_list *timer) ++{ ++struct rtl8168_private *tp = from_timer(tp, timer, esd_timer); ++struct net_device *dev = tp->dev; ++#else + rtl8168_esd_timer(unsigned long __opaque) + { + struct net_device *dev = (struct net_device *)__opaque; + struct rtl8168_private *tp = netdev_priv(dev); +-struct pci_dev *pdev = tp->pci_dev; + struct timer_list *timer = &tp->esd_timer; ++#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) ++struct pci_dev *pdev = tp->pci_dev; + unsigned long timeout = RTL8168_ESD_TIMEOUT; + unsigned long flags; + u8 cmd; +@@ -24856,11 +24877,18 @@ rtl8168_esd_timer(unsigned long __opaque + } + + static void ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) ++rtl8168_link_timer(struct timer_list *timer) ++{ ++struct rtl8168_private *tp = from_timer(tp, timer, link_timer); ++struct net_device *dev = tp->dev; ++#else + rtl8168_link_timer(unsigned long __opaque) + { + struct net_device *dev = (struct net_device *)__opaque; + struct rtl8168_private *tp = netdev_priv(dev); + struct timer_list *timer = &tp->link_timer; ++#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) + unsigned long flags;
[gentoo-commits] repo/gentoo:master commit in: net-misc/r8168/, net-misc/r8168/files/
commit: 2a44760d0dc295cd1f9c3a85a487833034f5e95a Author: James Le Cuirot gentoo org> AuthorDate: Sat May 13 19:38:18 2017 + Commit: James Le Cuirot gentoo org> CommitDate: Sat May 13 19:39:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a44760d net-misc/r8168: Fix 8.044.02 against Linux 4.11, bug #618340 Package-Manager: Portage-2.3.5, Repoman-2.3.2 .../r8168/files/r8168-8.044.02-linux-4.11.patch| 27 ++ net-misc/r8168/r8168-8.044.02.ebuild | 6 - 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/net-misc/r8168/files/r8168-8.044.02-linux-4.11.patch b/net-misc/r8168/files/r8168-8.044.02-linux-4.11.patch new file mode 100644 index 000..ba1dd372dfa --- /dev/null +++ b/net-misc/r8168/files/r8168-8.044.02-linux-4.11.patch @@ -0,0 +1,27 @@ +diff a/src/r8168.h b/src/r8168.h +--- a/src/r8168.h 2017-01-11 14:19:18.0 +0800 b/src/r8168.h 2017-05-02 21:18:54.541652414 +0800 +@@ -36,6 +36,10 @@ + #include "r8168_realwow.h" + #include "r8168_fiber.h" + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) ++#include ++#endif ++ + #if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) + #if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present) + #define vlan_tx_tag_present skb_vlan_tag_present +diff a/src/r8168_n.c b/src/r8168_n.c +--- a/src/r8168_n.c2017-01-11 14:18:43.0 +0800 b/src/r8168_n.c2017-05-02 21:20:57.488644205 +0800 +@@ -25732,7 +25732,9 @@ + if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0) + rtl8168_rx_skb(tp, skb); + ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(4, 10, 0)) + dev->last_rx = jiffies; ++#endif + RTLDEV->stats.rx_bytes += pkt_size; + RTLDEV->stats.rx_packets++; + } diff --git a/net-misc/r8168/r8168-8.044.02.ebuild b/net-misc/r8168/r8168-8.044.02.ebuild index c9db5561b3a..8c730a06229 100644 --- a/net-misc/r8168/r8168-8.044.02.ebuild +++ b/net-misc/r8168/r8168-8.044.02.ebuild @@ -14,10 +14,14 @@ KEYWORDS="~amd64 ~x86" MODULE_NAMES="r8168(net:${S}/src)" BUILD_TARGETS="modules" -CONFIG_CHECK="!R8169" +CONFIG_CHECK="!R8169" ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" +PATCHES=( + "${FILESDIR}"/${P}-linux-4.11.patch +) + pkg_setup() { linux-mod_pkg_setup BUILD_PARAMS="KERNELDIR=${KV_DIR}"