* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ethtool/files/, sys-apps/ethtool/
@ 2021-07-09 8:08 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2021-07-09 8:08 UTC (permalink / raw
To: gentoo-commits
commit: c73f0b2c73bf56baf76668272098d1c71b396234
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 9 08:07:44 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 9 08:08:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c73f0b2c
sys-apps/ethtool: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/ethtool/Manifest | 2 --
sys-apps/ethtool/ethtool-5.4.ebuild | 14 -----------
sys-apps/ethtool/ethtool-5.8-r1.ebuild | 26 -------------------
.../ethtool/files/ethtool-5.8-avoid_bashisms.patch | 29 ----------------------
...ol-5.8-only-memset-non-NULL-link-settings.patch | 20 ---------------
5 files changed, 91 deletions(-)
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 437687fbf1a..5bffba1c47c 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,5 +1,3 @@
DIST ethtool-5.10.tar.xz 310536 BLAKE2B acc91ff2f7cf233a5a7bc85e32fbcf78e3923b240ab3e3300fa11d42769b664b1b5740ad6577daf4ef1b1054432e2323429ee63774af5e0210c1ec1c7d6aa4ac SHA512 128ecc0445ec44e231d95158a71cea2c03f059314f1a844cfb2f424970bd68608fb73b8dc5e8905b88ad0da2b65a8884a626be78d6d25f770ce043c6c87580a6
DIST ethtool-5.12.tar.xz 311004 BLAKE2B 640d4a1576afea60c673a6060b649d10ccb2d2be64a817e4d74daeb6de4da2d30ccb059ff1113e05f9c44898f08beefd706be2ea6e323c42032c4d93926d380a SHA512 9825f0bf10851f0bd9c3e621785144a5ed5f3fbedacb1801aa6a9b4685c870fa9bfac8eb552c900d20be06240c017dd001fde6be7aecc8c466bbe9ade8b1d002
DIST ethtool-5.13.tar.xz 318204 BLAKE2B 5e693368ce56fa155c5d371bc650e5fb7e8e1c8fd30982b45a674da63119e54f005484bea68c7b85e8d070efbf7aa15e92637e7a3b8b2010b4022851154a6809 SHA512 44426653aabd20707d2e597707113f4d30d12696b4f32c0ab0450af0dccece1b6a11e529a22d1299204f63c9e71ae41a1495d3d36b8f630f1734a72694d779be
-DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
-DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56ced963414a017b0d6b6fbde9d0195ff64ebdc060351e5e9844af8beb8f00f7e04d76b04f958b166cda7e589 SHA512 5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e
diff --git a/sys-apps/ethtool/ethtool-5.4.ebuild b/sys-apps/ethtool/ethtool-5.4.ebuild
deleted file mode 100644
index 159377da21d..00000000000
--- a/sys-apps/ethtool/ethtool-5.4.ebuild
+++ /dev/null
@@ -1,14 +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 sparc x86"
-
-BDEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-5.8-r1.ebuild b/sys-apps/ethtool/ethtool-5.8-r1.ebuild
deleted file mode 100644
index 8e1cf0073e3..00000000000
--- a/sys-apps/ethtool/ethtool-5.8-r1.ebuild
+++ /dev/null
@@ -1,26 +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 sparc x86"
-IUSE="+netlink"
-
-BDEPEND="app-arch/xz-utils"
-RDEPEND="netlink? ( net-libs/libmnl )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.8-avoid_bashisms.patch"
- "${FILESDIR}/${P}-only-memset-non-NULL-link-settings.patch"
-)
-
-src_configure() {
- econf $(use_enable netlink)
-}
diff --git a/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch b/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch
deleted file mode 100644
index 9cd9fd86fb7..00000000000
--- a/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Running this script with dash results in an endless loop spitting out this:
-
- ./test-driver: 62: [: --test-name: unexpected operator
- ./test-driver: 78: [[: not found
-
-This is caused by two bashisms which are being fixed by the below patch
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
---- ethtool-5.8/test-driver
-+++ ethtool-5.8/test-driver
-@@ -59,7 +59,7 @@
- while test $# -gt 1; do
- arg=${1%=*}
- val=${1#*=}
-- if [ $arg == $val ]; then
-+ if [ $arg = $val ]; then
- val=$2
- shift
- fi
-@@ -75,7 +75,7 @@
- --) break;;
- -*) usage_error "invalid option: '$1'";;
- esac
-- [[ $arg != $val ]] && shift
-+ [ $arg != $val ] && shift
- done
-
- missing_opts=
diff --git a/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch b/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch
deleted file mode 100644
index 573ee645615..00000000000
--- a/sys-apps/ethtool/files/ethtool-5.8-only-memset-non-NULL-link-settings.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/740114
-https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=cf12872ebe7d8fac2088e7d2cd5e2a0a5f03499d
-
---- a/ethtool.c
-+++ b/ethtool.c
-@@ -3048,10 +3048,11 @@ static int do_sset(struct cmd_context *ctx)
- struct ethtool_link_usettings *link_usettings;
-
- link_usettings = do_ioctl_glinksettings(ctx);
-- memset(&link_usettings->deprecated, 0,
-- sizeof(link_usettings->deprecated));
- if (link_usettings == NULL)
- link_usettings = do_ioctl_gset(ctx);
-+ else
-+ memset(&link_usettings->deprecated, 0,
-+ sizeof(link_usettings->deprecated));
- if (link_usettings == NULL) {
- perror("Cannot get current device settings");
- err = -1;
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ethtool/files/, sys-apps/ethtool/
@ 2023-02-15 5:31 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-02-15 5:31 UTC (permalink / raw
To: gentoo-commits
commit: debd0a8b5082f5189da33070cda7ad33db9be85c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 05:30:52 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 05:30:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=debd0a8b
sys-apps/ethtool: fix build w/ musl
Closes: https://bugs.gentoo.org/889402
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/ethtool/ethtool-6.1.ebuild | 6 ++-
sys-apps/ethtool/files/ethtool-6.1-musl.patch | 64 +++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/sys-apps/ethtool/ethtool-6.1.ebuild b/sys-apps/ethtool/ethtool-6.1.ebuild
index 8d122a733c09..d0b52cc1fe47 100644
--- a/sys-apps/ethtool/ethtool-6.1.ebuild
+++ b/sys-apps/ethtool/ethtool-6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,6 +16,10 @@ 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/files/ethtool-6.1-musl.patch b/sys-apps/ethtool/files/ethtool-6.1-musl.patch
new file mode 100644
index 000000000000..ed441a4511da
--- /dev/null
+++ b/sys-apps/ethtool/files/ethtool-6.1-musl.patch
@@ -0,0 +1,64 @@
+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.fainelli@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.fainelli@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ethtool/files/, sys-apps/ethtool/
@ 2023-11-24 23:14 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-11-24 23:14 UTC (permalink / raw
To: gentoo-commits
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.fainelli@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.fainelli@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-24 23:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-15 5:31 [gentoo-commits] repo/gentoo:master commit in: sys-apps/ethtool/files/, sys-apps/ethtool/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-11-24 23:14 Sam James
2021-07-09 8:08 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox