package/ethtool: add patch to fix build failures
PATCH 1/2 package/ethtool: add patch to fix build failures
Add a patch from the kernel netdev mailing list [1] that solves autobuilder failures.
Fixes:
http://autobuild.buildroot.net/results/394e846bb48a0cc8564ebc3e8d1179ccd1f1560d/
[1] https://patchwork.ozlabs.org/project/netdev/patch/bb60cbfe99071fca4b0ea9e62d67a2341d8dd652.1590707335.git.mkubecek at suse.cz/
--- .../0001-netlink-fix-build-warnings.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/ethtool/0001-netlink-fix-build-warnings.patch
package/ethtool/0001-netlink-fix-build-warnings.patch new file +52 -0
@@ -0,0 +1,52 @@ +From 93b2d0ef0c2be825e56d1f810fbbfba4800fa831 Mon Sep 17 00:00:00 2001 +From: Michal Kubecek <[email protected]> +Date: Fri, 29 May 2020 01:21:12 +0200 +Subject: [PATCH] netlink: fix build warnings + +Depending on compiler version and options, some of these warnings may +result in build failure. + +- gcc 4.8 wants __KERNEL_DIV_ROUND_UP defined before including ethtool.h +- avoid pointer arithmetic on void * + +Signed-off-by: Michal Kubecek <[email protected]> + +[Patch was taken from the linux netdev mailinglist and will be applied in the +upcoming ethtool release 5.8] +Signed-off-by: Heiko Thiery <[email protected]> +--- + netlink/desc-ethtool.c | 2 +- + netlink/parser.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/netlink/desc-ethtool.c b/netlink/desc-ethtool.c +index 76c6f13..423479d 100644 +--- a/netlink/desc-ethtool.c ++++ b/netlink/desc-ethtool.c +@@ -4,9 +4,9 @@ + * Descriptions of ethtool netlink messages and attributes for pretty print. + */ + ++#include "../internal.h" + #include <linux/ethtool_netlink.h> + +-#include "../internal.h" + #include "prettymsg.h" + + static const struct pretty_nla_desc __header_desc[] = { +diff --git a/netlink/parser.c b/netlink/parser.c +index fff23f2..d790abe 100644 +--- a/netlink/parser.c ++++ b/netlink/parser.c +@@ -1016,7 +1016,7 @@ int nl_parser(struct nl_context *nlctx, const struct param_parser *params, + buff = tmp_buff_find(buffs, parser->group); + msgbuff = buff ? &buff->msgbuff : &nlsk->msgbuff; + +- param_dest = dest ? (dest + parser->dest_offset) : NULL; ++ param_dest = dest ? ((char *)dest + parser->dest_offset) : NULL; + ret = parser->handler(nlctx, parser->type, parser->handler_data, + msgbuff, param_dest); + if (ret < 0) +-- +2.20.1 +
Signature · 1 line
2.20.1
PATCH 2/2 package/ethtool: bump to 5.7
--- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/ethtool/ethtool.hash +1 -1
@@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 ca0f1b526dad5153f0aa0f1eb3c17c31770c75a74f70af622b1a83ae38043995 ethtool-5.6.tar.xz +sha256 724eb8bd3c3a389fe285735959a1902fbd9310624656ad3220c5f23df1053c39 ethtool-5.7.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE
package/ethtool/ethtool.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.6 +ETHTOOL_VERSION = 5.7 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0
Signature · 1 line
2.20.1
PATCH 2/2 package/ethtool: bump to 5.7
Heiko,
Quoted 23 lines · Heiko Thiery
Signed-off-by Heiko Thiery <[email protected]>--- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)package/ethtool/ethtool.hash +1
-1@@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 ca0f1b526dad5153f0aa0f1eb3c17c31770c75a74f70af622b1a83ae38043995 ethtool-5.6.tar.xz +sha256 724eb8bd3c3a389fe285735959a1902fbd9310624656ad3220c5f23df1053c39 ethtool-5.7.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSEpackage/ethtool/ethtool.mk +0
-0
package/ethtool/ethtool.mk line 7
Quoted 5 lines
package/ethtool/ethtool.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.6 +ETHTOOL_VERSION = 5.7
Did you notice by chance if this included GCC10 fixes?
http://autobuild.buildroot.net/results/ce233c3eb6b4384c8fb9749802a0afe223b13b39/build-end.log
Regard,
Matt
PATCH 2/2 package/ethtool: bump to 5.7
Hi Matt,
Am Mo., 8. Juni 2020 um 13:51 Uhr schrieb Matthew Weber <[email protected]>:
Quoted 30 lines
Heiko,
Quoted 26 lines · Heiko Thiery
Signed-off-by Heiko Thiery <[email protected]>--- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)package/ethtool/ethtool.hash +1
-1@@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 ca0f1b526dad5153f0aa0f1eb3c17c31770c75a74f70af622b1a83ae38043995 ethtool-5.6.tar.xz +sha256 724eb8bd3c3a389fe285735959a1902fbd9310624656ad3220c5f23df1053c39 ethtool-5.7.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSEpackage/ethtool/ethtool.mk +0
-0@@ -4,7 +4,7 @@ # ################################################################################
Quoted 6 lines
package/ethtool/ethtool.mk line 7
Quoted 2 lines
package/ethtool/ethtool.mk +1
-1-ETHTOOL_VERSION = 5.6 +ETHTOOL_VERSION = 5.7Did you notice by chance if this included GCC10 fixes?
http://autobuild.buildroot.net/results/ce233c3eb6b4384c8fb9749802a0afe223b13b39/build-end.log
Besides the bump to 5.7 I also added one patch from that series to fix an issue.
The patch [1][ was from an upstream pending series [2].
[1] https://patchwork.ozlabs.org/project/netdev/patch/bb60cbfe99071fca4b0ea9e62d67a2341d8dd652.1590707335.git.mkubecek at suse.cz/
[2] https://patchwork.ozlabs.org/project/netdev/list/?series=180039&state=*
I think that should fix that.
Signature · 1 line
Heiko
PATCH 1/2 package/ethtool: add patch to fix build failures
In reply to Heiko ThieryQuoted 6 lines · On Sat, 6 Jun 2020 20:38:18 +0200 Heiko Thiery <[email protected]> wrote:
Add a patch from the kernel netdev mailing list [1] that solves autobuilder failures.
Fixes:
http://autobuild.buildroot.net/results/394e846bb48a0cc8564ebc3e8d1179ccd1f1560d/
Quoted 7 lines
[1] https://patchwork.ozlabs.org/project/netdev/patch/bb60cbfe99071fca4b0ea9e62d67a2341d8dd652.1590707335.git.mkubecek at suse.cz/
Signed-off-by Heiko Thiery <[email protected]>--- .../0001-netlink-fix-build-warnings.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/ethtool/0001-netlink-fix-build-warnings.patch
Both applied to master. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com