Two patches are in upstream.
Signed-off-by: Changhyeok Bae <changhyeok....@gmail.com>
---
...-_GNU_SOURCE-when-checking-for-setns.patch | 28 -------------------
...-add-an-include-where-MIN-is-defined.patch | 25 -----------------
.../{iproute2_5.19.0.bb => iproute2_6.0.0.bb} | 4 +--
3 files changed, 1 insertion(+), 56 deletions(-)
delete mode 100644
meta/recipes-connectivity/iproute2/iproute2/0001-configure-Define-_GNU_SOURCE-when-checking-for-setns.patch
delete mode 100644
meta/recipes-connectivity/iproute2/iproute2/0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch
rename meta/recipes-connectivity/iproute2/{iproute2_5.19.0.bb =>
iproute2_6.0.0.bb} (92%)
diff --git
a/meta/recipes-connectivity/iproute2/iproute2/0001-configure-Define-_GNU_SOURCE-when-checking-for-setns.patch
b/meta/recipes-connectivity/iproute2/iproute2/0001-configure-Define-_GNU_SOURCE-when-checking-for-setns.patch
deleted file mode 100644
index 04d44ef444..0000000000
---
a/meta/recipes-connectivity/iproute2/iproute2/0001-configure-Define-_GNU_SOURCE-when-checking-for-setns.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From dc837a6b4c2cad7f31cddfe56cd652e26baadc02 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.k...@gmail.com>
-Date: Wed, 10 Aug 2022 22:31:03 -0700
-Subject: [PATCH] configure: Define _GNU_SOURCE when checking for setns
-
-glibc defines this function only as gnu extention
-
-Upstream-Status: Submitted
[https://lore.kernel.org/netdev/20220811053440.778649-1-raj.k...@gmail.com/T/#u]
-Signed-off-by: Khem Raj <raj.k...@gmail.com>
----
- configure | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure b/configure
-index 440facb..c02753b 100755
---- a/configure
-+++ b/configure
-@@ -191,6 +191,7 @@ check_ipt_lib_dir()
- check_setns()
- {
- cat >$TMPDIR/setnstest.c <<EOF
-+#define _GNU_SOURCE
- #include <sched.h>
- int main(int argc, char **argv)
- {
---
-2.37.1
-
diff --git
a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch
b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch
deleted file mode 100644
index edd73818ba..0000000000
---
a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c8a99f1035ec7b158a204f90e9a7ed3c0b1e3d52 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <a...@linutronix.de>
-Date: Fri, 5 Aug 2022 11:31:56 +0200
-Subject: [PATCH] ip/ipstats.c: add an include where MIN is defined
-
-Otherwise, non-glibc systems error out (e.g. on musl).
-
-Upstream-Status: Submitted [by email to
step...@networkplumber.org,net...@vger.kernel.org]
-Signed-off-by: Alexander Kanavin <a...@linutronix.de>
----
- ip/ipstats.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ip/ipstats.c b/ip/ipstats.c
-index 5cdd15a..1ac275b 100644
---- a/ip/ipstats.c
-+++ b/ip/ipstats.c
-@@ -1,6 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0+
- #include <assert.h>
- #include <errno.h>
-+#include <sys/param.h>
-
- #include "list.h"
- #include "utils.h"
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb
b/meta/recipes-connectivity/iproute2/iproute2_6.0.0.bb
similarity index 92%
rename from meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_6.0.0.bb
index 3cbf80a810..9373dba5f5 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_6.0.0.bb
@@ -13,11 +13,9 @@ DEPENDS = "flex-native bison-native iptables libcap"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
file://0001-libc-compat.h-add-musl-workaround.patch \
- file://0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch \
-
file://0001-configure-Define-_GNU_SOURCE-when-checking-for-setns.patch \
"
-SRC_URI[sha256sum] =
"26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791"
+SRC_URI[sha256sum] =
"523139e9e72aec996374fa2de74be4c53d2dd05589488934d21ff97bae19580a"
inherit update-alternatives bash-completion pkgconfig
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#172273):
https://lists.openembedded.org/g/openembedded-core/message/172273
Mute This Topic: https://lists.openembedded.org/mt/94635013/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
