From 94462c3df9cb29fa51c6aea7821be084766d0f05 Mon Sep 17 00:00:00 2001
From: wangmy <wangmy@fujitsu.com>
Date: Mon, 28 Mar 2022 17:52:50 +0800
Subject: 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

(From OE-Core rev: 4b0b5fa9dd82fe9492e1eba440f3dcee40572fb6)

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>
---
 .../0001-lib-fix-ax25.h-include-for-musl.patch     | 37 ----------------------
 .../iproute2/iproute2_5.16.0.bb                    | 12 -------
 .../iproute2/iproute2_5.17.0.bb                    | 11 +++++++
 3 files changed, 11 insertions(+), 49 deletions(-)
 delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch
 delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb
 create mode 100644 meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb

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.16.0.bb
deleted file mode 100644
index 871f8d8fb7..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-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"
-
-# CFLAGS are computed in Makefile and reference CCOPTS
-#
-EXTRA_OEMAKE:append = " CCOPTS='${CFLAGS}'"
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb
new file mode 100644
index 0000000000..becbaa9190
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb
@@ -0,0 +1,11 @@
+require iproute2.inc
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
+           file://0001-libc-compat.h-add-musl-workaround.patch \
+           "
+
+SRC_URI[sha256sum] = "6e384f1b42c75e1a9daac57866da37dcff909090ba86eb25a6e764da7893660e"
+
+# CFLAGS are computed in Makefile and reference CCOPTS
+#
+EXTRA_OEMAKE:append = " CCOPTS='${CFLAGS}'"
-- 
cgit v1.2.3-54-g00ecf