Fix INSTALL_DEBUG_TOOLS build config option #2564
Conversation
Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
|
Along with this fix, can we also simplify the other makefiles? For example:
Or is there a reason we still need this? |
|
@jleveque, @jipanyang if i remember correctly, at the time i added this logic i was trying to offer two approaches to enable this flag: 1) through environment-variable, 2) through rules/config variable. I'm perfectly fine if we want to eliminate option 1), and in that case i agree with you that lines 88-90 are not needed anymore. |
|
@rodnymolina: Was it the environment variable that required this setup? We also set a few other variables this way. I'm just curious whether this procedure is needed for the others, as well. |
|
@jleveque Yep, this procedure is needed for the others i'm afraid. Generally speaking i think it's a good idea to reduce to the minimum the number of building-options that we expose through env-vars. There may be some good exceptions, but for the general case, we should default to rules/config as the go-to place. |
|
@jleveque @rodnymolina I think we introduced the interim variable SONIC_xxxx to fix issue like #1615 . |
Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
|
Makefile.work
Outdated
| SONIC_INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \ | ||
| ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \ | ||
| ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \ | ||
| INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \ |
There was a problem hiding this comment.
this is not correct. if ENABLE_PFCWD_ON_START is not defined, then it will override the default setting in rules/config.
|
@jipanyang , it looks like you are correct, with the include rules/config in Makefile.work. However, we are not passing variable into slave.mk. we should include rules/config only once, now, it looks like we include twice, one in Makefile.work and one in slave.mk. I am not sure it is correct to have rules/config include in both place. It was an oversight. |
This reverts commit 9a3b428.
|
@lguohan Limited the scope of this PR to "INSTALL_DEBUG_TOOLS" only. |
* Fix INSTALL_DEBUG_TOOLS build config option Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
Update sonic-utilities submodule pointer to include the following: * 67cbb15 [202205]Fixes sonic-net#12170: Delete subinterface and recreate the subinterface in default-vrf ([sonic-net#2564](sonic-net/sonic-utilities#2564)) * 93172c4 [202205] [generate_dump] Optimize the execution time of the 'show techsupport' script to 5-10% by reducing calls to the 'tar append' operation ([sonic-net#2562](sonic-net/sonic-utilities#2562)) Signed-off-by: dgsudharsan <sudharsand@nvidia.com>
Update sonic-utilities submodule pointer to include the following: * f7988b0 [202205] [timer.unit.j2] use wanted-by in timer unit ([sonic-net#2561](sonic-net/sonic-utilities#2561)) * f45dcfb [generate_dump] Optimize the execution time of 'show techsupport' CLI by paraller function execution ([sonic-net#2565](sonic-net/sonic-utilities#2565)) * 67cbb15 [202205]Fixes sonic-net#12170: Delete subinterface and recreate the subinterface in default-vrf ([sonic-net#2564](sonic-net/sonic-utilities#2564)) * 93172c4 [202205] [generate_dump] Optimize the execution time of the 'show techsupport' script to 5-10% by reducing calls to the 'tar append' operation ([sonic-net#2562](sonic-net/sonic-utilities#2562)) Signed-off-by: dprital <drorp@nvidia.com>
Update sonic-utilities submodule pointer to include the following: 3bc2bc6 [Mellanox][202205] Change severity to NOTICE in Mellanox buffer migrator when unable to fetch DEVICE_METADATA due to empty CONFIG_DB during initialization (#2570) e1c8243 [202205][generate_dump] Fix for a deletion flow for all secret files in the techsupport dump (#2572) 9f2984a [202205] Fix issue: unconfigured PGs are displayed in watermarkstat (#2568) f7988b0 [202205] [timer.unit.j2] use wanted-by in timer unit (#2561) f45dcfb [generate_dump] Optimize the execution time of 'show techsupport' CLI by paraller function execution (#2565) 67cbb15 [202205]Fixes 12170: Delete subinterface and recreate the subinterface in default-vrf (#2564) 93172c4 [202205] [generate_dump] Optimize the execution time of the 'show techsupport' script to 5-10% by reducing calls to the 'tar append' operation (#2562) Signed-off-by: dprital <drorp@nvidia.com>
DEPENDS: [202211][ppi]: Implement port bulk comparison logic (#2564) sonic-swss#2821 HLD: sonic-net/SONiC#1084 Why I did it Enabled port late create on SN5600 switch boots up with no ports Work item tracking N/A How I did it Updated SAI xml config file How to verify it Run sonic-mgmt tests fastboot
Signed-off-by: Jipan Yang jipan.yang@alibaba-inc.com
- What I did
INSTALL_DEBUG_TOOLS, while not SONIC_INSTALL_DEBUG_TOOLS should be used in rules/config to make the option work.
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)