diff options
author | zangrc <zangrc.fnst@cn.fujitsu.com> | 2020-06-15 22:25:18 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-16 23:39:28 +0100 |
commit | 8f8cd4dbab8d9e5ec9fd5fd32d06ba3ce7896219 (patch) | |
tree | ee0aec4b29ea9b7ea3ecdc4b57931174e21d8f08 /meta/recipes-extended/ethtool | |
parent | 4db392007eb854118eb443de2a7006062373c117 (diff) | |
download | poky-8f8cd4dbab8d9e5ec9fd5fd32d06ba3ce7896219.tar.gz |
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 <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ethtool')
-rw-r--r-- | meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch | 2 | ||||
-rw-r--r-- | meta/recipes-extended/ethtool/ethtool/fix-printf.patch | 32 | ||||
-rw-r--r-- | meta/recipes-extended/ethtool/ethtool_5.7.bb (renamed from meta/recipes-extended/ethtool/ethtool_5.6.bb) | 3 |
3 files changed, 2 insertions, 35 deletions
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 | |||
19 | --- a/configure.ac | 19 | --- a/configure.ac |
20 | +++ b/configure.ac | 20 | +++ b/configure.ac |
21 | @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. | 21 | @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. |
22 | AC_INIT(ethtool, 5.6, netdev@vger.kernel.org) | 22 | AC_INIT(ethtool, 5.7, netdev@vger.kernel.org) |
23 | AC_PREREQ(2.52) | 23 | AC_PREREQ(2.52) |
24 | AC_CONFIG_SRCDIR([ethtool.c]) | 24 | AC_CONFIG_SRCDIR([ethtool.c]) |
25 | -AM_INIT_AUTOMAKE([gnu subdir-objects]) | 25 | -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 @@ | |||
1 | From 8dcdb3d22a66f18770e5566c0e72e86a0701aeac Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Scheck <robert@fedoraproject.org> | ||
3 | Date: Tue, 12 May 2020 20:33:12 +0200 | ||
4 | Subject: Rewrite printf() due to -Werror=format-security | ||
5 | |||
6 | Avoid -Werror=format-security leading to: netlink/settings.c:378:2: error: | ||
7 | format not a string literal and no format arguments [-Werror=format-security] | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | Signed-off-by: Robert Scheck <robert@fedoraproject.org> | ||
12 | Signed-off-by: John W. Linville <linville@tuxdriver.com> | ||
13 | --- | ||
14 | netlink/settings.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/netlink/settings.c b/netlink/settings.c | ||
18 | index c8a911d..0212465 100644 | ||
19 | --- a/netlink/settings.c | ||
20 | +++ b/netlink/settings.c | ||
21 | @@ -375,7 +375,7 @@ static int dump_link_modes(struct nl_context *nlctx, | ||
22 | after: | ||
23 | if (first && if_none) | ||
24 | printf("%s", if_none); | ||
25 | - printf(after); | ||
26 | + printf("%s", after); | ||
27 | |||
28 | return 0; | ||
29 | err: | ||
30 | -- | ||
31 | cgit 1.2.3-1.el7 | ||
32 | |||
diff --git a/meta/recipes-extended/ethtool/ethtool_5.6.bb b/meta/recipes-extended/ethtool/ethtool_5.7.bb index eda32c877c..d9fc30cb55 100644 --- a/meta/recipes-extended/ethtool/ethtool_5.6.bb +++ b/meta/recipes-extended/ethtool/ethtool_5.7.bb | |||
@@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
9 | SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ | 9 | SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ |
10 | file://run-ptest \ | 10 | file://run-ptest \ |
11 | file://avoid_parallel_tests.patch \ | 11 | file://avoid_parallel_tests.patch \ |
12 | file://fix-printf.patch \ | ||
13 | " | 12 | " |
14 | 13 | ||
15 | SRC_URI[sha256sum] = "e904e980294baf5878df410ebcf1d660497ba19bc3a77f798a04dba569f44a7e" | 14 | SRC_URI[sha256sum] = "c2e16f8bf510c5822f8e25061c2533972308a421767c54abcacb1038b08bb782" |
16 | 15 | ||
17 | UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" | 16 | UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" |
18 | 17 | ||