From e0696c453a014dd7a3a79a462271b779d1d09658 Mon Sep 17 00:00:00 2001 From: Ahmed Karic Date: Fri, 23 May 2025 11:24:35 +0200 Subject: [PATCH] Upgrade Buildroot to 2025.02.3 (LTS) --- buildroot | 2 +- doc/ChangeLog.md | 1 + ...bridge-add-mcast_flood_always-bridge-option.patch | 12 ++++++------ ...address-accept-symbolic-names-also-for-show.patch | 0 4 files changed, 8 insertions(+), 7 deletions(-) rename patches/iproute2/{6.13.0 => 6.14.0}/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch (93%) rename patches/iproute2/{6.13.0 => 6.14.0}/0002-ipaddress-accept-symbolic-names-also-for-show.patch (100%) diff --git a/buildroot b/buildroot index 33d2ca71..c4dc8ba6 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 33d2ca716fa9fdc4d4b1a187d68190f1d36ab60d +Subproject commit c4dc8ba6c81fbf84a93acde08895dbcd47b86d2a diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md index d4865ef3..fd2cb22f 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -6,6 +6,7 @@ All notable changes to the project are documented in this file. [v25.05.0][UNRELEASED] ------------------------- ### Changes +- Upgrade Buildroot to 2025.02.3 (LTS) - Upgrade Linux kernel to 6.12.30 (LTS) - Upgrade libyang to 3.12.2 - Upgrade sysrepo to 3.6.11 diff --git a/patches/iproute2/6.13.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch b/patches/iproute2/6.14.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch similarity index 93% rename from patches/iproute2/6.13.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch rename to patches/iproute2/6.14.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch index f9a98062..19129f40 100644 --- a/patches/iproute2/6.13.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch +++ b/patches/iproute2/6.14.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch @@ -1,4 +1,4 @@ -From dfd52e38ab402822aa4011039efa00e9d183d6a6 Mon Sep 17 00:00:00 2001 +From 392735fcb41b303b6dbe3517fab9ba734ff2e288 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 5 Mar 2024 09:41:46 +0100 Subject: [PATCH 1/2] iplink_bridge: add mcast_flood_always bridge option @@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz 3 files changed, 32 insertions(+) diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h -index c206cf6d..84ef4233 100644 +index c206cf6..84ef423 100644 --- a/include/uapi/linux/if_bridge.h +++ b/include/uapi/linux/if_bridge.h @@ -830,6 +830,7 @@ enum br_boolopt_id { @@ -29,7 +29,7 @@ index c206cf6d..84ef4233 100644 }; diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c -index f01ffe15..2a489b7b 100644 +index 1fe8955..d4f2c80 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -41,6 +41,7 @@ static void print_explain(FILE *f) @@ -80,10 +80,10 @@ index f01ffe15..2a489b7b 100644 if (tb[IFLA_BR_MCAST_ROUTER]) diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in -index eabca490..ba0a5304 100644 +index efb6248..2308835 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in -@@ -1703,6 +1703,8 @@ the following additional arguments are supported: +@@ -1712,6 +1712,8 @@ the following additional arguments are supported: ] [ .BI vlan_stats_per_port " VLAN_STATS_PER_PORT " ] [ @@ -92,7 +92,7 @@ index eabca490..ba0a5304 100644 .BI mcast_snooping " MULTICAST_SNOOPING " ] [ .BI mcast_vlan_snooping " MULTICAST_VLAN_SNOOPING " -@@ -1851,6 +1853,16 @@ or disable +@@ -1860,6 +1862,16 @@ or disable .RI ( VLAN_STATS_PER_PORT " == 0) " per-VLAN per-port stats accounting. Can be changed only when there are no port VLANs configured. diff --git a/patches/iproute2/6.13.0/0002-ipaddress-accept-symbolic-names-also-for-show.patch b/patches/iproute2/6.14.0/0002-ipaddress-accept-symbolic-names-also-for-show.patch similarity index 100% rename from patches/iproute2/6.13.0/0002-ipaddress-accept-symbolic-names-also-for-show.patch rename to patches/iproute2/6.14.0/0002-ipaddress-accept-symbolic-names-also-for-show.patch