diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-08-08 08:42:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-10 08:25:28 +0100 |
commit | 4feac920c221777ea4fb7a81821a35ea77c4b7c5 (patch) | |
tree | 586e2371031361add3ee06c40139ee68fbae5d32 | |
parent | 461f6575fa8e7dfcdefee7364c630318755988f6 (diff) | |
download | poky-4feac920c221777ea4fb7a81821a35ea77c4b7c5.tar.gz |
iproute2: upgrade 5.18.0 -> 5.19.0
(From OE-Core rev: 00c40d1343dd34a416657b79745f102a17332ddb)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch | 25 | ||||
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_5.18.0.bb) | 3 |
2 files changed, 27 insertions, 1 deletions
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 new file mode 100644 index 0000000000..edd73818ba --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From c8a99f1035ec7b158a204f90e9a7ed3c0b1e3d52 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Fri, 5 Aug 2022 11:31:56 +0200 | ||
4 | Subject: [PATCH] ip/ipstats.c: add an include where MIN is defined | ||
5 | |||
6 | Otherwise, non-glibc systems error out (e.g. on musl). | ||
7 | |||
8 | Upstream-Status: Submitted [by email to stephen@networkplumber.org,netdev@vger.kernel.org] | ||
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
10 | --- | ||
11 | ip/ipstats.c | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/ip/ipstats.c b/ip/ipstats.c | ||
15 | index 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.18.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb index 3e01c70801..c45920b015 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.18.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb | |||
@@ -2,9 +2,10 @@ require iproute2.inc | |||
2 | 2 | ||
3 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ | 3 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ |
4 | file://0001-libc-compat.h-add-musl-workaround.patch \ | 4 | file://0001-libc-compat.h-add-musl-workaround.patch \ |
5 | file://0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch \ | ||
5 | " | 6 | " |
6 | 7 | ||
7 | SRC_URI[sha256sum] = "5ba3d464d51c8c283550d507ffac3d10f7aec587b7c66b0ccb6950643646389e" | 8 | SRC_URI[sha256sum] = "26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791" |
8 | 9 | ||
9 | # CFLAGS are computed in Makefile and reference CCOPTS | 10 | # CFLAGS are computed in Makefile and reference CCOPTS |
10 | # | 11 | # |