commit: f9e527a5fe115f387288b529f2c6fee442844239 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Nov 24 23:08:58 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Nov 24 23:09:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e527a5
sys-apps/ethtool: drop 5.15, 5.19, 6.1, 6.2, 6.3, 6.4 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/ethtool/Manifest | 6 --- sys-apps/ethtool/ethtool-5.15.ebuild | 21 --------- sys-apps/ethtool/ethtool-5.19.ebuild | 21 --------- sys-apps/ethtool/ethtool-6.1.ebuild | 25 ----------- sys-apps/ethtool/ethtool-6.2.ebuild | 21 --------- sys-apps/ethtool/ethtool-6.3.ebuild | 21 --------- sys-apps/ethtool/ethtool-6.4.ebuild | 21 --------- sys-apps/ethtool/files/ethtool-6.1-musl.patch | 64 --------------------------- 8 files changed, 200 deletions(-) diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest index 56342594ffb4..2028789d2388 100644 --- a/sys-apps/ethtool/Manifest +++ b/sys-apps/ethtool/Manifest @@ -1,8 +1,2 @@ -DIST ethtool-5.15.tar.xz 318864 BLAKE2B 855c07e388bfabf37637f20e2714c6ca27717f38d7f658be96e0e9ec9d4514e61f4ee29361fc0279510869606ad18126ccd2a47160f1097ab52b1e35216e9721 SHA512 28147468a92c179217b459907a3257ee4f2d2ed028cb87b074f1c7ca6eb91aca81c8a9f5c7fe74e81d16a516e6e7eb20137bf7a15b5479fd82a327c64954da12 -DIST ethtool-5.19.tar.xz 324472 BLAKE2B 44cc292db04f411a57a0a5ae0cdfbef733c7ee739fc252523c713489a13ae33de3927b500db796bc584fef3c83d7238dca2af4e6b6a5c594bbf21e87ed2380a7 SHA512 71103c6856a889161ef2bf81eadec69b2f3a84c94aa776d545f889dc1c55b91d566d3b7394dbd2cb70ed92ac19d5f26967b1f829c204f23831d1fb81a0464972 -DIST ethtool-6.1.tar.xz 327644 BLAKE2B 002a4edffda42520d77e8f0c27adf909090823f1a08689b67fc7c75de3048bdc9c94d7d32973bd17562d7dbf295479e796c2529b5db66b5fce42a2ede5851cd6 SHA512 6ca478ec75dae7cc347b859802e1965e6c78310ec4b276dec29bdf76d3464e4186c6e5ed0cb8f013171d6c0562c1156cb0442419f5b947c314e8b91ad9fd2d93 -DIST ethtool-6.2.tar.xz 332708 BLAKE2B b3fa2571b1efef3b686eb4f20b33e6cc32bdb8cff5f2e642454ca3d41c427b1953df7b07e5ac8ef149f8b4be614210e05e593233655e5fe317c48630b20b68e8 SHA512 ff1f14c7876163bef93ca48e22a3429f09b4bcb3e1d101ef297d9f226e3fc2d3c3f19faf5b85f54cb558479e4a408ef5356a2d12e7ba132cc4cadaf92effccaf -DIST ethtool-6.3.tar.xz 338764 BLAKE2B c06509525db47f8ee7c220d0b880fe80323a4a00036e9698432b1b9c85ad75045e98b23498f6283497728cafd187ca173b15f3ad60f8e6f8b4d0c5688d84a1f9 SHA512 85e5ecd20abf737e94ddc093f15ab0b876f763a886e3327027c448c0efcc091628c3df42070f30583551fa12f866f5b49d41fb3333acdf854a59bba671646320 -DIST ethtool-6.4.tar.xz 340844 BLAKE2B 15fbd3f2db21b7a880d040bbd5fffc51f5335d182e1d3d23dc23d2cfd3b572fabb5914426f0e8470f4374ceddb07741ed1b57d058a57867b89c1ea2a78d13c10 SHA512 5e389564b41e9494df102f9fb703ae2d80ba38346d84ec6c89b024ec21c85eca9f58e88012290feaa88d3ce035d6f779913798b0ca177e8d0a08eff197eb6afd DIST ethtool-6.5.tar.xz 344220 BLAKE2B 1cd79cbac563d63d81212e25df57cd5887e5284f9e4a5e73d483a3fcc1cb18dc0679d7bf53ed424f244642fc7aeda2b6cc5b11341ab28e74f5397a6bbf4130e6 SHA512 07994a20f34b1c1e72f9f855972d31d027968b53b278a5b46c5a2977be8d7152e6439c9719001101be85359876d9d932d2afb9561af9967e84d8a447a7d0c558 DIST ethtool-6.6.tar.xz 352476 BLAKE2B dfbc5f9a6ac63210d1ae305c2458cc44d38d44fcc272c9b0397a13a93e0aa0a09e3750e330a27dcf4dce796c6bd302c4d4c1fd91faab824a81949c31f1ed3504 SHA512 1e7eae3abe59e6af4bce0ebedd0a7ea84d1b0adc7693a0f03021c4096677096a022fdae521ac02413f9db46ee232b89dd2015a116845aa6ca7686fdda50a5b21 diff --git a/sys-apps/ethtool/ethtool-5.15.ebuild b/sys-apps/ethtool/ethtool-5.15.ebuild deleted file mode 100644 index 3b0186226f11..000000000000 --- a/sys-apps/ethtool/ethtool-5.15.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"; -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" -IUSE="+netlink" - -BDEPEND="app-arch/xz-utils" -RDEPEND="netlink? ( net-libs/libmnl )" -DEPEND="${RDEPEND}" - -src_configure() { - econf $(use_enable netlink) -} diff --git a/sys-apps/ethtool/ethtool-5.19.ebuild b/sys-apps/ethtool/ethtool-5.19.ebuild deleted file mode 100644 index 8d122a733c09..000000000000 --- a/sys-apps/ethtool/ethtool-5.19.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"; -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="+netlink" - -RDEPEND="netlink? ( net-libs/libmnl )" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils" - -src_configure() { - econf $(use_enable netlink) -} diff --git a/sys-apps/ethtool/ethtool-6.1.ebuild b/sys-apps/ethtool/ethtool-6.1.ebuild deleted file mode 100644 index 108ad5e44c50..000000000000 --- a/sys-apps/ethtool/ethtool-6.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"; -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="+netlink" - -RDEPEND="netlink? ( net-libs/libmnl )" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils" - -PATCHES=( - "${FILESDIR}"/${P}-musl.patch -) - -src_configure() { - econf $(use_enable netlink) -} diff --git a/sys-apps/ethtool/ethtool-6.2.ebuild b/sys-apps/ethtool/ethtool-6.2.ebuild deleted file mode 100644 index fd370de49db8..000000000000 --- a/sys-apps/ethtool/ethtool-6.2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"; -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="+netlink" - -RDEPEND="netlink? ( net-libs/libmnl )" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils" - -src_configure() { - econf $(use_enable netlink) -} diff --git a/sys-apps/ethtool/ethtool-6.3.ebuild b/sys-apps/ethtool/ethtool-6.3.ebuild deleted file mode 100644 index fd370de49db8..000000000000 --- a/sys-apps/ethtool/ethtool-6.3.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"; -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="+netlink" - -RDEPEND="netlink? ( net-libs/libmnl )" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils" - -src_configure() { - econf $(use_enable netlink) -} diff --git a/sys-apps/ethtool/ethtool-6.4.ebuild b/sys-apps/ethtool/ethtool-6.4.ebuild deleted file mode 100644 index fd370de49db8..000000000000 --- a/sys-apps/ethtool/ethtool-6.4.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"; -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="+netlink" - -RDEPEND="netlink? ( net-libs/libmnl )" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils" - -src_configure() { - econf $(use_enable netlink) -} diff --git a/sys-apps/ethtool/files/ethtool-6.1-musl.patch b/sys-apps/ethtool/files/ethtool-6.1-musl.patch deleted file mode 100644 index ed441a4511da..000000000000 --- a/sys-apps/ethtool/files/ethtool-6.1-musl.patch +++ /dev/null @@ -1,64 +0,0 @@ -https://bugs.gentoo.org/889402 -https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=41be533331fc3c6b711dbe532405782d3b8be5d1 - -From 41be533331fc3c6b711dbe532405782d3b8be5d1 Mon Sep 17 00:00:00 2001 -From: Florian Fainelli <f.faine...@gmail.com> -Date: Sat, 14 Jan 2023 08:34:11 -0800 -Subject: marvell.c: Fix build with musl-libc - -After commit 1fa60003a8b8 ("misc: header includes cleanup") we stopped -including net/if.h which resolved the proper defines to pull in -sys/types.h and provide a definition for u_int32_t. With musl-libc we -would need to define _GNU_SOURCE to ensure that sys/types.h does provide a -definition for u_int32_t. - -Rather, just replace u_uint{16,32}_t with the more standard -uint{16,32}_t types from stdint.h - -Fixes: 1fa60003a8b8 ("misc: header includes cleanup") -Signed-off-by: Florian Fainelli <f.faine...@gmail.com> ---- a/marvell.c -+++ b/marvell.c -@@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p) - static void dump_queue(const char *name, const void *a, int rx) - { - struct desc { -- u_int32_t ctl; -- u_int32_t next; -- u_int32_t data_lo; -- u_int32_t data_hi; -- u_int32_t status; -- u_int32_t timestamp; -- u_int16_t csum2; -- u_int16_t csum1; -- u_int16_t csum2_start; -- u_int16_t csum1_start; -- u_int32_t addr_lo; -- u_int32_t addr_hi; -- u_int32_t count_lo; -- u_int32_t count_hi; -- u_int32_t byte_count; -- u_int32_t csr; -- u_int32_t flag; -+ uint32_t ctl; -+ uint32_t next; -+ uint32_t data_lo; -+ uint32_t data_hi; -+ uint32_t status; -+ uint32_t timestamp; -+ uint16_t csum2; -+ uint16_t csum1; -+ uint16_t csum2_start; -+ uint16_t csum1_start; -+ uint32_t addr_lo; -+ uint32_t addr_hi; -+ uint32_t count_lo; -+ uint32_t count_hi; -+ uint32_t byte_count; -+ uint32_t csr; -+ uint32_t flag; - }; - const struct desc *d = a; - --- -cgit
