1 |
commit: 9ff4293235593b372f1602d9d1e299618d2aa352 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 1 23:00:01 2020 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 1 23:06:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff42932 |
7 |
|
8 |
net-misc/r8168: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
11 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
12 |
|
13 |
net-misc/r8168/Manifest | 2 - |
14 |
net-misc/r8168/files/linux-4.15-2.patch | 85 --------------------------------- |
15 |
net-misc/r8168/files/linux-5.4.patch | 12 ----- |
16 |
net-misc/r8168/r8168-8.045.08.ebuild | 33 ------------- |
17 |
net-misc/r8168/r8168-8.047.05.ebuild | 38 --------------- |
18 |
5 files changed, 170 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest |
21 |
index 856f3c7114f..fe7c83a9a60 100644 |
22 |
--- a/net-misc/r8168/Manifest |
23 |
+++ b/net-misc/r8168/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
-DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563 |
26 |
-DIST r8168-8.047.05.tar.bz2 108933 BLAKE2B 03e0bd90c970fc5f98f3e2e2a5d724891a6ffdfe53dc9de1e30b6c855658d53944ed1d8f996edf63ac448194d917685ef8902d6960fafebfe695453e8ea34e51 SHA512 a58cbbdfd836373ad65607908bd84e48a93222966c65d190ae5dff20621b55976c044c31a18e1c00ea5c4c6d66ac300acdc7537d4dec5dd1e281f0ad33bb24e6 |
27 |
DIST r8168-8.048.00.tar.bz2 109018 BLAKE2B e3587fda9cdad8a8433933daef7f05b123b661e6079703c840fb20562ff8511424bf183781970957fa3b0371ebcb4c7a5b7ef84101c3ac5bed7d3eee1236194c SHA512 425d3e0fc56006e9371c31078d32f6fd135a038b13ec1c4f1b809f68e73e8fd15e4a4c2d027c0b4a2cee9ef0dda348b478cc855fb123eb05e4157564ab9de12a |
28 |
|
29 |
diff --git a/net-misc/r8168/files/linux-4.15-2.patch b/net-misc/r8168/files/linux-4.15-2.patch |
30 |
deleted file mode 100644 |
31 |
index 5f5f17c551c..00000000000 |
32 |
--- a/net-misc/r8168/files/linux-4.15-2.patch |
33 |
+++ /dev/null |
34 |
@@ -1,85 +0,0 @@ |
35 |
-Author: Alois Nespor <info@×××××××××××.info> |
36 |
-Description: fix module build for Linux 4.15 |
37 |
-Origin: vendor, https://aur.archlinux.org/cgit/aur.git/tree/linux-4.15-2.patch?h=r8168-dkms |
38 |
- |
39 |
---- a/src/r8168_n.c |
40 |
-+++ b/src/r8168_n.c |
41 |
-@@ -407,8 +407,14 @@ MODULE_VERSION(RTL8168_VERSION); |
42 |
- static void rtl8168_sleep_rx_enable(struct net_device *dev); |
43 |
- static void rtl8168_dsm(struct net_device *dev, int dev_state); |
44 |
- |
45 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) |
46 |
-+static void rtl8168_esd_timer(struct timer_list *timer); |
47 |
-+static void rtl8168_link_timer(struct timer_list *timer); |
48 |
-+#else |
49 |
- static void rtl8168_esd_timer(unsigned long __opaque); |
50 |
- static void rtl8168_link_timer(unsigned long __opaque); |
51 |
-+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) |
52 |
-+ |
53 |
- static void rtl8168_tx_clear(struct rtl8168_private *tp); |
54 |
- static void rtl8168_rx_clear(struct rtl8168_private *tp); |
55 |
- |
56 |
-@@ -22964,7 +22970,11 @@ static inline void rtl8168_request_esd_t |
57 |
- struct rtl8168_private *tp = netdev_priv(dev); |
58 |
- struct timer_list *timer = &tp->esd_timer; |
59 |
- |
60 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) |
61 |
-+ timer_setup(timer, rtl8168_esd_timer, 0); |
62 |
-+#else |
63 |
- setup_timer(timer, rtl8168_esd_timer, (unsigned long)dev); |
64 |
-+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) |
65 |
- mod_timer(timer, jiffies + RTL8168_ESD_TIMEOUT); |
66 |
- } |
67 |
- |
68 |
-@@ -22978,7 +22988,11 @@ static inline void rtl8168_request_link_ |
69 |
- struct rtl8168_private *tp = netdev_priv(dev); |
70 |
- struct timer_list *timer = &tp->link_timer; |
71 |
- |
72 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) |
73 |
-+ timer_setup(timer, rtl8168_link_timer, 0); |
74 |
-+#else |
75 |
- setup_timer(timer, rtl8168_link_timer, (unsigned long)dev); |
76 |
-+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) |
77 |
- mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT); |
78 |
- } |
79 |
- |
80 |
-@@ -24717,12 +24731,19 @@ err_out: |
81 |
- #define PCI_DEVICE_SERIAL_NUMBER (0x0164) |
82 |
- |
83 |
- static void |
84 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) |
85 |
-+rtl8168_esd_timer(struct timer_list *timer) |
86 |
-+{ |
87 |
-+ struct rtl8168_private *tp = from_timer(tp, timer, esd_timer); |
88 |
-+ struct net_device *dev = tp->dev; |
89 |
-+#else |
90 |
- rtl8168_esd_timer(unsigned long __opaque) |
91 |
- { |
92 |
- struct net_device *dev = (struct net_device *)__opaque; |
93 |
- struct rtl8168_private *tp = netdev_priv(dev); |
94 |
-- struct pci_dev *pdev = tp->pci_dev; |
95 |
- struct timer_list *timer = &tp->esd_timer; |
96 |
-+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) |
97 |
-+ struct pci_dev *pdev = tp->pci_dev; |
98 |
- unsigned long timeout = RTL8168_ESD_TIMEOUT; |
99 |
- unsigned long flags; |
100 |
- u8 cmd; |
101 |
-@@ -24856,11 +24877,18 @@ rtl8168_esd_timer(unsigned long __opaque |
102 |
- } |
103 |
- |
104 |
- static void |
105 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) |
106 |
-+rtl8168_link_timer(struct timer_list *timer) |
107 |
-+{ |
108 |
-+ struct rtl8168_private *tp = from_timer(tp, timer, link_timer); |
109 |
-+ struct net_device *dev = tp->dev; |
110 |
-+#else |
111 |
- rtl8168_link_timer(unsigned long __opaque) |
112 |
- { |
113 |
- struct net_device *dev = (struct net_device *)__opaque; |
114 |
- struct rtl8168_private *tp = netdev_priv(dev); |
115 |
- struct timer_list *timer = &tp->link_timer; |
116 |
-+#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) |
117 |
- unsigned long flags; |
118 |
- |
119 |
- spin_lock_irqsave(&tp->lock, flags); |
120 |
|
121 |
diff --git a/net-misc/r8168/files/linux-5.4.patch b/net-misc/r8168/files/linux-5.4.patch |
122 |
deleted file mode 100644 |
123 |
index 197983597be..00000000000 |
124 |
--- a/net-misc/r8168/files/linux-5.4.patch |
125 |
+++ /dev/null |
126 |
@@ -1,12 +0,0 @@ |
127 |
-diff -Naur r8168-8.047.05.orig/src/r8168_n.c r8168-8.047.05/src/r8168_n.c |
128 |
---- r8168-8.047.05.orig/src/r8168_n.c 2019-07-23 10:22:09.000000000 +0800 |
129 |
-+++ r8168-8.047.05/src/r8168_n.c 2019-12-23 00:55:34.121947346 +0800 |
130 |
-@@ -56,7 +56,7 @@ |
131 |
- #include <linux/rtnetlink.h> |
132 |
- #include <linux/completion.h> |
133 |
- |
134 |
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) |
135 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) && LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) |
136 |
- #include <linux/pci-aspm.h> |
137 |
- #endif |
138 |
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37) |
139 |
|
140 |
diff --git a/net-misc/r8168/r8168-8.045.08.ebuild b/net-misc/r8168/r8168-8.045.08.ebuild |
141 |
deleted file mode 100644 |
142 |
index c9ecc0bee43..00000000000 |
143 |
--- a/net-misc/r8168/r8168-8.045.08.ebuild |
144 |
+++ /dev/null |
145 |
@@ -1,33 +0,0 @@ |
146 |
-# Copyright 1999-2018 Gentoo Foundation |
147 |
-# Distributed under the terms of the GNU General Public License v2 |
148 |
- |
149 |
-EAPI=6 |
150 |
- |
151 |
-inherit linux-info linux-mod eutils |
152 |
- |
153 |
-DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" |
154 |
-HOMEPAGE="http://www.realtek.com.tw" |
155 |
-SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0010-${P}.tar.bz2 -> ${P}.tar.bz2" |
156 |
-LICENSE="GPL-2" |
157 |
-SLOT="0" |
158 |
-KEYWORDS="amd64 x86" |
159 |
- |
160 |
-MODULE_NAMES="r8168(net:${S}/src)" |
161 |
-BUILD_TARGETS="modules" |
162 |
- |
163 |
-CONFIG_CHECK="!R8169" |
164 |
-ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" |
165 |
- |
166 |
-PATCHES=( |
167 |
- "${FILESDIR}"/linux-4.15-2.patch |
168 |
-) |
169 |
- |
170 |
-pkg_setup() { |
171 |
- linux-mod_pkg_setup |
172 |
- BUILD_PARAMS="KERNELDIR=${KV_DIR}" |
173 |
-} |
174 |
- |
175 |
-src_install() { |
176 |
- linux-mod_src_install |
177 |
- dodoc README |
178 |
-} |
179 |
|
180 |
diff --git a/net-misc/r8168/r8168-8.047.05.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild |
181 |
deleted file mode 100644 |
182 |
index beff876a09c..00000000000 |
183 |
--- a/net-misc/r8168/r8168-8.047.05.ebuild |
184 |
+++ /dev/null |
185 |
@@ -1,38 +0,0 @@ |
186 |
-# Copyright 1999-2020 Gentoo Authors |
187 |
-# Distributed under the terms of the GNU General Public License v2 |
188 |
- |
189 |
-EAPI=7 |
190 |
- |
191 |
-inherit linux-info linux-mod eutils |
192 |
- |
193 |
-DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" |
194 |
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" |
195 |
- |
196 |
-# "GBE Ethernet LINUX driver r8168 for kernel up to 4.15" from above link, |
197 |
-# we need to mirror it to avoid users from needing to fill a captcha to |
198 |
-# download |
199 |
-SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" |
200 |
- |
201 |
-LICENSE="GPL-2" |
202 |
-SLOT="0" |
203 |
-KEYWORDS="amd64 ~x86" |
204 |
- |
205 |
-MODULE_NAMES="r8168(net:${S}/src)" |
206 |
-BUILD_TARGETS="modules" |
207 |
- |
208 |
-CONFIG_CHECK="!R8169" |
209 |
-ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" |
210 |
- |
211 |
-PATCHES=( |
212 |
- "${FILESDIR}"/linux-5.4.patch |
213 |
-) |
214 |
- |
215 |
-pkg_setup() { |
216 |
- linux-mod_pkg_setup |
217 |
- BUILD_PARAMS="KERNELDIR=${KV_DIR}" |
218 |
-} |
219 |
- |
220 |
-src_install() { |
221 |
- linux-mod_src_install |
222 |
- dodoc README |
223 |
-} |