diff mbox series

[v2,11/44] iproute2: upgrade 5.18.0 -> 5.19.0

Message ID 20220808064237.3975347-11-alex@linutronix.de
State Accepted, archived
Commit 00c40d1343dd34a416657b79745f102a17332ddb
Headers show
Series [v2,01/44] rpm: update 4.17.0 -> 4.17.1 | expand

Commit Message

Alexander Kanavin Aug. 8, 2022, 6:42 a.m. UTC 
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-add-an-include-where-MIN-is-defined.patch | 25 +++++++++++++++++++
 ...{iproute2_5.18.0.bb => iproute2_5.19.0.bb} |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create 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.18.0.bb => iproute2_5.19.0.bb} (61%)
diff mbox series

Patch

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 @@ 
+From c8a99f1035ec7b158a204f90e9a7ed3c0b1e3d52 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@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 stephen@networkplumber.org,netdev@vger.kernel.org]
+Signed-off-by: Alexander Kanavin <alex@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.18.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb
similarity index 61%
rename from meta/recipes-connectivity/iproute2/iproute2_5.18.0.bb
rename to 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
 
 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 \
            "
 
-SRC_URI[sha256sum] = "5ba3d464d51c8c283550d507ffac3d10f7aec587b7c66b0ccb6950643646389e"
+SRC_URI[sha256sum] = "26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791"
 
 # CFLAGS are computed in Makefile and reference CCOPTS
 #