Skip to content

Commit

Permalink
Changes:
Browse files Browse the repository at this point in the history
- FRR 8.2.2 upgrade
- Build libyang2
  • Loading branch information
hasan-brcm committed May 11, 2022
1 parent 1e38ffe commit d937c13
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
[submodule "src/sonic-frr/frr"]
path = src/sonic-frr/frr
url = https://github.com/Azure/sonic-frr.git
branch = frr/7.5
branch = frr/8.2
[submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
path = platform/p4/p4-hlir/p4-hlir-v1.1
url = https://github.com/p4lang/p4-hlir.git
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 4ab192df23362e64d1a11441fae82329388f103e Mon Sep 17 00:00:00 2001
From: Syed Hasan Raza Naqvi <syed.naqvi@broadcom.com>
Date: Thu, 21 Apr 2022 17:01:32 -0700
Subject: [PATCH] [PATCH 1/8] Add support of bgp tcp DSCP value
From: Pavel Shirshov <pavelsh@microsoft.com>
Date: Mon, 16 Nov 2020 18:00:12 -0800
Subject: [PATCH 1/8] Add support of bgp tcp DSCP value

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

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

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

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

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

---
tools/etc/rsyslog.d/45-frr.conf | 19 -------------------
Expand Down
6 changes: 3 additions & 3 deletions src/sonic-frr/patch/0007-Add-support-of-bgp-l3vni-evpn.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 74ee34e4990dbd168b7b8072894eb0cf8927f9d1 Mon Sep 17 00:00:00 2001
From: Syed Hasan Raza Naqvi <syed.naqvi@broadcom.com>
Date: Thu, 21 Apr 2022 17:39:24 -0700
Subject: [PATCH] [PATCH 7/8] This is temp patch till Prefix to ARP indirection is
From: Kishore Kunal <kishore.kunal@broadcom.com>
Date: Fri, 15 Jan 2021 15:52:13 -0800
Subject: [PATCH 7/8] This is temp patch till Prefix to ARP indirection is
add in neighorch

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

---
Expand Down
27 changes: 27 additions & 0 deletions src/sonic-frr/patch/Disable-ipv6-src-address-test-in-pceplib.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From dfe0158344ea581370dd2dba8e4db189cf369147 Mon Sep 17 00:00:00 2001
From: Syed Hasan Raza Naqvi <syed.naqvi@broadcom.com>
Date: Wed, 4 May 2022 05:11:01 +0000
Subject: [PATCH] Disable ipv6 src address test in pcep. Docker lo interface
doesn't have ipv6 enabled. Socket bind returns cannot assign requested
address.

---
pceplib/test/pcep_socket_comm_test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pceplib/test/pcep_socket_comm_test.c b/pceplib/test/pcep_socket_comm_test.c
index 116531f12..8b71a5090 100644
--- a/pceplib/test/pcep_socket_comm_test.c
+++ b/pceplib/test/pcep_socket_comm_test.c
@@ -92,7 +92,7 @@ void pcep_socket_comm_test_setup()
inet_pton(AF_INET, "127.0.0.1", &(test_host_ip));
inet_pton(AF_INET, "127.0.0.1", &(test_src_ip));
inet_pton(AF_INET6, "::1", &(test_host_ipv6));
- inet_pton(AF_INET6, "::1", &(test_src_ipv6));
+ inet_pton(AF_INET6, "::", &(test_src_ipv6));
}

void pcep_socket_comm_test_teardown()
--
2.20.1

1 change: 1 addition & 0 deletions src/sonic-frr/patch/series
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
0006-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch
0007-Add-support-of-bgp-l3vni-evpn.patch
0008-Link-local-scope-was-not-set-while-binding-socket-for-bgp-ipv6-link-local-neighbors.patch
Disable-ipv6-src-address-test-in-pceplib.patch

0 comments on commit d937c13

Please sign in to comment.