Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix tcpdmatch dependency #1594

Merged
merged 2 commits into from
Apr 14, 2018
Merged

Fix tcpdmatch dependency #1594

merged 2 commits into from
Apr 14, 2018

Conversation

yurypm
Copy link
Contributor

@yurypm yurypm commented Apr 12, 2018

- What I did
Fixes #1574

- How I did it
added tcpd.deb to build results and extract required files from build results

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@yurypm
Fix tcpdmatch dependency
be54510 
Issue: sonic_debian_extension.j2 uses tcpdmatch from src folder
       which is result of libwrap build
Fix: added tcpd.deb to build results and extract required files
     from build results
lguohan
lguohan reviewed Apr 13, 2018
View reviewed changes
files/build_templates/sonic_debian_extension.j2 Outdated
@@ -246,7 +246,8 @@ sudo cp $IMAGE_CONFIGS/ssh/sshd-config-updater $FILESYSTEM_ROOT/usr/bin/
sudo chmod +x $FILESYSTEM_ROOT/usr/bin/sshd-config-updater
sudo cp $IMAGE_CONFIGS/ssh/sshd-clear-denied-sessions $FILESYSTEM_ROOT/usr/bin
sudo chmod +x $FILESYSTEM_ROOT/usr/bin/sshd-clear-denied-sessions
sudo cp src/libwrap/tcp-wrappers-7.6.q/tcpdmatch $FILESYSTEM_ROOT/usr/bin
dpkg --fsys-tarfile `ls target/debs/tcpd_*_amd64.deb | head -n 1` | \
tar -xOf - ./usr/sbin/tcpdmatch | sudo dd of=$FILESYSTEM_ROOT/usr/bin/tcpdmatch
Copy link
Collaborator

Choose a reason for hiding this comment

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

why not install the deb packages?

Copy link
Contributor Author

@yurypm yurypm Apr 13, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I do not know if we need other files from this deb. I just fixed particular issue and installed require file to $FILESYSTEM_ROOT/usr/bin.
added this commit d077ae0
but not sure that we should do it

@lguohan
Copy link
Collaborator

lguohan commented Apr 13, 2018

retest this please

1 similar comment
@lguohan
Copy link
Collaborator

lguohan commented Apr 13, 2018

retest this please

