Drop patch merged upstream. Signed-off-by: Alexander Kanavin <[email protected]> --- .../0001-marvell.c-define-_GNU_SOURCE.patch | 59 ------------------- .../ethtool/avoid_parallel_tests.patch | 6 +- .../{ethtool_6.1.bb => ethtool_6.2.bb} | 3 +- 3 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch rename meta/recipes-extended/ethtool/{ethtool_6.1.bb => ethtool_6.2.bb} (90%)
diff --git a/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch b/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch deleted file mode 100644 index 8a7eeafb9c..0000000000 --- a/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 5112785191e3279c671a027fe797be77e1071ecd Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 2 Jan 2023 13:45:46 +0100 -Subject: [PATCH] marvell.c: use portable integer types - -u_int32_t is not portable, but uint32_t is. - -Upstream-Status: Submitted [by email to [email protected]] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - marvell.c | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/marvell.c b/marvell.c -index d3d570e..3d42eed 100644 ---- 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; - diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 4994369682..d5cb8705c2 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From 0d066a901292e6a44ff7bc7ee16f99dd2ba4ea15 Mon Sep 17 00:00:00 2001 +From b4ec6635af4d4a47e9ab7bbd5347e78710d19362 Mon Sep 17 00:00:00 2001 From: Tudor Florea <[email protected]> Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 3eb4e7b..ee5c72f 100644 +index ebdfd39..c93b79a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 6.1, [email protected]) + AC_INIT(ethtool, 6.2, [email protected]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/meta/recipes-extended/ethtool/ethtool_6.1.bb b/meta/recipes-extended/ethtool/ethtool_6.2.bb similarity index 90% rename from meta/recipes-extended/ethtool/ethtool_6.1.bb rename to meta/recipes-extended/ethtool/ethtool_6.2.bb index 2b9bbe69db..881e638851 100644 --- a/meta/recipes-extended/ethtool/ethtool_6.1.bb +++ b/meta/recipes-extended/ethtool/ethtool_6.2.bb @@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://run-ptest \ file://avoid_parallel_tests.patch \ - file://0001-marvell.c-define-_GNU_SOURCE.patch \ " -SRC_URI[sha256sum] = "1d03f1ce324fbd95591191c42ac0c4c9cc721e067b929083a20a46c4b4731436" +SRC_URI[sha256sum] = "1a9f95c3d8c1795a942220912d72c06a208f1c122a78f7690259402856ff06a0" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"; -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#178233): https://lists.openembedded.org/g/openembedded-core/message/178233 Mute This Topic: https://lists.openembedded.org/mt/97497967/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
