diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-31 17:52:47 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-03 15:25:55 +0100 |
| commit | 081122f0413a547842a41860c270713201c168ac (patch) | |
| tree | 1baae14dbac3a0286da52b14852cbd38134a2294 /meta/recipes-extended/ethtool/ethtool | |
| parent | ada73fe8eb4953bee585dc6948d270ebfc584151 (diff) | |
| download | openembedded-core-081122f0413a547842a41860c270713201c168ac.tar.gz | |
ethtool: upgrade 5.4 -> 5.6
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ethtool/ethtool')
| -rw-r--r-- | meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch | 10 | ||||
| -rw-r--r-- | meta/recipes-extended/ethtool/ethtool/fix-printf.patch | 32 |
2 files changed, 37 insertions, 5 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index d5c93244fa..2f2d04ca07 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 f8333f7759717b4d163cfe8e3ef8861c5a667324 Mon Sep 17 00:00:00 2001 +From 1c6c017e56ec536f5cceacdb02092777d390debb Mon Sep 17 00:00:00 2001 From: Tudor Florea <tudor.florea@enea.com> Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,15 +15,15 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 2127fdb..4910e6f 100644 +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.4, netdev@vger.kernel.org) + AC_INIT(ethtool, 5.6, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) --AM_INIT_AUTOMAKE([gnu]) -+AM_INIT_AUTOMAKE([gnu serial-tests]) +-AM_INIT_AUTOMAKE([gnu subdir-objects]) ++AM_INIT_AUTOMAKE([gnu subdir-objects serial-tests]) AC_CONFIG_HEADERS([ethtool-config.h]) AM_MAINTAINER_MODE diff --git a/meta/recipes-extended/ethtool/ethtool/fix-printf.patch b/meta/recipes-extended/ethtool/ethtool/fix-printf.patch new file mode 100644 index 0000000000..9effa4f3f4 --- /dev/null +++ b/meta/recipes-extended/ethtool/ethtool/fix-printf.patch @@ -0,0 +1,32 @@ +From 8dcdb3d22a66f18770e5566c0e72e86a0701aeac Mon Sep 17 00:00:00 2001 +From: Robert Scheck <robert@fedoraproject.org> +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 <alex.kanavin@gmail.com> +Signed-off-by: Robert Scheck <robert@fedoraproject.org> +Signed-off-by: John W. Linville <linville@tuxdriver.com> +--- + 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 + |