From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- net-misc/r8168/Manifest | 11 ++--- net-misc/r8168/files/kernel56.patch | 50 +++++++++++++++++++ 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 --------------- net-misc/r8168/r8168-8.048.00.ebuild | 2 +- net-misc/r8168/r8168-8.048.02.ebuild | 36 ++++++++++++++ 8 files changed, 91 insertions(+), 176 deletions(-) create mode 100644 net-misc/r8168/files/kernel56.patch delete mode 100644 net-misc/r8168/files/linux-4.15-2.patch delete mode 100644 net-misc/r8168/files/linux-5.4.patch delete mode 100644 net-misc/r8168/r8168-8.045.08.ebuild delete mode 100644 net-misc/r8168/r8168-8.047.05.ebuild create mode 100644 net-misc/r8168/r8168-8.048.02.ebuild (limited to 'net-misc/r8168') diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index 2f8145fe4b46..72f134648437 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,9 +1,6 @@ -AUX linux-4.15-2.patch 3248 BLAKE2B 376d3ba01865ed6cfcedc7900e4a034881abb0ff5a98bc4f40a51122a6950f92ecfbb9e36590be3e735f69f4639b889d1d4b5e215fccf92090e157d96ce49f77 SHA512 b4bfb0f1674c1add10b743438853abe3892d7355d251d30cc5ee927c161541e8bb32ec0e89db1db3ca96f29f3273fe53cbce58e75094216e7f7738a952c430aa -AUX linux-5.4.patch 531 BLAKE2B e928e157f0e77da1857715cc2c5d8ecc37e968dd4c2d2f4bf754b0f3c40abba148f8e2da33e1df9e2265022de2618a9aa9c1a45a3fe9ebd72f83fa5da35d0531 SHA512 8f200510dca69ca2ab3e856b4b0f43e5ca62035c1295d66562c88c596aa9aab3e361ec3090106cdc4fa489aa416b92f2417bf1e9847953d50822bb7d85325641 -DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563 -DIST r8168-8.047.05.tar.bz2 108933 BLAKE2B 03e0bd90c970fc5f98f3e2e2a5d724891a6ffdfe53dc9de1e30b6c855658d53944ed1d8f996edf63ac448194d917685ef8902d6960fafebfe695453e8ea34e51 SHA512 a58cbbdfd836373ad65607908bd84e48a93222966c65d190ae5dff20621b55976c044c31a18e1c00ea5c4c6d66ac300acdc7537d4dec5dd1e281f0ad33bb24e6 +AUX kernel56.patch 1863 BLAKE2B 8525effb79f50ca818797cb48f3eb225f5e50f7fe156186643c9639c7e30a5f03716b257c357e1f7b090792594025ba0525763a93b481a992822a8cc251c4332 SHA512 e50734adbd76627bccb4f0f08d6d1a3042a72fc7a836aac049c897ce9d7f37c41a0d0f7da1fc158d1ae8c14329ff2967687420bae0c72f7ebf9845f795d24aba DIST r8168-8.048.00.tar.bz2 109018 BLAKE2B e3587fda9cdad8a8433933daef7f05b123b661e6079703c840fb20562ff8511424bf183781970957fa3b0371ebcb4c7a5b7ef84101c3ac5bed7d3eee1236194c SHA512 425d3e0fc56006e9371c31078d32f6fd135a038b13ec1c4f1b809f68e73e8fd15e4a4c2d027c0b4a2cee9ef0dda348b478cc855fb123eb05e4157564ab9de12a -EBUILD r8168-8.045.08.ebuild 764 BLAKE2B b337a217df697f7ed8ff91b812cea9e59864d2b7b6f5d45f35d97805137bd0d333505ec275abf1f1f5b69914bc95b6df183c9af914d69091f07d0e74d66e3698 SHA512 9eb1659e0aff4ad03cd9fc0a63b473427c2ce6aed67b800533aa11bda7666c58a544309cd5e65f799894a1e609a2bebea2ea7bec3e6828110372053370c8e629 -EBUILD r8168-8.047.05.ebuild 975 BLAKE2B e912aebc2db2f2e7e7da79d75936a9a471df2bbdb3e374074ef61aae409a0f4934de845a4a68bd149164b23e1b23cc9ed8b3f346ae7b05ddc6f6997ace963b42 SHA512 e997798c5fcb40b5434c2ff2c55f5215cdcea479f6b18dab48510ea5cdfd4ae897367849d701ff2ac4503c75c27eecc9b8e971303d15e363fa03d1e879aec158 -EBUILD r8168-8.048.00.ebuild 925 BLAKE2B 987ba8d46e4e68a176fe782df425e6be2c085d842853187cdb4aae9af0431e8a362af4329bdc99d5f892583138b0c78f84eed229738c26da216e2ecc8eb93876 SHA512 d49c5452662c5a59ebd0af45b87005e5f2931b65611dedd85984b69ab9c15e44dcf1848157ce4a5b6e8a705571dde34f3fcff4086aac30b8427cebe0ba09c818 +DIST r8168-8.048.02.tar.bz2 109232 BLAKE2B 24c04cd0e47fce427ef7de1a2e41e384fd7c0d8dd028715411cc6f47901b703c824dd9c15bc0ed90f649520bd5fd25dbd48cdc37f94ca8f838a07faa99c8aa84 SHA512 d9d828e4717d2857bd38e8c9b9005de19387419db9bc8d174f5c8a8ea120c81c3094770b164a1f92cec7833696d7a1302332ef473c5852146fff5dbf9a69196e +EBUILD r8168-8.048.00.ebuild 923 BLAKE2B b91f9d551f38d5fb82e480e0ebd299de9dcbb9671897c1c17d3a682ea6c70b79c7e26b41b7daa092c76a2d53c2d819e029afb0ab7de32e0128110a24525c4c25 SHA512 d0972fb69d9c97d5e5cb845d7dd124d8c48ba789e157575298a750656976c06655b3ace2d858d45f457adbca6d20e085f89092d4491aa49996f7d18a7cf30a76 +EBUILD r8168-8.048.02.ebuild 967 BLAKE2B 8205840245cf8b8cec33f205cf896114d51c5e86b7e391e4a7bcb1060f70636ab3aa77c5d80032207998dfdf1062a76d67cf23037e67fa266854833ca3f2eb92 SHA512 2f96f9a428e24dbe0240417e0889a3555ebe7404d5d0705c45bfa6078ca2b0c04b83e66a58b4f395bfeaa5ad8cfb7456472b289cfe4de1216f19030d2dfb9543 MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f diff --git a/net-misc/r8168/files/kernel56.patch b/net-misc/r8168/files/kernel56.patch new file mode 100644 index 000000000000..23bb3a1856aa --- /dev/null +++ b/net-misc/r8168/files/kernel56.patch @@ -0,0 +1,50 @@ +--- r8168-8.048.00/src/r8168_n.c 2019-11-26 08:32:35.000000000 +0000 ++++ r8168-8.048.00/src/r8168_n.c 2020-03-16 12:34:04.893511463 +0000 +@@ -456,7 +456,13 @@ static void rtl8168_hw_config(struct net + 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); ++#else ++static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue); ++#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); +@@ -1616,12 +1622,21 @@ static int rtl8168_proc_open(struct inod + return single_open(file, show, dev); + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) + static const struct file_operations rtl8168_proc_fops = { + .open = rtl8168_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, + }; ++#else ++static const struct proc_ops rtl8168_proc_fops = { ++ .proc_open = rtl8168_proc_open, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = single_release, ++}; ++#endif + #endif + + /* +@@ -27844,7 +27859,11 @@ static void rtl8168_reset_task(struct wo + } + + static void ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) + rtl8168_tx_timeout(struct net_device *dev) ++#else ++rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue) ++#endif + { + struct rtl8168_private *tp = netdev_priv(dev); + unsigned long flags; \ No newline at end of file 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 5f5f17c551ce..000000000000 --- 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 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 197983597be7..000000000000 --- 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 - #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.045.08.ebuild b/net-misc/r8168/r8168-8.045.08.ebuild deleted file mode 100644 index c9ecc0bee439..000000000000 --- 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 beff876a09c2..000000000000 --- 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 -} diff --git a/net-misc/r8168/r8168-8.048.00.ebuild b/net-misc/r8168/r8168-8.048.00.ebuild index 0ef2e5c2951e..3d0aad6e797e 100644 --- a/net-misc/r8168/r8168-8.048.00.ebuild +++ b/net-misc/r8168/r8168-8.048.00.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" MODULE_NAMES="r8168(net:${S}/src)" BUILD_TARGETS="modules" diff --git a/net-misc/r8168/r8168-8.048.02.ebuild b/net-misc/r8168/r8168-8.048.02.ebuild new file mode 100644 index 000000000000..299ab1010e46 --- /dev/null +++ b/net-misc/r8168/r8168-8.048.02.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info linux-mod + +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}/kernel56.patch" ) + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KERNELDIR=${KV_DIR}" +} + +src_install() { + linux-mod_src_install + einstalldocs +} -- cgit v1.2.3