[build]: add sonic-config-engine to sonic-utilitie build dependency#1075
[build]: add sonic-config-engine to sonic-utilitie build dependency#1075lguohan merged 1 commit intosonic-net:masterfrom
Conversation
|
|
||
| SONIC_UTILS = python-sonic-utilities_1.1-1_all.deb | ||
| $(SONIC_UTILS)_SRC_PATH = $(SRC_PATH)/sonic-utilities | ||
| $(SONIC_UTILS)_WHEEL_DEPENDS = $(SONIC_CONFIG_ENGINE) |
There was a problem hiding this comment.
Can you also add dependency to swsssdk?
There was a problem hiding this comment.
swsssdk is the config-engine dependency, no need to explicit specify that. Check the build log below.
lgh@ba2755a9022e:/data/sonic/sonic-buildimage$ make -f slave.mk target/debs/python-sonic-utilities_1.1-1_all.deb
SONiC Build System
Build Configuration
"CONFIGURED_PLATFORM" : "vs"
"SONIC_CONFIG_PRINT_DEPENDENCIES" : ""
"SONIC_CONFIG_BUILD_JOBS" : "1"
"SONIC_CONFIG_MAKE_JOBS" : "4"
"DEFAULT_USERNAME" : "admin"
"DEFAULT_PASSWORD" : "YourPaSsWoRd"
"ENABLE_DHCP_GRAPH_SERVICE" : ""
"SHUTDOWN_BGP_ON_START" : ""
"SONIC_CONFIG_DEBUG" : ""
"ROUTING_STACK" : "quagga"
"ENABLE_SYNCD_RPC" : ""
"ENABLE_ORGANIZATION_EXTENSIONS" : "y"
[ building ] [ target/python-wheels/swsssdk-2.0.1-py2-none-any.whl ]
[ finished ] [ target/python-wheels/swsssdk-2.0.1-py2-none-any.whl ]
[ building ] [ target/python-wheels/swsssdk-2.0.1-py2-none-any.whl-install ]
[ finished ] [ target/python-wheels/swsssdk-2.0.1-py2-none-any.whl-install ]
[ building ] [ target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl ]
[ finished ] [ target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl ]
[ building ] [ target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl-install ]
[ finished ] [ target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl-install ]
[ building ] [ target/debs/python-sonic-utilities_1.1-1_all.deb ]
[ finished ] [ target/debs/python-sonic-utilities_1.1-1_all.deb ]
|
Shall we actually add sonic-config-engine and swsssdk to setup.py of sonic-utilities to verify that this works? |
|
both swsssdk and config-engine are built and installed. It is verified. |
marian-pritsak
left a comment
There was a problem hiding this comment.
I don't like that python wheel dependency is defined via a different variable because at this point build system already knows how to install it. But I understand that this is the shortest way we can go. In the future we'll have to revisit target/ directory structure because there is no point in splitting Debian packages and python wheels.
|
I agree with you. why do we have debs and python-wheels directory under target directory? If it is an artifacts, we can try to merge them together and put them under a packages directory. Then, based on the suffix, we can use different methods to install them. |
|
@taoyl-ms: This PR takes care of the build-time dependency, but does not address the run-time installation dependency. Unfortunately, we still cannot explicitly specify wheels as dependencies in the setup.py of a Python package that is built as a .deb, because the .deb package will look for all specified dependencies as .deb packages prefixed by "python-" rather than wheels. We still need to figure out a solution which allows us to explicitly specify all run-time dependencies in order to properly catch all image build failures. |
sairedis: * [SAI] Update SAI submodule to v1.5.1 (sonic-net#532) * Cleanup Makefile.am from BFN specific code (sonic-net#530) * [vs] Implement indices for debug counters in VS (sonic-net#531) * Enable FastReboot if we have key "FAST_REBOOT|system" in State db (sonic-net#529) * [flex_counter] Add sairedis support for drop counters (sonic-net#520) swss: * [orchagent] Add swss support for drop counters (sonic-net#1075) * [orchagent] warning fixes for 32bit arch compilation (sonic-net#1129) * [utilities] Create utility classes for interacting with flex counters (sonic-net#1093) * [portsorch] add support to set mac-address learning attribute on bridge-port (sonic-net#809) * Fix traceroute issue (sonic-net#1113) utilities: * Add CLI support for configurable drop counters (sonic-net#688) * Revert "SONiC Management Framework Release 1.0 (sonic-net#659)" (sonic-net#741) * SONiC Management Framework Release 1.0 (sonic-net#659) Signed-off-by: Danny Allen <[email protected]>
sairedis: * [SAI] Update SAI submodule to v1.5.1 (#532) * Cleanup Makefile.am from BFN specific code (#530) * [vs] Implement indices for debug counters in VS (#531) * Enable FastReboot if we have key "FAST_REBOOT|system" in State db (#529) * [flex_counter] Add sairedis support for drop counters (#520) swss: * [orchagent] Add swss support for drop counters (#1075) * [orchagent] warning fixes for 32bit arch compilation (#1129) * [utilities] Create utility classes for interacting with flex counters (#1093) * [portsorch] add support to set mac-address learning attribute on bridge-port (#809) * Fix traceroute issue (#1113) utilities: * Add CLI support for configurable drop counters (#688) * Revert "SONiC Management Framework Release 1.0 (#659)" (#741) * SONiC Management Framework Release 1.0 (#659) Signed-off-by: Danny Allen <[email protected]>
sairedis: * [SAI] Update SAI submodule to v1.5.1 (sonic-net#532) * Cleanup Makefile.am from BFN specific code (sonic-net#530) * [vs] Implement indices for debug counters in VS (sonic-net#531) * Enable FastReboot if we have key "FAST_REBOOT|system" in State db (sonic-net#529) * [flex_counter] Add sairedis support for drop counters (sonic-net#520) swss: * [orchagent] Add swss support for drop counters (sonic-net#1075) * [orchagent] warning fixes for 32bit arch compilation (sonic-net#1129) * [utilities] Create utility classes for interacting with flex counters (sonic-net#1093) * [portsorch] add support to set mac-address learning attribute on bridge-port (sonic-net#809) * Fix traceroute issue (sonic-net#1113) utilities: * Add CLI support for configurable drop counters (sonic-net#688) * Revert "SONiC Management Framework Release 1.0 (sonic-net#659)" (sonic-net#741) * SONiC Management Framework Release 1.0 (sonic-net#659) Signed-off-by: Danny Allen <[email protected]>
* [orchagent] Adds swss support for drop counters - Creates a new orchestrator for managing debug counters - Adds utility functions for managing flex counters - Adds utility functions for managing debug counters Signed-off-by: Danny Allen <[email protected]> * Fix build issues * Fix log levels * Cast drop reasons before serializing * Fix testing issues * Clean up flex counter utilities * Expose switch ids in redis * Clean-up comments and namespace usage * Add basic drop counter vswitch tests * Add drop reasons * Fix rebase merge conflicts * Move flex counter and switch related work to different PRs * Fix first round of feedback comments * Fix free counters review comments * Reorganize helper classes * Delete extra makefile * Only put useful capabilities in STATE DB * Use new flex counter manager naming * Update mock tests to build with debug counter orch * Add remaining ingress drop reasons * Fix reference style issue * Update tests to match virtual switch implementation * Respond to C++ style issues * Improve documentation for vs tests * Add test case for removing all drop reasons from a counter * Specify exception type being caught * Add range check for drop counter indices * Undo range check
[config] Update SONiC Environment Vars Whne Loading Minigraph (sonic-net#1073) Multi asic platform changes for interface, portchannel commands (sonic-net#878) Update Command-Reference.md (sonic-net#1075) [filter-fdb] Fix Filter FDB With IPv6 Present in Config DB (sonic-net#1059) [config] Remove _get_breakout_cfg_file_name helper function (sonic-net#1069) [SHOW][BGP] support show ip(v6) bgp summary for multi asic platform (sonic-net#1064) [fanshow] Display other fan status, such as Updating (sonic-net#1014) Add ip_prefix len based on proxy_arp status (sonic-net#1046) Enable the platform specific ssd firmware upgrade during reboot (sonic-net#954) [show][cli[show interface portchannel support for Multi ASIC (sonic-net#1005) support show interface commands for multi ASIC platforms (sonic-net#1006) Signed-off-by: vaibhav-dahiya <[email protected]>
[show]bgp]Display the Total number of neighbors in the show ip bgp(v6) summary. (sonic-net#1079) [config] Update SONiC Environment Vars When Loading Minigraph (sonic-net#1073) Multi asic platform changes for interface, portchannel commands (sonic-net#878) Update Command-Reference.md (sonic-net#1075) [filter-fdb] Fix Filter FDB With IPv6 Present in Config DB (sonic-net#1059) [config] Remove _get_breakout_cfg_file_name helper function (sonic-net#1069) [SHOW][BGP] support show ip(v6) bgp summary for multi asic platform (sonic-net#1064) [fanshow] Display other fan status, such as Updating (sonic-net#1014) Add ip_prefix len based on proxy_arp status (sonic-net#1046) Enable the platform specific ssd firmware upgrade during reboot (sonic-net#954) [show][cli[show interface portchannel support for Multi ASIC (sonic-net#1005) support show interface commands for multi ASIC platforms (sonic-net#1006) Signed-off-by: vaibhav-dahiya <[email protected]>
Fix pfcwd stats crash with invalid queue name (sonic-net#1077) [show][bgp]Display the Total number of neighbors in the show ip bgp(v6) summary. (sonic-net#1079) [config] Update SONiC Environment Vars When Loading Minigraph (sonic-net#1073) Multi asic platform changes for interface, portchannel commands (sonic-net#878) Update Command-Reference.md (sonic-net#1075) [filter-fdb] Fix Filter FDB With IPv6 Present in Config DB (sonic-net#1059) [config] Remove _get_breakout_cfg_file_name helper function (sonic-net#1069) [SHOW][BGP] support show ip(v6) bgp summary for multi asic platform (sonic-net#1064) [fanshow] Display other fan status, such as Updating (sonic-net#1014) Add ip_prefix len based on proxy_arp status (sonic-net#1046) Enable the platform specific ssd firmware upgrade during reboot (sonic-net#954) [show][cli[show interface portchannel support for Multi ASIC (sonic-net#1005) support show interface commands for multi ASIC platforms (sonic-net#1006) Signed-off-by: vaibhav-dahiya <[email protected]>
… path to sonic-py-common and update sonic-utilities to comply (#5264) * [sonic-utilities]update submodule with fix This PR addresses fixes in sonic-py-common to imitate the behavior inside sonic-cfggen. Essentially this is a fix for accessing the port-config file. First check if there is a platform.json file for config generation and then for legacy port_config.ini. Also updating the sub-module sonic-utilities. Fix pfcwd stats crash with invalid queue name (#1077) [show][bgp]Display the Total number of neighbors in the show ip bgp(v6) summary. (#1079) [config] Update SONiC Environment Vars When Loading Minigraph (#1073) Multi asic platform changes for interface, portchannel commands (#878) Update Command-Reference.md (#1075) [filter-fdb] Fix Filter FDB With IPv6 Present in Config DB (#1059) [config] Remove _get_breakout_cfg_file_name helper function (#1069) [SHOW][BGP] support show ip(v6) bgp summary for multi asic platform (#1064) [fanshow] Display other fan status, such as Updating (#1014) Add ip_prefix len based on proxy_arp status (#1046) Enable the platform specific ssd firmware upgrade during reboot (#954) [show][cli[show interface portchannel support for Multi ASIC (#1005) support show interface commands for multi ASIC platforms (#1006) Signed-off-by: vaibhav-dahiya <[email protected]>
… path to sonic-py-common and update sonic-utilities to comply (sonic-net#5264) * [sonic-utilities]update submodule with fix This PR addresses fixes in sonic-py-common to imitate the behavior inside sonic-cfggen. Essentially this is a fix for accessing the port-config file. First check if there is a platform.json file for config generation and then for legacy port_config.ini. Also updating the sub-module sonic-utilities. Fix pfcwd stats crash with invalid queue name (sonic-net#1077) [show][bgp]Display the Total number of neighbors in the show ip bgp(v6) summary. (sonic-net#1079) [config] Update SONiC Environment Vars When Loading Minigraph (sonic-net#1073) Multi asic platform changes for interface, portchannel commands (sonic-net#878) Update Command-Reference.md (sonic-net#1075) [filter-fdb] Fix Filter FDB With IPv6 Present in Config DB (sonic-net#1059) [config] Remove _get_breakout_cfg_file_name helper function (sonic-net#1069) [SHOW][BGP] support show ip(v6) bgp summary for multi asic platform (sonic-net#1064) [fanshow] Display other fan status, such as Updating (sonic-net#1014) Add ip_prefix len based on proxy_arp status (sonic-net#1046) Enable the platform specific ssd firmware upgrade during reboot (sonic-net#954) [show][cli[show interface portchannel support for Multi ASIC (sonic-net#1005) support show interface commands for multi ASIC platforms (sonic-net#1006) Signed-off-by: vaibhav-dahiya <[email protected]>
Aligned single back quotes in .md file
…rm-common] advance submodule head linkmgrd: * e0fe1d4 2022-07-27 | TSA enhancement (sonic-net#98) (HEAD -> 202205) [Jing Zhang] utilities: * 7d7e15e 2022-07-18 | [vnet_route_check] Align DB data parse logic with format used by swsscommon API (sonic-net#2268) (HEAD -> 202205) [Volodymyr Samotiy] * b3d5d18 2022-07-20 | [MultiAsic] sudo reboot command doesn't gracefully stop Asic syncd# on multiasic platform (sonic-net#2258) [Marty Y. Lok] * 504ebe6 2022-07-08 | Add 'traffic_shift_away' option to config load_minigraph (sonic-net#2240) [tjchadaga] * 4079e4a 2022-06-20 | Gives cisco-8000 more flexibility to easily add subcommnads under show platform (sonic-net#2213) [Nathan Cohen] * 46443c6 2022-07-27 | Update db_migrator to support `PORT_QOS_MAP|global` (sonic-net#2205) [bingwang-ms] * d7fbdd6 2022-05-26 | fix for non-coherent cmis modules (sonic-net#2163) [qinchuanares] * 79b4439 2022-06-24 | [sfpshow/sfputil] Enhance sfpshow and sfputil to behavior correctly on RJ45 ports (sonic-net#2111) [Kebo Liu] swss: * 275f311 2022-07-26 | [DualToR] Handle race condition between tunnel_decap and mux orchestrator (sonic-net#2397) (HEAD -> 202205) [Devesh Pathak] * 47586e8 2022-07-22 | [EVPN]Fix missing Vlan member update notification in P2MP scenario (sonic-net#2388) [Sudharsan Dhamal Gopalarathnam] * 7d5c73f 2022-07-19 | [macsecmgr]: Fix cleanup macsec objs if container stop (sonic-net#2376) [Ze Gan] * c03996f 2022-07-17 | [orchagent]: Enhance initSaiPhyApi (sonic-net#2367) [andywongarista] * 57890d7 2022-07-27 | Fix for remote system interface not getting created (sonic-net#2364) [skeesara-nokia] * 1a93ec9 2022-07-13 | Orchagent changes for synchronizing npu/phy device Tx in the data path before enabling transceiver<CMIS compliant> Tx. (sonic-net#2277) [jaganbal-a] sairedis: * a4903be 2022-07-20 | Update PN with XPN support (sonic-net#1081) (HEAD -> 202205, github/202205) [Ze Gan] * 2cb5671 2022-07-27 | Add SAI_OBJECT_TYPE_TUNNEL object to break-before-make list (sonic-net#1075) [Vaibhav Hemant Dixit] platform-daemon: * 901c6a1 2022-06-28 | [CMIS]Improved 400G link bring up sequence (sonic-net#254) (HEAD -> 202205) [Prince George] platform-common: * f223b3f 2022-07-09 | Support get_port_or_cage_type (sonic-net#288) (HEAD -> 202205) [Stephen Sun] Signed-off-by: Ying Xie <[email protected]>
…rm-common] advance submodule head (#11578) linkmgrd: * e0fe1d4 2022-07-27 | TSA enhancement (#98) (HEAD -> 202205) [Jing Zhang] utilities: * 7d7e15e 2022-07-18 | [vnet_route_check] Align DB data parse logic with format used by swsscommon API (#2268) (HEAD -> 202205) [Volodymyr Samotiy] * b3d5d18 2022-07-20 | [MultiAsic] sudo reboot command doesn't gracefully stop Asic syncd# on multiasic platform (#2258) [Marty Y. Lok] * 504ebe6 2022-07-08 | Add 'traffic_shift_away' option to config load_minigraph (#2240) [tjchadaga] * 4079e4a 2022-06-20 | Gives cisco-8000 more flexibility to easily add subcommnads under show platform (#2213) [Nathan Cohen] * 46443c6 2022-07-27 | Update db_migrator to support `PORT_QOS_MAP|global` (#2205) [bingwang-ms] * d7fbdd6 2022-05-26 | fix for non-coherent cmis modules (#2163) [qinchuanares] * 79b4439 2022-06-24 | [sfpshow/sfputil] Enhance sfpshow and sfputil to behavior correctly on RJ45 ports (#2111) [Kebo Liu] swss: * 275f311 2022-07-26 | [DualToR] Handle race condition between tunnel_decap and mux orchestrator (#2397) (HEAD -> 202205) [Devesh Pathak] * 47586e8 2022-07-22 | [EVPN]Fix missing Vlan member update notification in P2MP scenario (#2388) [Sudharsan Dhamal Gopalarathnam] * 7d5c73f 2022-07-19 | [macsecmgr]: Fix cleanup macsec objs if container stop (#2376) [Ze Gan] * c03996f 2022-07-17 | [orchagent]: Enhance initSaiPhyApi (#2367) [andywongarista] * 57890d7 2022-07-27 | Fix for remote system interface not getting created (#2364) [skeesara-nokia] * 1a93ec9 2022-07-13 | Orchagent changes for synchronizing npu/phy device Tx in the data path before enabling transceiver<CMIS compliant> Tx. (#2277) [jaganbal-a] sairedis: * a4903be 2022-07-20 | Update PN with XPN support (#1081) (HEAD -> 202205, github/202205) [Ze Gan] * 2cb5671 2022-07-27 | Add SAI_OBJECT_TYPE_TUNNEL object to break-before-make list (#1075) [Vaibhav Hemant Dixit] platform-daemon: * 901c6a1 2022-06-28 | [CMIS]Improved 400G link bring up sequence (#254) (HEAD -> 202205) [Prince George] platform-common: * f223b3f 2022-07-09 | Support get_port_or_cage_type (#288) (HEAD -> 202205) [Stephen Sun] Signed-off-by: Ying Xie <[email protected]>
…rm-common] advance submodule head (sonic-net#11578) linkmgrd: * e0fe1d4 2022-07-27 | TSA enhancement (sonic-net#98) (HEAD -> 202205) [Jing Zhang] utilities: * 7d7e15e 2022-07-18 | [vnet_route_check] Align DB data parse logic with format used by swsscommon API (sonic-net#2268) (HEAD -> 202205) [Volodymyr Samotiy] * b3d5d18 2022-07-20 | [MultiAsic] sudo reboot command doesn't gracefully stop Asic syncd# on multiasic platform (sonic-net#2258) [Marty Y. Lok] * 504ebe6 2022-07-08 | Add 'traffic_shift_away' option to config load_minigraph (sonic-net#2240) [tjchadaga] * 4079e4a 2022-06-20 | Gives cisco-8000 more flexibility to easily add subcommnads under show platform (sonic-net#2213) [Nathan Cohen] * 46443c6 2022-07-27 | Update db_migrator to support `PORT_QOS_MAP|global` (sonic-net#2205) [bingwang-ms] * d7fbdd6 2022-05-26 | fix for non-coherent cmis modules (sonic-net#2163) [qinchuanares] * 79b4439 2022-06-24 | [sfpshow/sfputil] Enhance sfpshow and sfputil to behavior correctly on RJ45 ports (sonic-net#2111) [Kebo Liu] swss: * 275f311 2022-07-26 | [DualToR] Handle race condition between tunnel_decap and mux orchestrator (sonic-net#2397) (HEAD -> 202205) [Devesh Pathak] * 47586e8 2022-07-22 | [EVPN]Fix missing Vlan member update notification in P2MP scenario (sonic-net#2388) [Sudharsan Dhamal Gopalarathnam] * 7d5c73f 2022-07-19 | [macsecmgr]: Fix cleanup macsec objs if container stop (sonic-net#2376) [Ze Gan] * c03996f 2022-07-17 | [orchagent]: Enhance initSaiPhyApi (sonic-net#2367) [andywongarista] * 57890d7 2022-07-27 | Fix for remote system interface not getting created (sonic-net#2364) [skeesara-nokia] * 1a93ec9 2022-07-13 | Orchagent changes for synchronizing npu/phy device Tx in the data path before enabling transceiver<CMIS compliant> Tx. (sonic-net#2277) [jaganbal-a] sairedis: * a4903be 2022-07-20 | Update PN with XPN support (sonic-net#1081) (HEAD -> 202205, github/202205) [Ze Gan] * 2cb5671 2022-07-27 | Add SAI_OBJECT_TYPE_TUNNEL object to break-before-make list (sonic-net#1075) [Vaibhav Hemant Dixit] platform-daemon: * 901c6a1 2022-06-28 | [CMIS]Improved 400G link bring up sequence (sonic-net#254) (HEAD -> 202205) [Prince George] platform-common: * f223b3f 2022-07-09 | Support get_port_or_cage_type (sonic-net#288) (HEAD -> 202205) [Stephen Sun] Signed-off-by: Ying Xie <[email protected]>
This brings in the following changes: ``` 21f3d7c Add SAI_OBJECT_TYPE_TUNNEL object to break-before-make list (sonic-net#1075) 8ac3aa7 [sairedis] Fix reopen recoding file (sonic-net#1087) 0bbbb02 Transfer organization from Azure to sonic-net (sonic-net#1096) 3406c57 [sairedis] Perform log rotate on request (sonic-net#1083) ``` Signed-off-by: Saikrishna Arcot <[email protected]>
…D automatically (sonic-net#1075) #### Why I did it src/sonic-sairedis ``` * 80c4309 - (HEAD -> 202412, origin/HEAD, origin/202412) Support auto negotiation on the VS platform to avoid error messages. (#52) (21 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
- What I did
add sonic-config-engine to sonic-utilities build dependency
- How I did it
change slave.mk and sonic-utilities.mk
- How to verify it
make -f slave.mk target/debs/python-sonic-utilities_1.1-1_all.deb
- Description for the changelog
add sonic-config-engine to sonic-utilities build dependency
- A picture of a cute animal (not mandatory but encouraged)