Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/r8168/files/, net-misc/r8168/
Date: Fri, 27 Apr 2018 21:09:55
Message-Id: 1524863381.ee232457ed7bad1c3d62c4c509419086b6ea3a65.chewi@gentoo
1 commit: ee232457ed7bad1c3d62c4c509419086b6ea3a65
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 27 21:09:01 2018 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 27 21:09:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee232457
7
8 net-misc/r8168: Drop old 8.044.02
9
10 Closes: https://bugs.gentoo.org/646114
11 Package-Manager: Portage-2.3.31, Repoman-2.3.9
12
13 net-misc/r8168/Manifest | 1 -
14 .../r8168/files/r8168-8.044.02-linux-4.11.patch | 27 ------------------
15 net-misc/r8168/r8168-8.044.02.ebuild | 33 ----------------------
16 3 files changed, 61 deletions(-)
17
18 diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
19 index 3455812608f..eae877f341a 100644
20 --- a/net-misc/r8168/Manifest
21 +++ b/net-misc/r8168/Manifest
22 @@ -1,2 +1 @@
23 -DIST r8168-8.044.02.tar.bz2 95880 BLAKE2B f153b077f8112c2b3c81a923a9a9c7d5096d141adb1cc8dd220f9fdf5df32af90c30f19512dc95bb2761febcfe3a59b6634e9fdec8fbb08b6b493a15aad99d0f SHA512 d7e4fd73ee4f17440613b78163777fc0b9e472490a900fdf8e66c4e16f413cc01f49991a68c7bfb19ddf9577e706d0410ff7c8e85ced53e9740e69efda729512
24 DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563
25
26 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
27 deleted file mode 100644
28 index ba1dd372dfa..00000000000
29 --- a/net-misc/r8168/files/r8168-8.044.02-linux-4.11.patch
30 +++ /dev/null
31 @@ -1,27 +0,0 @@
32 -diff a/src/r8168.h b/src/r8168.h
33 ---- a/src/r8168.h 2017-01-11 14:19:18.000000000 +0800
34 -+++ b/src/r8168.h 2017-05-02 21:18:54.541652414 +0800
35 -@@ -36,6 +36,10 @@
36 - #include "r8168_realwow.h"
37 - #include "r8168_fiber.h"
38 -
39 -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0))
40 -+#include <linux/sched/signal.h>
41 -+#endif
42 -+
43 - #if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
44 - #if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present)
45 - #define vlan_tx_tag_present skb_vlan_tag_present
46 -diff a/src/r8168_n.c b/src/r8168_n.c
47 ---- a/src/r8168_n.c 2017-01-11 14:18:43.000000000 +0800
48 -+++ b/src/r8168_n.c 2017-05-02 21:20:57.488644205 +0800
49 -@@ -25732,7 +25732,9 @@
50 - if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
51 - rtl8168_rx_skb(tp, skb);
52 -
53 -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(4, 10, 0))
54 - dev->last_rx = jiffies;
55 -+#endif
56 - RTLDEV->stats.rx_bytes += pkt_size;
57 - RTLDEV->stats.rx_packets++;
58 - }
59
60 diff --git a/net-misc/r8168/r8168-8.044.02.ebuild b/net-misc/r8168/r8168-8.044.02.ebuild
61 deleted file mode 100644
62 index 4822eb15079..00000000000
63 --- a/net-misc/r8168/r8168-8.044.02.ebuild
64 +++ /dev/null
65 @@ -1,33 +0,0 @@
66 -# Copyright 1999-2017 Gentoo Foundation
67 -# Distributed under the terms of the GNU General Public License v2
68 -
69 -EAPI=6
70 -
71 -inherit linux-info linux-mod eutils
72 -
73 -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
74 -HOMEPAGE="http://www.realtek.com.tw"
75 -SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0009-${P}.tar.bz2 -> ${P}.tar.bz2"
76 -LICENSE="GPL-2"
77 -SLOT="0"
78 -KEYWORDS="amd64 x86"
79 -
80 -MODULE_NAMES="r8168(net:${S}/src)"
81 -BUILD_TARGETS="modules"
82 -
83 -CONFIG_CHECK="!R8169"
84 -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
85 -
86 -PATCHES=(
87 - "${FILESDIR}"/${P}-linux-4.11.patch
88 -)
89 -
90 -pkg_setup() {
91 - linux-mod_pkg_setup
92 - BUILD_PARAMS="KERNELDIR=${KV_DIR}"
93 -}
94 -
95 -src_install() {
96 - linux-mod_src_install
97 - dodoc README
98 -}