From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- net-misc/r8168/Manifest | 6 +- net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch | 70 ++++++++++++++++++++++ net-misc/r8168/r8168-8.048.03-r1.ebuild | 34 ----------- net-misc/r8168/r8168-8.049.02-r1.ebuild | 7 ++- net-misc/r8168/r8168-8.049.02.ebuild | 34 ----------- 5 files changed, 77 insertions(+), 74 deletions(-) create mode 100644 net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch delete mode 100644 net-misc/r8168/r8168-8.048.03-r1.ebuild delete mode 100644 net-misc/r8168/r8168-8.049.02.ebuild (limited to 'net-misc/r8168') diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index a43b302d69a0..08136e1b464e 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,6 +1,4 @@ -DIST r8168-8.048.03.tar.bz2 109351 BLAKE2B f31ef24d42af737a97986f0e46bc6c737c43e8ccfe9fac8386eb9957a5d81620faa62602e1bec15840792785444b1d1bf8bafa2e5878c21f1962c7141d9bb32e SHA512 8da615a96cca413ca172e260c52c9f77a782e4feb466e4a4296ae11d895e9cc56bde0ed8634cc3a7a531a292072b68d19dcbe74d20ad9549266d3ee8e082096f +AUX r8168-8.049.02-5.17-fix.patch 2572 BLAKE2B 7bbd4de5576e1686a269ae88b68eb6f3317affe6192f2271fa21bfaf2ca5bb8d59c8fc3ae4e1f41cb9d325e12dbbfe83fc4ab166378895a68f4c11a98cf6aa92 SHA512 7a03481aa0c195188e975dcd99a3954dda45601fde2d7f110d4840ff498fb5a274d8d9bde83a8d83520a506f8e5bebbb1aea18f75b1c2e959d916f3b0359d900 DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0 -EBUILD r8168-8.048.03-r1.ebuild 922 BLAKE2B bdee0c271494634f06402eb065f65e4e2f3497bb89666666d5eded6536b8c5c82421c55e70bcd3a4b3e1bdcf402733c3cd4e07846522f1023ad59c84bd94754c SHA512 18164bb5f346774ae3407b1eeff38958a3641bce84d8f12f9639ff308425aaf0dc65d8b515e916631c8f04a3ceb28135d6669626b91ebda01fa6987d942a9750 -EBUILD r8168-8.049.02-r1.ebuild 1059 BLAKE2B 316c5dd6ec2a37d058acbd9d0e10ed1e9e08d8db789537b82c405ca099c5c0ac69b02c00e0b64e62525d757a6e99f7bbc09c0efa43b8b9987b40641babffea4a SHA512 a072ecfb47b5758e0a04f960d517c6cdc589bd001994803ca0eeb39e8e4f5955935100a5c20b462584c24bca72e50cbed8b7138e9588a898ae1d424e7237d1a8 -EBUILD r8168-8.049.02.ebuild 924 BLAKE2B f4ff3e0f5177124d6628f6c3205f62512e6c3343e0a8de91d87073c7af0f57fcab421e2834434da7a9d309e02a604e6a006294016c78621e7864f276cb8e9a88 SHA512 b82a87e40ed975c981eacc6e03410dca1b824319cf0ae7aa75bad04d30c986af62fb14f164e587a7d585b50eba216225bb8f316c089b18ba6d46b8702b27a053 +EBUILD r8168-8.049.02-r1.ebuild 1116 BLAKE2B 5d3323e1997a3f3948cd197b92570044664a1d90c57bb5e997701755e74feb1caf677bf585b27c2870d350d87b61db9d3b31400ef44dae52821688a3292ca2c5 SHA512 30090d6e07e5abcb5e2b3983365773846a9226fba7d661742f6f0256c4c856f5f641725b81958a9c49c1bea544e063ef862feed892d500035db4d6648ac6b1c5 MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086 diff --git a/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch b/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch new file mode 100644 index 000000000000..9e4e77615458 --- /dev/null +++ b/net-misc/r8168/files/r8168-8.049.02-5.17-fix.patch @@ -0,0 +1,70 @@ +PDE_DATA has been replaced with pde_data +netdev->dev_addr is now const and uses assignment helpers like eth_hw_addr_set + +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=359745d +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=48eab83 +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=adeef3e + +--- a/src/r8168_n.c ++++ b/src/r8168_n.c +@@ -95,6 +95,10 @@ + #include + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) ++#define PDE_DATA pde_data ++#endif ++ + #define FIRMWARE_8168D_1 "rtl_nic/rtl8168d-1.fw" + #define FIRMWARE_8168D_2 "rtl_nic/rtl8168d-2.fw" + #define FIRMWARE_8168E_1 "rtl_nic/rtl8168e-1.fw" +@@ -563,7 +567,7 @@ + static void rtl8168_down(struct net_device *dev); + + static int rtl8168_set_mac_address(struct net_device *dev, void *p); +-void rtl8168_rar_set(struct rtl8168_private *tp, uint8_t *addr); ++void rtl8168_rar_set(struct rtl8168_private *tp, const uint8_t *addr); + static void rtl8168_desc_addr_fill(struct rtl8168_private *); + static void rtl8168_tx_desc_init(struct rtl8168_private *tp); + static void rtl8168_rx_desc_init(struct rtl8168_private *tp); +@@ -24129,9 +24133,17 @@ + rtl8168_rar_set(tp, mac_addr); + + for (i = 0; i < MAC_ADDR_LEN; i++) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) + dev->dev_addr[i] = RTL_R8(tp, MAC0 + i); + tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */ ++#else ++ mac_addr[i] = RTL_R8(tp, MAC0 + i); ++ tp->org_mac_addr[i] = mac_addr[i]; /* keep the original MAC address */ ++#endif + } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) ++ eth_hw_addr_set(dev, mac_addr); ++#endif + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) + memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); + #endif +@@ -24159,9 +24171,11 @@ + return -EADDRNOTAVAIL; + + spin_lock_irqsave(&tp->lock, flags); +- ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) + memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); +- ++#else ++ eth_hw_addr_set(dev, addr->sa_data); ++#endif + rtl8168_rar_set(tp, dev->dev_addr); + + spin_unlock_irqrestore(&tp->lock, flags); +@@ -24177,7 +24191,7 @@ + *****************************************************************************/ + void + rtl8168_rar_set(struct rtl8168_private *tp, +- uint8_t *addr) ++ const uint8_t *addr) + { + uint32_t rar_low = 0; + uint32_t rar_high = 0; diff --git a/net-misc/r8168/r8168-8.048.03-r1.ebuild b/net-misc/r8168/r8168-8.048.03-r1.ebuild deleted file mode 100644 index 49c108910168..000000000000 --- a/net-misc/r8168/r8168-8.048.03-r1.ebuild +++ /dev/null @@ -1,34 +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 - -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 5.6" 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" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - einstalldocs -} diff --git a/net-misc/r8168/r8168-8.049.02-r1.ebuild b/net-misc/r8168/r8168-8.049.02-r1.ebuild index 2f271eb31f74..6686979b10d9 100644 --- a/net-misc/r8168/r8168-8.049.02-r1.ebuild +++ b/net-misc/r8168/r8168-8.049.02-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit linux-info linux-mod @@ -24,6 +24,9 @@ IUSE="use-firmware" CONFIG_CHECK="~!R8169" WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." +PATCHES=( + "${FILESDIR}/r8168-8.049.02-5.17-fix.patch" +) pkg_setup() { linux-mod_pkg_setup BUILD_PARAMS="KERNELDIR=${KV_DIR}" diff --git a/net-misc/r8168/r8168-8.049.02.ebuild b/net-misc/r8168/r8168-8.049.02.ebuild deleted file mode 100644 index 7a3513fe3b08..000000000000 --- a/net-misc/r8168/r8168-8.049.02.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 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 5.6" 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" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - einstalldocs -} -- cgit v1.2.3