diff mbox series

iproute2: upgrade 6.4.0 -> 6.5.0

Message ID 1694597512-21432-1-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series iproute2: upgrade 6.4.0 -> 6.5.0 | expand

Commit Message

Mingyu Wang (Fujitsu) Sept. 13, 2023, 9:31 a.m. UTC
From: Wang Mingyu <wangmy@fujitsu.com>

0001-bridge-mdb.c-include-limits.h.patch
removed since it's included in 6.5.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-bridge-mdb.c-include-limits.h.patch  | 41 -------------------
 .../{iproute2_6.4.0.bb => iproute2_6.5.0.bb}  |  3 +-
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-bridge-mdb.c-include-limits.h.patch
 rename meta/recipes-connectivity/iproute2/{iproute2_6.4.0.bb => iproute2_6.5.0.bb} (95%)

Comments

Richard Purdie Sept. 13, 2023, 5:51 p.m. UTC | #1
On Wed, 2023-09-13 at 17:31 +0800, wangmy wrote:
> From: Wang Mingyu <wangmy@fujitsu.com>
> 
> 0001-bridge-mdb.c-include-limits.h.patch
> removed since it's included in 6.5.0
> 
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  .../0001-bridge-mdb.c-include-limits.h.patch  | 41 -------------------
>  .../{iproute2_6.4.0.bb => iproute2_6.5.0.bb}  |  3 +-
>  2 files changed, 1 insertion(+), 43 deletions(-)
>  delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-bridge-mdb.c-include-limits.h.patch
>  rename meta/recipes-connectivity/iproute2/{iproute2_6.4.0.bb => iproute2_6.5.0.bb} (95%)
> 
> diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-bridge-mdb.c-include-limits.h.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-bridge-mdb.c-include-limits.h.patch
> deleted file mode 100644
> index f9a0e35d83..0000000000
> --- a/meta/recipes-connectivity/iproute2/iproute2/0001-bridge-mdb.c-include-limits.h.patch
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -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
> -
> diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.4.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.5.0.bb
> similarity index 95%
> rename from meta/recipes-connectivity/iproute2/iproute2_6.4.0.bb
> rename to meta/recipes-connectivity/iproute2/iproute2_6.5.0.bb
> index 32e2f8176b..db46c8317a 100644
> --- a/meta/recipes-connectivity/iproute2/iproute2_6.4.0.bb
> +++ b/meta/recipes-connectivity/iproute2/iproute2_6.5.0.bb
> @@ -13,10 +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-bridge-mdb.c-include-limits.h.patch \
>             "
>  
> -SRC_URI[sha256sum] = "4c51b8decbc7e4da159ffb066f590cfb93dbf9af7ff86b1647ce42b7c179a272"
> +SRC_URI[sha256sum] = "a70179085fa1b96d3c33b040c809b75e2b57563adc505a4ad05e2609df373463"
>  
>  inherit update-alternatives bash-completion pkgconfig

https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/7663/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/5055/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/7811/steps/17/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/7811/steps/23/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/7811/steps/26/logs/stdio

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-bridge-mdb.c-include-limits.h.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-bridge-mdb.c-include-limits.h.patch
deleted file mode 100644
index f9a0e35d83..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-bridge-mdb.c-include-limits.h.patch
+++ /dev/null
@@ -1,41 +0,0 @@ 
-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
-
diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.4.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.5.0.bb
similarity index 95%
rename from meta/recipes-connectivity/iproute2/iproute2_6.4.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_6.5.0.bb
index 32e2f8176b..db46c8317a 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_6.4.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_6.5.0.bb
@@ -13,10 +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-bridge-mdb.c-include-limits.h.patch \
            "
 
-SRC_URI[sha256sum] = "4c51b8decbc7e4da159ffb066f590cfb93dbf9af7ff86b1647ce42b7c179a272"
+SRC_URI[sha256sum] = "a70179085fa1b96d3c33b040c809b75e2b57563adc505a4ad05e2609df373463"
 
 inherit update-alternatives bash-completion pkgconfig