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.

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

Makefile: make new step "make stretch" optional #1936

Merged
merged 4 commits into from
Aug 16, 2018

Conversation

yxieca
Copy link
Contributor

@yxieca yxieca commented Aug 16, 2018

- What I did

  • Move the old Makefile to secondary make file
  • Create a new Makefile to handle extra step

- How to verify it
Single thread make is fine. Multiple thread make hits some issue that retry will overcome. Will look into these failures next.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
* avoiding calling "make stretch"

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
@yxieca yxieca requested a review from lguohan August 16, 2018 01:24
@lguohan
Copy link
Collaborator

lguohan commented Aug 16, 2018

what is the overhead of make stretch every time?

Makefile Outdated
@echo $(SLAVE_IMAGE):$(SLAVE_TAG)
@echo $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
@echo "+++ --- Making $@ --- +++"
BLDENV=stretch make -f Makefile.work stretch
Copy link
Collaborator

Choose a reason for hiding this comment

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

can you add {if endif}, so that we can override the behavior, for example, NOSTRETCH=1 make will not make stretch target implicitly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure. Done. Thanks.

@yxieca
Copy link
Contributor Author

yxieca commented Aug 16, 2018

Initialing making stretch takes about 90 minutes, most time spent on making kernel. Remake takes about 1 second to confirm nothing needs to be done.

Once I fixed the dependency issue to enable multiple threads, it could be lower to 70 minutes or so.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Makefile Outdated
else \
echo "Reset aborted"; \
fi
clean reset init configure :
Copy link
Collaborator

Choose a reason for hiding this comment

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

clean reset init configure [](start = 0, length = 26)

showtag should be here too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

okey dokey :-)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
@lguohan lguohan merged commit a8ccf58 into sonic-net:master Aug 16, 2018
@yxieca yxieca deleted the makefile branch August 16, 2018 22:55
judyjoseph added a commit that referenced this pull request Oct 14, 2021
08b05db [pfcwd] Convert polling interval from ms to us in LUA scripts (#1908)
ebb1d6c [cfgmgr] Fix for STATE_DB Port check (#1936)
prsunny pushed a commit that referenced this pull request Oct 18, 2021
Sonic-swss-common:

[schema.h] Add trap flow counter support (#534) (sonic-net/sonic-swss-common@31f4253)
[schema] Add CBF table names (#525) (sonic-net/sonic-swss-common@b15e08d)

Sonic-sairedis:

[cbf] Add Class Based Forwarding support (#909) sonic-net/sonic-sairedis@ecb95a8
[azp] Enable pretty code coverage results xml (#946) sonic-net/sonic-sairedis@1148d16
[gearbox] startup gbsyncd in sync mode in vSonic (#939) sonic-net/sonic-sairedis@e59a085
[unittest] Add more Meta tests (#948) sonic-net/sonic-sairedis@812f7a5
[syncd] Fix SwitchNotifications to be const reference (#945) sonic-net/sonic-sairedis@5863ed3
[syncd] Refactor syncd request shutdown command line parser (#944) sonic-net/sonic-sairedis@d598dea
[unittest] Update meta tests (#943) sonic-net/sonic-sairedis@26b2237
[ci]: Support code diff coverage (#934) sonic-net/sonic-sairedis@e545b17
Sonic sairedis changes for SAI SRV6 and SAI refpoint update to v1.9.0 (#937) sonic-net/sonic-sairedis@921cf0b
[sairedis] Fail get/clear api on objects created in init view mode (#930) sonic-net/sonic-sairedis@362b34e
[vslib]: Remove invalid lane when create ports (#938) sonic-net/sonic-sairedis@db403f4
[Barefoot] enable bulk api`s in SAI (#927) sonic-net/sonic-sairedis@6df04d8
[unittest] Add NotificationBfdSessionStateChange tests (#940) sonic-net/sonic-sairedis@89d639b
[azp] Skip auto generated saimetadata lib code coverage (#935) sonic-net/sonic-sairedis@40e9c74
Remove tail white spaces sonic-net/sonic-sairedis@dabd1a7
Bring back pyext in Makefile.am sonic-net/sonic-sairedis@94d5545
Add RedisChannel tests sonic-net/sonic-sairedis@e16606a
Add RedisVidIndexGenerator tests sonic-net/sonic-sairedis@62b8fdd
Add ServerConfig tests sonic-net/sonic-sairedis@58725df
Add SkipRecordAttrContainer tests sonic-net/sonic-sairedis@6842d92
Update Switch tests sonic-net/sonic-sairedis@cd13f49
Add SwitchConfigContainer tests sonic-net/sonic-sairedis@6fc213d
Add SwitchConfigContainer tests sonic-net/sonic-sairedis@ee24c0e
Add SwitchContainer tests sonic-net/sonic-sairedis@e33c6e9
Add ZeroMQChannel tests sonic-net/sonic-sairedis@bcd1648
Add VirtualObjectIdManager tests sonic-net/sonic-sairedis@0a2cb2c
[sairedis] Remove legacy allocateSwitchIndex api sonic-net/sonic-sairedis@16fff7f

Sonic-swss:

[orchagent] Add separate next hop table and orch (#1702) sonic-net/sonic-swss@f248e26
[portorch]: Skip to create port if the lane set isn't available in ASIC (#1923) sonic-net/sonic-swss@fd0cafe
fix the type for SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE (#1942) sonic-net/sonic-swss@ef6b5d4
[cfgmgr] Fix for STATE_DB Port check (#1936) sonic-net/sonic-swss@b592ad7
Pterosaur added a commit to Pterosaur/sonic-buildimage that referenced this pull request Oct 26, 2021
7444e96 [macsecmgr]: Add rekey period in macsec mgr (sonic-net#1958)
d95823d [Buffermgr]Graceful handling of buffer model change (sonic-net#1956)
b0aa6a0 EVPN VxLAN enhancement to support P2MP tunnel based programming for Layer2 extension (sonic-net#1858)
85bdf54 Fix the option missing in kernel config issue (sonic-net#1973)
6b15584 (master) Orchagent validates mirror session queue parameter against maximum value from SAI (sonic-net#1957)
fc9ffb9 [copp] Add ISIS, LDP and micro-BFD trap types to CoPP manager (sonic-net#1890)
452cbc1 [macsecorch]: Add IPG adjusting for MACsec gearbox model (sonic-net#1925)
f248e26 [orchagent] Add separate next hop table and orch (sonic-net#1702)
fd0cafe [portorch]: Skip to create port if the lane set isn't available in ASIC (sonic-net#1923)
ef6b5d4 fix the type for SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE (sonic-net#1942)
b592ad7 [cfgmgr] Fix for STATE_DB Port check (sonic-net#1936)

Signed-off-by: Ze Gan <ganze718@gmail.com>
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
*Updated checks for PORT entry in STATE_DB in portmgrd, teammgrd, and intfmgrd to additionally check for presence of "state" attribute.
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
* Updated checks for PORT entry in STATE_DB in vlanmgrd additionally check for presence of "state" attribute. This is to add Vlanmgrd check similar to sonic-net#1936
Signed-off-by: Sudharsan Dhamal Gopalarathnam <sudharsand@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants