Skip to content

[docker-fpm-frr]: Fix build with frr used for routing stack#1728

Merged
lguohan merged 1 commit intosonic-net:masterfrom
OrdnanceNetworks:fix-build-with-fpm-frr
Jun 23, 2018
Merged

[docker-fpm-frr]: Fix build with frr used for routing stack#1728
lguohan merged 1 commit intosonic-net:masterfrom
OrdnanceNetworks:fix-build-with-fpm-frr

Conversation

@serhepopovych
Copy link
Copy Markdown
Contributor

@serhepopovych serhepopovych commented May 18, 2018

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

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>
@msftclas
Copy link
Copy Markdown

msftclas commented May 18, 2018

CLA assistant check
All CLA requirements met.

@jleveque jleveque requested a review from rodnymolina May 18, 2018 21:20
Copy link
Copy Markdown
Contributor

@jleveque jleveque left a 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.

Copy link
Copy Markdown
Contributor

@rodnymolina rodnymolina left a 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.

Copy link
Copy Markdown
Contributor

@rodnymolina rodnymolina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@lguohan lguohan merged commit bac5722 into sonic-net:master Jun 23, 2018
@sergeypopovich-ord sergeypopovich-ord deleted the fix-build-with-fpm-frr branch August 10, 2018 08:03
vdahiya12 added a commit to vdahiya12/sonic-buildimage that referenced this pull request Jul 29, 2021
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>
lguohan pushed a commit that referenced this pull request Jul 29, 2021
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>
lguohan pushed a commit that referenced this pull request Aug 25, 2021
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>
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants