summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2020-04-02 01:00:01 +0200
committerPacho Ramos <pacho@gentoo.org>2020-04-02 01:06:08 +0200
commit9ff4293235593b372f1602d9d1e299618d2aa352 (patch)
tree677f78cda4ed8974ebaebd09c3cc5b21820f5e4a /net-misc/r8168
parentmedia-libs/mesa: Version bump to 20.0.3 (diff)
downloadgentoo-9ff4293235593b372f1602d9d1e299618d2aa352.tar.gz
gentoo-9ff4293235593b372f1602d9d1e299618d2aa352.tar.bz2
gentoo-9ff4293235593b372f1602d9d1e299618d2aa352.zip
net-misc/r8168: Drop old
Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Pacho Ramos <pacho@gentoo.org>
Diffstat (limited to 'net-misc/r8168')
-rw-r--r--net-misc/r8168/Manifest2
-rw-r--r--net-misc/r8168/files/linux-4.15-2.patch85
-rw-r--r--net-misc/r8168/files/linux-5.4.patch12
-rw-r--r--net-misc/r8168/r8168-8.045.08.ebuild33
-rw-r--r--net-misc/r8168/r8168-8.047.05.ebuild38
5 files changed, 0 insertions, 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..00000000000
--- a/net-misc/r8168/files/linux-4.15-2.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Author: Alois Nespor <info@aloisnespor.info>
-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;
-
- spin_lock_irqsave(&tp->lock, flags);
diff --git a/net-misc/r8168/files/linux-5.4.patch b/net-misc/r8168/files/linux-5.4.patch
deleted file mode 100644
index 197983597be..00000000000
--- a/net-misc/r8168/files/linux-5.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.000000000 +0800
-+++ r8168-8.047.05/src/r8168_n.c 2019-12-23 00:55:34.121947346 +0800
-@@ -56,7 +56,7 @@
- #include <linux/rtnetlink.h>
- #include <linux/completion.h>
-
--#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 <linux/pci-aspm.h>
- #endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
diff --git a/net-misc/r8168/r8168-8.045.08.ebuild b/net-misc/r8168/r8168-8.045.08.ebuild
deleted file mode 100644
index c9ecc0bee43..00000000000
--- a/net-misc/r8168/r8168-8.045.08.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod eutils
-
-DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
-HOMEPAGE="http://www.realtek.com.tw"
-SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0010-${P}.tar.bz2 -> ${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-MODULE_NAMES="r8168(net:${S}/src)"
-BUILD_TARGETS="modules"
-
-CONFIG_CHECK="!R8169"
-ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
-
-PATCHES=(
- "${FILESDIR}"/linux-4.15-2.patch
-)
-
-pkg_setup() {
- linux-mod_pkg_setup
- BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-}
-
-src_install() {
- linux-mod_src_install
- dodoc README
-}
diff --git a/net-misc/r8168/r8168-8.047.05.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild
deleted file mode 100644
index beff876a09c..00000000000
--- a/net-misc/r8168/r8168-8.047.05.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info linux-mod eutils
-
-DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-# "GBE Ethernet LINUX driver r8168 for kernel up to 4.15" from above link,
-# we need to mirror it to avoid users from needing to fill a captcha to
-# download
-SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-MODULE_NAMES="r8168(net:${S}/src)"
-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_setup() {
- linux-mod_pkg_setup
- BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-}
-
-src_install() {
- linux-mod_src_install
- dodoc README
-}