Skip to content

Commit d937c13

Browse files
committed
Changes:
- FRR 8.2.2 upgrade - Build libyang2
1 parent 1e38ffe commit d937c13

11 files changed

+56
-24
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
[submodule "src/sonic-frr/frr"]
4747
path = src/sonic-frr/frr
4848
url = https://github.com/Azure/sonic-frr.git
49-
branch = frr/7.5
49+
branch = frr/8.2
5050
[submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
5151
path = platform/p4/p4-hlir/p4-hlir-v1.1
5252
url = https://github.com/p4lang/p4-hlir.git

src/sonic-frr/patch/0001-Add-support-of-bgp-tcp-DSCP-value.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 4ab192df23362e64d1a11441fae82329388f103e Mon Sep 17 00:00:00 2001
2-
From: Syed Hasan Raza Naqvi <syed.naqvi@broadcom.com>
3-
Date: Thu, 21 Apr 2022 17:01:32 -0700
4-
Subject: [PATCH] [PATCH 1/8] Add support of bgp tcp DSCP value
2+
From: Pavel Shirshov <pavelsh@microsoft.com>
3+
Date: Mon, 16 Nov 2020 18:00:12 -0800
4+
Subject: [PATCH 1/8] Add support of bgp tcp DSCP value
55

66
---
77
bgpd/bgp_network.c | 11 ++++-------

src/sonic-frr/patch/0002-Reduce-severity-of-Vty-connected-from-message.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 15274a197e4d3b7ac0f11ca63a5274f1168739f5 Mon Sep 17 00:00:00 2001
2-
From: Syed Hasan Raza Naqvi <syed.naqvi@broadcom.com>
3-
Date: Thu, 21 Apr 2022 17:12:51 -0700
4-
Subject: [PATCH] [PATCH 2/8] Reduce severity of 'Vty connected from' message
2+
From: Pavel Shirshov <pavelsh@microsoft.com>
3+
Date: Mon, 16 Nov 2020 18:11:47 -0800
4+
Subject: [PATCH 2/8] Reduce severity of 'Vty connected from' message
55

66
---
77
lib/vty.c | 2 +-

src/sonic-frr/patch/0003-Use-vrf_id-for-vrf-not-tabled_id.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 39bb40dc4bad4462e4ae9c98580d75fa2c92e032 Mon Sep 17 00:00:00 2001
2-
From: Syed Hasan Raza Naqvi <syed.naqvi@broadcom.com>
3-
Date: Thu, 21 Apr 2022 17:17:51 -0700
4-
Subject: [PATCH] [PATCH 3/8] Use vrf_id for vrf, not tabled_id
2+
From: Pavel Shirshov <pavelsh@microsoft.com>
3+
Date: Mon, 16 Nov 2020 18:29:46 -0800
4+
Subject: [PATCH 3/8] Use vrf_id for vrf, not tabled_id
55

66
---
77
zebra/zebra_fpm_netlink.c | 2 +-

src/sonic-frr/patch/0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From afff474c79e0c177e090d1b45d68c9f816a52e3e Mon Sep 17 00:00:00 2001
2-
From: Syed Hasan Raza Naqvi <syed.naqvi@broadcom.com>
3-
Date: Thu, 21 Apr 2022 17:20:07 -0700
4-
Subject: [PATCH] [PATCH 4/8] Allow BGP attr NEXT_HOP to be 0.0.0.0 due to
2+
From: Pavel Shirshov <pavelsh@microsoft.com>
3+
Date: Mon, 16 Nov 2020 18:33:46 -0800
4+
Subject: [PATCH 4/8] Allow BGP attr NEXT_HOP to be 0.0.0.0 due to
55
alleviate
66

77
---

src/sonic-frr/patch/0005-nexthops-compare-vrf-only-if-ip-type.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 786087468520db44c55e3566f77438b41f52763f Mon Sep 17 00:00:00 2001
2-
From: Syed Hasan Raza Naqvi <syed.naqvi@broadcom.com>
3-
Date: Thu, 21 Apr 2022 17:23:22 -0700
4-
Subject: [PATCH] [PATCH 5/8] nexthops compare vrf only if ip type
2+
From: Pavel Shirshov <pavelsh@microsoft.com>
3+
Date: Mon, 16 Nov 2020 18:35:01 -0800
4+
Subject: [PATCH 5/8] nexthops compare vrf only if ip type
55

66
---
77
lib/nexthop.c | 12 ++++++------

src/sonic-frr/patch/0006-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
From 0417036a3aece862c95111d4646ca7508a028165 Mon Sep 17 00:00:00 2001
2-
From: Syed Hasan Raza Naqvi <syed.naqvi@broadcom.com>
3-
Date: Thu, 21 Apr 2022 17:25:02 -0700
2+
From: Ying Xie <ying.xie@microsoft.com>
3+
Date: Wed, 25 Nov 2020 22:28:43 +0000
44
Subject: [PATCH] [PATCH 6/8] [frr] remove frr log outchannel to /var/log/frr.log
5+
SONiC runs frr inside a docker and the logs are sent to base image
6+
via rsyslog and recorded already. There is no need to keep the
7+
frr.log inside the docker. It will grow and take all harddrive
8+
space eventually.
59

610
---
711
tools/etc/rsyslog.d/45-frr.conf | 19 -------------------

src/sonic-frr/patch/0007-Add-support-of-bgp-l3vni-evpn.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 74ee34e4990dbd168b7b8072894eb0cf8927f9d1 Mon Sep 17 00:00:00 2001
2-
From: Syed Hasan Raza Naqvi <syed.naqvi@broadcom.com>
3-
Date: Thu, 21 Apr 2022 17:39:24 -0700
4-
Subject: [PATCH] [PATCH 7/8] This is temp patch till Prefix to ARP indirection is
2+
From: Kishore Kunal <kishore.kunal@broadcom.com>
3+
Date: Fri, 15 Jan 2021 15:52:13 -0800
4+
Subject: [PATCH 7/8] This is temp patch till Prefix to ARP indirection is
55
add in neighorch
66

77
---

src/sonic-frr/patch/0008-Link-local-scope-was-not-set-while-binding-socket-for-bgp-ipv6-link-local-neighbors.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 92ab2d74fca06f86c00d886ac249f7f2d89e93fe Mon Sep 17 00:00:00 2001
2-
From: Syed Hasan Raza Naqvi <syed.naqvi@broadcom.com>
3-
Date: Fri, 22 Apr 2022 12:54:28 -0700
4-
Subject: [PATCH] [PATCH 8/8] Link local scope was not set while binding socket
2+
From: Akhilesh Samineni <akhilesh.samineni@broadcom.com>
3+
Date: Mon, 5 Apr 2021 13:21:40 -0700
4+
Subject: [PATCH 8/8] Link local scope was not set while binding socket
55
with local address causing socket errors for bgp ipv6 link local neighbors.
66

77
---
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From dfe0158344ea581370dd2dba8e4db189cf369147 Mon Sep 17 00:00:00 2001
2+
From: Syed Hasan Raza Naqvi <[email protected]>
3+
Date: Wed, 4 May 2022 05:11:01 +0000
4+
Subject: [PATCH] Disable ipv6 src address test in pcep. Docker lo interface
5+
doesn't have ipv6 enabled. Socket bind returns cannot assign requested
6+
address.
7+
8+
---
9+
pceplib/test/pcep_socket_comm_test.c | 2 +-
10+
1 file changed, 1 insertion(+), 1 deletion(-)
11+
12+
diff --git a/pceplib/test/pcep_socket_comm_test.c b/pceplib/test/pcep_socket_comm_test.c
13+
index 116531f12..8b71a5090 100644
14+
--- a/pceplib/test/pcep_socket_comm_test.c
15+
+++ b/pceplib/test/pcep_socket_comm_test.c
16+
@@ -92,7 +92,7 @@ void pcep_socket_comm_test_setup()
17+
inet_pton(AF_INET, "127.0.0.1", &(test_host_ip));
18+
inet_pton(AF_INET, "127.0.0.1", &(test_src_ip));
19+
inet_pton(AF_INET6, "::1", &(test_host_ipv6));
20+
- inet_pton(AF_INET6, "::1", &(test_src_ipv6));
21+
+ inet_pton(AF_INET6, "::", &(test_src_ipv6));
22+
}
23+
24+
void pcep_socket_comm_test_teardown()
25+
--
26+
2.20.1
27+

src/sonic-frr/patch/series

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
0006-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch
77
0007-Add-support-of-bgp-l3vni-evpn.patch
88
0008-Link-local-scope-was-not-set-while-binding-socket-for-bgp-ipv6-link-local-neighbors.patch
9+
Disable-ipv6-src-address-test-in-pceplib.patch

0 commit comments

Comments
 (0)