Skip to content

Conversation

@marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Mar 10, 2022

EDIT: 2 commits now. see commit messages.

The purpose of this convenience script is to get and build zephyr from SOF, it's not to mess with an existing SOF workspace.

The older shell script had a deprecated convenience hack to clone
submodules before building rimage but _only if submodules were missing_!

While trying to preserve that, the new script changed that to an
unconditional git submodule update that can be destructive when
submodules are already present.

Generally speaking, using git and building must always be two very
distinct activities. No one wants the source code to change quietly from
one build to the next.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb marc-hb marked this pull request as ready for review March 10, 2022 18:53
@marc-hb marc-hb added bug Something isn't working as expected P1 Blocker bugs or important features Zephyr Issues only observed with Zephyr integrated labels Mar 10, 2022
@marc-hb marc-hb requested a review from lgirdwood March 10, 2022 19:26
@marc-hb
Copy link
Collaborator Author

marc-hb commented Mar 10, 2022

The ICL-only "Copy build to DUT" failure in https://sof-ci.01.org/sof-pr-viewer/#/build/PR5514/build8789548 is not a build failure (and likely not a Zephyr failure either). @kkarask could you have a look?

https://sof-ci.01.org/sof-pr-viewer/#/build/PR5514/build8790636 failed the same again.

Same in other PR https://sof-ci.01.org/sof-pr-viewer/#/build/PR5515/build8790824

This script is run from an existing SOF repo that is assumed to be fully
initialized. Updating existing submodules is a potentially destructive
operation.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb marc-hb changed the title xtensa-build-zephyr.py: do not modify submodules after building! xtensa-build-zephyr.py: do not git submodule update Mar 10, 2022
@marc-hb
Copy link
Collaborator Author

marc-hb commented Mar 11, 2022

All failures in https://sof-ci.01.org/sofpr/PR5514/build12312/devicetest/ are known, filed and unrelated to this PR

Copy link
Contributor

@aborisovich aborisovich left a comment

Choose a reason for hiding this comment

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

Thank you @marc-hb - this not-needed submodule update gave us integration troubles.

@kkarask
Copy link

kkarask commented Mar 11, 2022

Yes, it was platform related issue. Rerun passed.

@lgirdwood lgirdwood merged commit 0ee59c3 into thesofproject:main Mar 11, 2022
@marc-hb marc-hb deleted the destructive-submodule-update branch March 14, 2022 23:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working as expected P1 Blocker bugs or important features Zephyr Issues only observed with Zephyr integrated

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants