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

Fix docker images rebuilt issue when building each host image #5925

Merged
merged 6 commits into from
Nov 24, 2020

Conversation

xumia
Copy link
Collaborator

@xumia xumia commented Nov 15, 2020

- Why I did it
The docker images rebuilt when building each host image in nightly build, it is not as expect.
It is caused by some of source files touched during building images, such as applying patches to source folders.

- How I did it
Before the .dep.sha files generated, check if the hash values changed, if the content is exactly the same as the old one, not necessary to touch the it.

- How to verify it
make SONIC_DPKG_CACHE_METHOD=wcache SONIC_DPKG_CACHE_SOURCE=/cache target/sonic-broadcom.bin
make SONIC_DPKG_CACHE_METHOD=wcache SONIC_DPKG_CACHE_SOURCE=/cache target/sonic-aboot-broadcom.swi
No docker images rebuilt

- Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006

- Description for the changelog

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

@xumia xumia requested review from qiluo-msft and yxieca November 15, 2020 10:02
@xumia
Copy link
Collaborator Author

xumia commented Nov 15, 2020

retest mellanox please

yxieca
yxieca previously approved these changes Nov 15, 2020
@qiluo-msft
Copy link
Collaborator

@Kalimuthu-Velappan Could you help review?

@xumia
Copy link
Collaborator Author

xumia commented Nov 18, 2020

retest broadcom please

@xumia xumia merged commit 98d7491 into sonic-net:master Nov 24, 2020
santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021
…net#5925)

* Change back the mtime changed by applying patch

* Fix bug

* Fix bug

* Use the grep or pattern instead to call a new grep command
Copy link
Contributor

Choose a reason for hiding this comment

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

I find an issue that if I modify a file in a submodule, the corresponding packages could not be rebuilt. Eg, src/sonic-swss/cfgmgr/portmgr.cpp is modified,and make swss.deb will not be rebuilt, only swss.smdep and swss.smdep.smsha update, swss.dep is not touched, so target of swss.deb will not be executed.

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.

5 participants