diff options
| author |   wangmy <wangmy@fujitsu.com> | 2022-03-28 17:52:50 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-29 15:58:38 +0100 |
| commit | 4b0b5fa9dd82fe9492e1eba440f3dcee40572fb6 (patch) | |
| tree | eeb41b50bb671c578b59e115aebb8bf277ff2ec1 /meta/recipes-connectivity/iproute2 | |
| parent | 17e15809a0689eb4ce99e950d4e088ddb09435eb (diff) | |
| download | openembedded-core-4b0b5fa9dd82fe9492e1eba440f3dcee40572fb6.tar.gz | |
iproute2: upgrade 5.16.0 -> 5.17.0
0001-lib-fix-ax25.h-include-for-musl.patch
removed since it's included in 5.17.0
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/iproute2')
| -rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb) | 3 |
2 files changed, 1 insertions, 39 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch deleted file mode 100644 index e4c0cf4aa5..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Thu, 13 Jan 2022 08:14:13 +0000 -Subject: [PATCH] lib: fix ax25.h include for musl - -ax25.h isn't guaranteed to be avilable in netax25/*; -it's dependent on our choice of libc (it's not available -on musl at least) [0]. - -Let's use the version from linux-headers. - -[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers -Bug: https://bugs.gentoo.org/831102 - -Signed-off-by: Sam James <sam@gentoo.org> -Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=8bced38a941a181f1468fa39541e872e51b6022f] ---- - lib/ax25_ntop.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c -index cfd0e04b..3a72a43e 100644 ---- a/lib/ax25_ntop.c -+++ b/lib/ax25_ntop.c -@@ -2,7 +2,7 @@ - - #include <errno.h> - #include <sys/socket.h> --#include <netax25/ax25.h> -+#include <linux/ax25.h> - - #include "utils.h" - --- -2.32.0 (Apple Git-132) diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb index 871f8d8fb7..becbaa9190 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb @@ -2,10 +2,9 @@ require iproute2.inc SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ - file://0001-lib-fix-ax25.h-include-for-musl.patch \ " -SRC_URI[sha256sum] = "c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f" +SRC_URI[sha256sum] = "6e384f1b42c75e1a9daac57866da37dcff909090ba86eb25a6e764da7893660e" # CFLAGS are computed in Makefile and reference CCOPTS # |