From 3dfd3178d8c14e0e015720a6cbfe4ce50167edce Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Fri, 10 Jul 2026 22:37:04 +0200 Subject: [PATCH 1/3] frr: bump 10.5 to 10.5.4 Update the FRR 10.5 wrap file to the latest bugfix release. Signed-off-by: Robin Jarry Reviewed-by: Maxime Leroy --- subprojects/frr-10.5.wrap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/subprojects/frr-10.5.wrap b/subprojects/frr-10.5.wrap index 9a3467dd2..cf1bc646a 100644 --- a/subprojects/frr-10.5.wrap +++ b/subprojects/frr-10.5.wrap @@ -1,8 +1,8 @@ [wrap-file] -source_url = https://github.com/FRRouting/frr/archive/refs/tags/frr-10.5.3.tar.gz -source_filename = frr-10.5.3.tar.gz -source_hash = ecc95009b88e66df2c91be02fbf0a3eb8e1de434fd652e0cbf46f19126f708ec -directory = frr-frr-10.5.3 +source_url = https://github.com/FRRouting/frr/archive/refs/tags/frr-10.5.4.tar.gz +source_filename = frr-10.5.4.tar.gz +source_hash = 1e8401e1bfcbb9b0dfefc9b335013733a3c77cdf85c79ff66d9e65167d9cfb1e +directory = frr-frr-10.5.4 patch_directory = frr [provide] From a2b030576a11bfec36e394170159ed34331d7356 Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Fri, 10 Jul 2026 22:37:48 +0200 Subject: [PATCH 2/3] frr: add 10.7 support Add a wrap file for FRR 10.7.0 and add it to the meson build options and CI test matrix. Signed-off-by: Robin Jarry Reviewed-by: Maxime Leroy --- .github/workflows/check.yml | 3 +++ meson_options.txt | 2 +- subprojects/frr-10.7.wrap | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 subprojects/frr-10.7.wrap diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 64525d7bd..008064605 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -41,6 +41,9 @@ jobs: - compiler: gcc-14 dpdk: '25.11' frr: '10.6' + - compiler: gcc-14 + dpdk: '25.11' + frr: '10.7' - compiler: gcc-14 dpdk: '25.11-head' frr: '10.5' diff --git a/meson_options.txt b/meson_options.txt index 7593c1126..21d781bb0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -17,7 +17,7 @@ option( ) option( - 'frr_version', type: 'combo', choices: ['10.5', '10.6', 'master'], value: '10.5', + 'frr_version', type: 'combo', choices: ['10.5', '10.6', '10.7', 'master'], value: '10.5', description: 'FRR version, defaults to 10.5.', ) diff --git a/subprojects/frr-10.7.wrap b/subprojects/frr-10.7.wrap new file mode 100644 index 000000000..3fe239d06 --- /dev/null +++ b/subprojects/frr-10.7.wrap @@ -0,0 +1,9 @@ +[wrap-file] +source_url = https://github.com/FRRouting/frr/archive/refs/tags/frr-10.7.0.tar.gz +source_filename = frr-10.7.0.tar.gz +source_hash = 5c56b27756854b8d0a62b3e152d3f9ea08091851b2d686e140fdfb95cd88f612 +directory = frr-frr-10.7.0 +patch_directory = frr + +[provide] +dependency_names = frr-10.7 From 1417e5c0a70c10cb885ea644ccfcaa9ca513d1f5 Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Fri, 10 Jul 2026 22:37:59 +0200 Subject: [PATCH 3/3] frr: change default version to 10.6 FRR 10.6 has been stable for a few months now. Make it the default build target instead of 10.5. Signed-off-by: Robin Jarry Reviewed-by: Maxime Leroy --- meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index 21d781bb0..4c28d9862 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -17,7 +17,7 @@ option( ) option( - 'frr_version', type: 'combo', choices: ['10.5', '10.6', '10.7', 'master'], value: '10.5', + 'frr_version', type: 'combo', choices: ['10.5', '10.6', '10.7', 'master'], value: '10.6', description: 'FRR version, defaults to 10.5.', )