@lguohan lguohan merged commit 2b9f877 into sonic-net:master Apr 14, 2018
@madhanmellanox madhanmellanox mentioned this pull request Jan 17, 2021
Closed
4 tasks
lguohan added a commit to qiluo-msft/sonic-buildimage that referenced this pull request Jan 20, 2021
@lguohan
further update
faa4673 
* 36f7332 2021-01-14 | modified ERR log to NOTICE log for FDB notification failure after VLAN delete (sonic-net#1595) [madhanmellanox]
* c21c883 2021-01-12 | [ci]: download artifacts from master branch build (sonic-net#1597) [lguohan]
* a1d03a4 2021-01-12 | [fgnhgorch] Match mode changes for Fine Grained ECMP (sonic-net#1565) [anish-n]
* 1b65f3d 2021-01-12 | [ci]: use sonicbld pool (sonic-net#1594) [lguohan]
* 48ae866 2021-01-12 | [pfcwd] Update PFC storm detection logic for Mellanox platforms (sonic-net#1586) [Volodymyr Samotiy]
* 850001f 2021-01-12 | [FPMSYNCD] Evpn/Vxlan related changes to support FRR7.5(sonic-net#1585) [KISHORE KUNAL]
* 64ca9bb 2021-01-12 | [ci]: only copy artifacts when build is successful (sonic-net#1590) [lguohan]
* 17d0dae 2021-01-11 | [Fdborch] Fix for arm compilation (sonic-net#1592) [Prince Sunny]

Signed-off-by: Guohan Lu <[email protected]>
lguohan pushed a commit that referenced this pull request Jan 21, 2021
@qiluo-msft
[sonic-swss] Update submodule (#6336)
21c3573 
Including below commits:

36f7332 2021-01-14 | modified ERR log to NOTICE log for FDB notification failure after VLAN delete (#1595) [madhanmellanox]
c21c883 2021-01-12 | [ci]: download artifacts from master branch build (#1597) [lguohan]
a1d03a4 2021-01-12 | [fgnhgorch] Match mode changes for Fine Grained ECMP (#1565) [anish-n]
1b65f3d 2021-01-12 | [ci]: use sonicbld pool (#1594) [lguohan]
48ae866 2021-01-12 | [pfcwd] Update PFC storm detection logic for Mellanox platforms (#1586) [Volodymyr Samotiy]
850001f 2021-01-12 | [FPMSYNCD] Evpn/Vxlan related changes to support FRR7.5(#1585) [KISHORE KUNAL]
64ca9bb 2021-01-12 | [ci]: only copy artifacts when build is successful (#1590) [lguohan]
17d0dae 2021-01-11 | [Fdborch] Fix for arm compilation (#1592) [Prince Sunny]
693a02c 2021-01-08 | [gearbox] Add support for "hwinfo" field (#1547) [Baptiste Covolato]
7e3b2c6 2021-01-09 | [Evpn Warmreboot] Added Dependancy check logic in VrfMgr (#1466) [nkelapur]
a960e2e 2021-01-09 | [Orchagent]: FdbOrch changes for EVPN VXLAN (#1275) [Pankaj Jain]
097cfda 2021-01-08 | [swss test] update setup guide for swss tests (#1582) [Ying Xie]
b42253a 2021-01-05 | Fix for armhf build (#1580) [Qi Luo]
d8c1465 2021-01-05 | [dvs] Update/disable DVS tests with new FRR 7.5 behavior (#1579) [Danny Allen]
f6c7422 2021-01-05 | ASIC internal temperature sensors support (#1517) [Santhosh Kumar T]
0aa9ef2 2021-01-01 | Simply by auto iterator type, because we will tune the return types of library functions (#1577) [Qi Luo]
773238b 2020-12-31 | [build]: Fix format string for size_t (#1576) [Qi Luo]
7ba4e43 2020-12-30 | [fgnhgorch] add warm reboot support for fgnhg (#1538) [weixchen1215]
4cf6617 2020-12-30 | [ci]: add build for arm64 and armhf (#1572) [lguohan]
6ebc0ed 2020-12-29 | [ci]: add azure-pipeline for amd64 (#1571) [lguohan]
e32b9d0 2020-12-29 | [FDBSYNCD] Added pytest for fdbsyncd (#1560) [KISHORE KUNAL]
a43f6be 2020-12-30 | [crm] Add support for snat, dnat and ipmc crm resources (#1511) [Prabhu Sreenivasan]
7fc3888 2020-12-29 | PY Test script for EVPN L3 VxLAN (#1330) [Tapash Das]
6eb36d9 2020-12-27 | vlanmgr changes related to EVPN VxLan warmboot (#1460) [anilkpan]

Signed-off-by: Guohan Lu <[email protected]>
daall pushed a commit that referenced this pull request Jan 22, 2021
@qiluo-msft @daall
[sonic-swss] Update submodule (#6336)
77ec2ee 
Including below commits:

36f7332 2021-01-14 | modified ERR log to NOTICE log for FDB notification failure after VLAN delete (#1595) [madhanmellanox]
c21c883 2021-01-12 | [ci]: download artifacts from master branch build (#1597) [lguohan]
a1d03a4 2021-01-12 | [fgnhgorch] Match mode changes for Fine Grained ECMP (#1565) [anish-n]
1b65f3d 2021-01-12 | [ci]: use sonicbld pool (#1594) [lguohan]
48ae866 2021-01-12 | [pfcwd] Update PFC storm detection logic for Mellanox platforms (#1586) [Volodymyr Samotiy]
850001f 2021-01-12 | [FPMSYNCD] Evpn/Vxlan related changes to support FRR7.5(#1585) [KISHORE KUNAL]
64ca9bb 2021-01-12 | [ci]: only copy artifacts when build is successful (#1590) [lguohan]
17d0dae 2021-01-11 | [Fdborch] Fix for arm compilation (#1592) [Prince Sunny]
693a02c 2021-01-08 | [gearbox] Add support for "hwinfo" field (#1547) [Baptiste Covolato]
7e3b2c6 2021-01-09 | [Evpn Warmreboot] Added Dependancy check logic in VrfMgr (#1466) [nkelapur]
a960e2e 2021-01-09 | [Orchagent]: FdbOrch changes for EVPN VXLAN (#1275) [Pankaj Jain]
097cfda 2021-01-08 | [swss test] update setup guide for swss tests (#1582) [Ying Xie]
b42253a 2021-01-05 | Fix for armhf build (#1580) [Qi Luo]
d8c1465 2021-01-05 | [dvs] Update/disable DVS tests with new FRR 7.5 behavior (#1579) [Danny Allen]
f6c7422 2021-01-05 | ASIC internal temperature sensors support (#1517) [Santhosh Kumar T]
0aa9ef2 2021-01-01 | Simply by auto iterator type, because we will tune the return types of library functions (#1577) [Qi Luo]
773238b 2020-12-31 | [build]: Fix format string for size_t (#1576) [Qi Luo]
7ba4e43 2020-12-30 | [fgnhgorch] add warm reboot support for fgnhg (#1538) [weixchen1215]
4cf6617 2020-12-30 | [ci]: add build for arm64 and armhf (#1572) [lguohan]
6ebc0ed 2020-12-29 | [ci]: add azure-pipeline for amd64 (#1571) [lguohan]
e32b9d0 2020-12-29 | [FDBSYNCD] Added pytest for fdbsyncd (#1560) [KISHORE KUNAL]
a43f6be 2020-12-30 | [crm] Add support for snat, dnat and ipmc crm resources (#1511) [Prabhu Sreenivasan]
7fc3888 2020-12-29 | PY Test script for EVPN L3 VxLAN (#1330) [Tapash Das]
6eb36d9 2020-12-27 | vlanmgr changes related to EVPN VxLan warmboot (#1460) [anilkpan]

Signed-off-by: Guohan Lu <[email protected]>
daall added a commit to daall/sonic-buildimage that referenced this pull request May 7, 2021
@daall
[202012][swss/swss-common/utilities/platform-daemons] Update submodule
a3b553e 
sonic-swss
- [flex-counters] Delay flex counters stats init for faster boot time [202012] (sonic-net#1736)

sonic-swss-common
- [swig] allow threads (sonic-net#477)

sonic-utilities
- [sfpshow] Gracefully handle improper 'specification_compliance' field (sonic-net#1594)

sonic-platform-daemons
- [xcvrd] Change the y_cable presence logic to use "mux_cable" table as identifier from Config DB (sonic-net#176)
- [xcvrd] Enhance Media Settings (sonic-net#177)

Signed-off-by: Danny Allen <[email protected]>
@daall daall mentioned this pull request May 7, 2021
Merged
4 tasks
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request May 10, 2021
@jleveque
[sfpshow] Gracefully handle improper 'specification_compliance' field (…
a71ff02 
…sonic-net#1594)

#### What I did

Gracefully handle improper 'specification_compliance' field

#### How I did it

The 'specification_compliance' field of transceiver info is expected to be a string representation of a dictionary. However, there is a chance, upon some kind of platform issue that a vendor's platform API returns something like 'N/A'. In this case, sfpshow would crash. Rather than crash, sfpshow should handle this gracefully and output 'N/A' instead.
daall added a commit that referenced this pull request May 10, 2021
@daall
[202012][swss-common/utilities/platform-daemons] Update submodule (#7563
506c0e8 
)

* [202012][swss/swss-common/utilities/platform-daemons] Update submodule

sonic-swss
- [flex-counters] Delay flex counters stats init for faster boot time [202012] (#1736)

sonic-swss-common
- [swig] allow threads (#477)

sonic-utilities
- [sfpshow] Gracefully handle improper 'specification_compliance' field (#1594)

sonic-platform-daemons
- [xcvrd] Change the y_cable presence logic to use "mux_cable" table as identifier from Config DB (#176)
- [xcvrd] Enhance Media Settings (#177)

Signed-off-by: Danny Allen <[email protected]>
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request May 11, 2021
@yxieca
[utilities] advance utililies submodule head
1a88030 
Include fullowing changes:

* 9fc630c 2021-05-11 | [sonic_installer] temporary fix: don't migrate packages on aboot platforms (sonic-net#1607) (github/master) [Stepan Blyshchak]
* fde1d95 2021-05-11 | [config][vxlan] fix 'vxlan evpn_nvo add' command error (sonic-net#1511) [shikenghua]
* 331c5a5 2021-05-10 | [config]: Use mod_entry when editing VLAN_INTERFACE (sonic-net#1602) [Lawrence Lee]
* 8c2980a 2021-05-08 | [sonic-utilities] CLI support for port auto negotiation (sonic-net#1568) [Junchao-Mellanox]
* a71ff02 2021-05-06 | [sfpshow] Gracefully handle improper 'specification_compliance' field (sonic-net#1594) [Joe LeVeque]

Signed-off-by: Ying Xie <[email protected]>
@yxieca yxieca mentioned this pull request May 11, 2021
Merged
yxieca added a commit that referenced this pull request May 11, 2021
@yxieca
[utilities] advance utililies submodule head (#7580)
b6c0dd6 
Include fullowing changes:

* 9fc630c 2021-05-11 | [sonic_installer] temporary fix: don't migrate packages on aboot platforms (#1607) (github/master) [Stepan Blyshchak]
* fde1d95 2021-05-11 | [config][vxlan] fix 'vxlan evpn_nvo add' command error (#1511) [shikenghua]
* 331c5a5 2021-05-10 | [config]: Use mod_entry when editing VLAN_INTERFACE (#1602) [Lawrence Lee]
* 8c2980a 2021-05-08 | [sonic-utilities] CLI support for port auto negotiation (#1568) [Junchao-Mellanox]
* a71ff02 2021-05-06 | [sfpshow] Gracefully handle improper 'specification_compliance' field (#1594) [Joe LeVeque]

Signed-off-by: Ying Xie <[email protected]>
abdosi added a commit that referenced this pull request Aug 6, 2021
@abdosi
[submodule update] sonic-utilities
624ddf6 
97d971372fac773b98d46bb8f800df7b845e518e (HEAD -> 201911, origin/201911) [sfpshow] Gracefully handle improper 'specification_compliance' field (#1594) (#1729)
2099c73cea81ff4524e680b6f9335c0b0f13b94e [CLI] Implement null_route_helper script (#1740)
b56659175986fe0e5b82c6bd6b3dde163164777b [minigraph][port_config] Consume port_config.json while reloading minigraph (#1725)
e840c42da2a40db2bf993672271f6b75c51c426f Change the method name to align with master, reduce diverge issue (#1703)

Signed-off-by: Abhishek Dosi <[email protected]>
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
@yxieca
[utilities] advance utililies submodule head (sonic-net#7580)
32ea399 
Include fullowing changes:

* 9fc630c 2021-05-11 | [sonic_installer] temporary fix: don't migrate packages on aboot platforms (sonic-net#1607) (github/master) [Stepan Blyshchak]
* fde1d95 2021-05-11 | [config][vxlan] fix 'vxlan evpn_nvo add' command error (sonic-net#1511) [shikenghua]
* 331c5a5 2021-05-10 | [config]: Use mod_entry when editing VLAN_INTERFACE (sonic-net#1602) [Lawrence Lee]
* 8c2980a 2021-05-08 | [sonic-utilities] CLI support for port auto negotiation (sonic-net#1568) [Junchao-Mellanox]
* a71ff02 2021-05-06 | [sfpshow] Gracefully handle improper 'specification_compliance' field (sonic-net#1594) [Joe LeVeque]

Signed-off-by: Ying Xie <[email protected]>
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
@lguohan
[ci]: use sonicbld pool (sonic-net#1594)
1b65f3d 
Signed-off-by: Guohan Lu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lguohan lguohan lguohan left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@yurypm @lguohan