From 8f8cd4dbab8d9e5ec9fd5fd32d06ba3ce7896219 Mon Sep 17 00:00:00 2001 From: zangrc Date: Mon, 15 Jun 2020 22:25:18 +0800 Subject: ethtool:upgrade 5.6 -> 5.7 fix-printf.patch Removed since this is included in 5.7 Refresh the following patch: avoid_parallel_tests.patch (From OE-Core rev: 6abcc7b13a3d28471be63af0809fd25106386083) Signed-off-by: Zang Ruochen Signed-off-by: Richard Purdie --- .../ethtool/ethtool/avoid_parallel_tests.patch | 2 +- .../ethtool/ethtool/fix-printf.patch | 32 ------------------- meta/recipes-extended/ethtool/ethtool_5.6.bb | 36 ---------------------- meta/recipes-extended/ethtool/ethtool_5.7.bb | 35 +++++++++++++++++++++ 4 files changed, 36 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-extended/ethtool/ethtool/fix-printf.patch delete mode 100644 meta/recipes-extended/ethtool/ethtool_5.6.bb create mode 100644 meta/recipes-extended/ethtool/ethtool_5.7.bb diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 2f2d04ca07..8ecfde1417 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -19,7 +19,7 @@ index 1169b7f..ed82524 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, 5.6, netdev@vger.kernel.org) + AC_INIT(ethtool, 5.7, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/meta/recipes-extended/ethtool/ethtool/fix-printf.patch b/meta/recipes-extended/ethtool/ethtool/fix-printf.patch deleted file mode 100644 index 9effa4f3f4..0000000000 --- a/meta/recipes-extended/ethtool/ethtool/fix-printf.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8dcdb3d22a66f18770e5566c0e72e86a0701aeac Mon Sep 17 00:00:00 2001 -From: Robert Scheck -Date: Tue, 12 May 2020 20:33:12 +0200 -Subject: Rewrite printf() due to -Werror=format-security - -Avoid -Werror=format-security leading to: netlink/settings.c:378:2: error: -format not a string literal and no format arguments [-Werror=format-security] - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin -Signed-off-by: Robert Scheck -Signed-off-by: John W. Linville ---- - netlink/settings.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/netlink/settings.c b/netlink/settings.c -index c8a911d..0212465 100644 ---- a/netlink/settings.c -+++ b/netlink/settings.c -@@ -375,7 +375,7 @@ static int dump_link_modes(struct nl_context *nlctx, - after: - if (first && if_none) - printf("%s", if_none); -- printf(after); -+ printf("%s", after); - - return 0; - err: --- -cgit 1.2.3-1.el7 - diff --git a/meta/recipes-extended/ethtool/ethtool_5.6.bb b/meta/recipes-extended/ethtool/ethtool_5.6.bb deleted file mode 100644 index eda32c877c..0000000000 --- a/meta/recipes-extended/ethtool/ethtool_5.6.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Display or change ethernet card settings" -DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." -HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" -SECTION = "console/network" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" - -SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ - file://run-ptest \ - file://avoid_parallel_tests.patch \ - file://fix-printf.patch \ - " - -SRC_URI[sha256sum] = "e904e980294baf5878df410ebcf1d660497ba19bc3a77f798a04dba569f44a7e" - -UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" - -inherit autotools ptest bash-completion pkgconfig - -RDEPENDS_${PN}-ptest += "make" - -PACKAGECONFIG ?= "netlink" -PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," - -do_compile_ptest() { - oe_runmake buildtest-TESTS -} - -do_install_ptest () { - cp ${B}/Makefile ${D}${PTEST_PATH} - install ${B}/test-cmdline ${D}${PTEST_PATH} - install ${B}/test-features ${D}${PTEST_PATH} - install ${B}/ethtool ${D}${PTEST_PATH}/ethtool - sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile -} diff --git a/meta/recipes-extended/ethtool/ethtool_5.7.bb b/meta/recipes-extended/ethtool/ethtool_5.7.bb new file mode 100644 index 0000000000..d9fc30cb55 --- /dev/null +++ b/meta/recipes-extended/ethtool/ethtool_5.7.bb @@ -0,0 +1,35 @@ +SUMMARY = "Display or change ethernet card settings" +DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." +HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" +SECTION = "console/network" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" + +SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ + file://run-ptest \ + file://avoid_parallel_tests.patch \ + " + +SRC_URI[sha256sum] = "c2e16f8bf510c5822f8e25061c2533972308a421767c54abcacb1038b08bb782" + +UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" + +inherit autotools ptest bash-completion pkgconfig + +RDEPENDS_${PN}-ptest += "make" + +PACKAGECONFIG ?= "netlink" +PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," + +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + +do_install_ptest () { + cp ${B}/Makefile ${D}${PTEST_PATH} + install ${B}/test-cmdline ${D}${PTEST_PATH} + install ${B}/test-features ${D}${PTEST_PATH} + install ${B}/ethtool ${D}${PTEST_PATH}/ethtool + sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile +} -- cgit v1.2.3-54-g00ecf