mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 18:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

iproute2: upgrade 6.3.0 -> 6.4.0

Browse Source 
Changelog: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/

Added a patch for including limits.h with musl builds, or else
we get failures such as:

| mdb.c: In function 'mdb_parse_vni':
| mdb.c:666:47: error: 'ULONG_MAX' undeclared (first use in this function)
|   666 |         if ((endptr && *endptr) || vni_num == ULONG_MAX)
|       |                                               ^~~~~~~~~
| mdb.c:666:47: note: 'ULONG_MAX' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'?

(From OE-Core rev: ae2a9b8d3a8b119cc021b9c99cac72d18d5954ba)

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Trevor Gamblin
2023-07-21 08:48:09 -04:00
committed by Richard Purdie
parent be48b99874
commit aa4c640d85
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
meta/recipes-connectivity/iproute2/iproute2/0001-bridge-mdb.c-include-limits.h.patch Normal file
View File

@@ -0,0 +1,41 @@
From b13f04c0c685b6d2474aa7d97e191531f327bc45 Mon Sep 17 00:00:00 2001
From: Trevor Gamblin <tgamblin@baylibre.com>
Date: Thu, 20 Jul 2023 14:32:23 -0400
Subject: [PATCH] bridge/mdb.c: include limits.h
Upstream-Status: Submitted
(https://lore.kernel.org/netdev/20230720203726.2316251-1-tgamblin@baylibre.com/)
While building iproute2 6.4.0 with musl using Yocto Project, errors such
as the following were encountered:
| mdb.c: In function 'mdb_parse_vni':
| mdb.c:666:47: error: 'ULONG_MAX' undeclared (first use in this function)
| 666 | if ((endptr && *endptr) || vni_num == ULONG_MAX)
| | ^~~~~~~~~
| mdb.c:666:47: note: 'ULONG_MAX' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'?
Include limits.h in bridge/mdb.c to fix this issue. This change is based
on one in Alpine Linux, but the author there had no plans to submit:
https://git.alpinelinux.org/aports/commit/main/iproute2/include.patch?id=bd46efb8a8da54948639cebcfa5b37bd608f1069
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
bridge/mdb.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/bridge/mdb.c b/bridge/mdb.c
index fbb4f704..18793458 100644
--- a/bridge/mdb.c
+++ b/bridge/mdb.c
@@ -15,6 +15,7 @@
#include <string.h>
#include <arpa/inet.h>
#include <netdb.h>
+#include <limits.h>
#include "libnetlink.h"
#include "utils.h"
--
2.41.0

3
meta/recipes-connectivity/iproute2/iproute2_6.3.0.bb → meta/recipes-connectivity/iproute2/iproute2_6.4.0.bb
View File

@@ -13,9 +13,10 @@ 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-bridge-mdb.c-include-limits.h.patch \
"
SRC_URI[sha256sum] = "dfb2a98db96e7a653cffc6693335a1a466e29a34b6ac528be48f35e1d2766732"
SRC_URI[sha256sum] = "4c51b8decbc7e4da159ffb066f590cfb93dbf9af7ff86b1647ce42b7c179a272"
inherit update-alternatives bash-completion pkgconfig