-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[docker-fpm-frr]: Fix build with frr used for routing stack #1728
[docker-fpm-frr]: Fix build with frr used for routing stack #1728
Conversation
After commit 832be7b ("[dockers] Prevent apt-get from installing suggested and recommended packages by default (sonic-net#1666)") SONiC fails to build when FRR is used for routing stack (e.g. SONIC_ROUTING_STACK is set to frr in rules/config). To fix issue just replicate changes from docker-fpm-quagga to docker-fpm-frr to make dependencies installed correctly after above change to package installing behaviour. Signed-off-by: Sergey Popovich <sergey.popovich@ordnance.co>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. @rodnymolina: please review and test.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes look good to me. I'll build an image to triple-check. Will approve tomorrow.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
This PR updates the following commits a9606fb [show] fix show muxcable metrics <port> for sorted output (sonic-net#1731) 7355016 [minigraph][port_config] Use imported config.main and add conditional patch (sonic-net#1728) cc1d6e4 [configlet] Python3 compatible syntax for extracting a key from the dict (sonic-net#1721) Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
This PR updates the following commits a9606fb [show] fix show muxcable metrics <port> for sorted output (#1731) 7355016 [minigraph][port_config] Use imported config.main and add conditional patch (#1728) cc1d6e4 [configlet] Python3 compatible syntax for extracting a key from the dict (#1721) Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
d29a49a [ACL] Match TCP protocol while matching TCP_FLAG (#1854) 2569ad9 Fix sFlow sampling-rate and admin-state (#1728) 8908a8f Change rif_rates.lua and port_rates.lua scripts to calculate rates correct (#1848) b42c2fb [VS Test] Skip flaky tests (#1875) Signed-off-by: bingwang <bingwang@microsoft.com>
* Fixed incorrect interface admin-status when 'all' interface is disabled but there are local sampling-rate configurations. Signed-off-by: Venkatesan Mahalingam <venkatesan_mahalinga@dell.com>
After commit 832be7b ("[dockers] Prevent apt-get from installing
suggested and recommended packages by default (#1666)") SONiC fails
to build when FRR is used for routing stack (e.g. SONIC_ROUTING_STACK
is set to frr in rules/config).
To fix issue just replicate changes from docker-fpm-quagga to
docker-fpm-frr to make dependencies installed correctly after above
change to package installing behaviour.
Signed-off-by: Sergey Popovich sergey.popovich@ordnance.co