From 2b945afae2c838204832b15ebc71569d6698394d Mon Sep 17 00:00:00 2001 From: leimaohui Date: Thu, 17 Apr 2025 18:38:59 +0800 Subject: [PATCH] ethtool: upgrade 6.11 -> 6.14 Package metainfo xml to ${PN}, fix the issue that: | ERROR: ethtool-6.14-r0 do_package: QA Issue: ethtool: Files/directories were installed but not shipped in any package: | /usr/share/metainfo | /usr/share/metainfo/org.kernel.software.network.ethtool.metainfo.xml | Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. | ethtool: 2 installed and not shipped files. [installed-vs-shipped] (From OE-Core rev: 6c35f3dee3a8d9a32243b96060d07cccc24df52e) Signed-off-by: Lei Maohui Signed-off-by: Richard Purdie --- .../ethtool/ethtool/avoid_parallel_tests.patch | 6 +++--- .../ethtool/{ethtool_6.11.bb => ethtool_6.14.bb} | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) rename meta/recipes-extended/ethtool/{ethtool_6.11.bb => ethtool_6.14.bb} (88%) diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 0fe482545a..4affc332a9 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 74902bef8123b596437587bb48ad9b720cb06f64 Mon Sep 17 00:00:00 2001 +From 755cf01b02e6ec8c8acb79558cbad28e301519b3 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -14,10 +14,10 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f6fe260..65a0566 100644 +index db71394..5e93135 100644 --- a/configure.ac +++ b/configure.ac -@@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.10, netdev@vger.kernel.org) +@@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.14, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([ethtool.c]) diff --git a/meta/recipes-extended/ethtool/ethtool_6.11.bb b/meta/recipes-extended/ethtool/ethtool_6.14.bb similarity index 88% rename from meta/recipes-extended/ethtool/ethtool_6.11.bb rename to meta/recipes-extended/ethtool/ethtool_6.14.bb index c4808c5856..41164ac6ca 100644 --- a/meta/recipes-extended/ethtool/ethtool_6.11.bb +++ b/meta/recipes-extended/ethtool/ethtool_6.14.bb @@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "a8bee475d991939cad182b7dbcf3a1f139aeed8cb0add73d72084cd71d43282b" +SRC_URI[sha256sum] = "3dbfc910513d1fef683f27ab12325cc88551abffae66d0ad3afe2a13317d2339" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" @@ -22,6 +22,8 @@ RDEPENDS:${PN}-ptest += "make bash" PACKAGECONFIG ?= "netlink" PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," +FILES:${PN} += "${datadir}/metainfo/org.kernel.software.network.ethtool.metainfo.xml" + do_compile_ptest() { oe_runmake buildtest-TESTS }