summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2022-10-28 19:56:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-10-29 16:28:36 +0100
commiteff3042f0eb0b66d57199fdc920f7fe7ed1c02d6 (patch)
tree8c3abf4d4eb86f1eedcb7ef16f5387f6ddd7b9c9 /meta/recipes-connectivity
parent756e940f15a6a02878b9c694d6eeafb4bba81960 (diff)
downloadpoky-eff3042f0eb0b66d57199fdc920f7fe7ed1c02d6.tar.gz
iproute2: upgrade 5.19.0 -> 6.0.0
Two patches are in upstream. (From OE-Core rev: 9acd3f210f63156d5fd9acbf4477aef2bb4c9de8) Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.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')
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-configure-Define-_GNU_SOURCE-when-checking-for-setns.patch28
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch25
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_6.0.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb)4
3 files changed, 1 insertions, 56 deletions
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 @@
1From dc837a6b4c2cad7f31cddfe56cd652e26baadc02 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 10 Aug 2022 22:31:03 -0700
4Subject: [PATCH] configure: Define _GNU_SOURCE when checking for setns
5
6glibc defines this function only as gnu extention
7
8Upstream-Status: Submitted [https://lore.kernel.org/netdev/20220811053440.778649-1-raj.khem@gmail.com/T/#u]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 configure | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/configure b/configure
15index 440facb..c02753b 100755
16--- a/configure
17+++ b/configure
18@@ -191,6 +191,7 @@ check_ipt_lib_dir()
19 check_setns()
20 {
21 cat >$TMPDIR/setnstest.c <<EOF
22+#define _GNU_SOURCE
23 #include <sched.h>
24 int main(int argc, char **argv)
25 {
26--
272.37.1
28
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 @@
1From c8a99f1035ec7b158a204f90e9a7ed3c0b1e3d52 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Fri, 5 Aug 2022 11:31:56 +0200
4Subject: [PATCH] ip/ipstats.c: add an include where MIN is defined
5
6Otherwise, non-glibc systems error out (e.g. on musl).
7
8Upstream-Status: Submitted [by email to stephen@networkplumber.org,netdev@vger.kernel.org]
9Signed-off-by: Alexander Kanavin <alex@linutronix.de>
10---
11 ip/ipstats.c | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/ip/ipstats.c b/ip/ipstats.c
15index 5cdd15a..1ac275b 100644
16--- a/ip/ipstats.c
17+++ b/ip/ipstats.c
18@@ -1,6 +1,7 @@
19 // SPDX-License-Identifier: GPL-2.0+
20 #include <assert.h>
21 #include <errno.h>
22+#include <sys/param.h>
23
24 #include "list.h"
25 #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
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"
13 13
14SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ 14SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
15 file://0001-libc-compat.h-add-musl-workaround.patch \ 15 file://0001-libc-compat.h-add-musl-workaround.patch \
16 file://0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch \
17 file://0001-configure-Define-_GNU_SOURCE-when-checking-for-setns.patch \
18 " 16 "
19 17
20SRC_URI[sha256sum] = "26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791" 18SRC_URI[sha256sum] = "523139e9e72aec996374fa2de74be4c53d2dd05589488934d21ff97bae19580a"
21 19
22inherit update-alternatives bash-completion pkgconfig 20inherit update-alternatives bash-completion pkgconfig
23 21