Backport zephyr and SOF.version fixes to adl-004-drop-stable, same as stable-v2.0#5831
Merged
lgirdwood merged 6 commits intoMay 18, 2022
Merged
Conversation
Align with xtensa-build-all.sh and add a "-v" option to toggle
verbose build log ("west -v build").
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
(cherry picked from commit b95d995)
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Same -u option as the new Python script. We need this for the new sof/stable-v2.1 branch on https://github.com/thesofproject/zephyr while our CI has not entirely switched to the python script yet. Signed-off-by: Marc Herbert <marc.herbert@intel.com> (cherry picked from commit 177e18f)
This reverts commit b678a4d because it's hardcoding the zephyr version real hard. Instead, merely change the default value. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
The brand new sof/stable-v2.0 branch has (for now) only these two commits that restore compatibility with the 0.14.0 Zephyr SDK and the latest zephyr-build container 51d2a25590cc "Revert cmake: Zephyr sdk backward compatibility with 0.11.1 and 0.11.2" af345ec33aa2 (sof/sof/stable-v2.0) cmake: remove xtensa workaround in Zephyr toolchain code. See longer story in review thesofproject#5654 for commit 7ec25f1 Signed-off-by: Marc Herbert <marc.herbert@intel.com> (cherry picked from commit f8486cc)
There's frequent confusion between image ID and image digest: display both. Show both sof and thesofproject/sof. Use set -x to display the full command that is run. Signed-off-by: Marc Herbert <marc.herbert@intel.com> (cherry picked from commit f79d234)
Some conflicts because this branch does not have the new
xtensa-build-zephyr.py, it still uses xtensa-build-zephyr.sh
This fixes SOF version.cmake which was just broken by a recent git
security update and started to fail like this:
```
-- SOF version.cmake starting at 2022-04-25T18:14:56Z UTC
-- /workdir/zephyr/.. is at git commit with parent(s):
fatal: unsafe repository ('/workdir' is owned by someone else)
To add an exception for this directory, call:
git config --global --add safe.directory /workdir
```
(example at https://github.com/thesofproject/sof/runs/6162885265)
chgrp -R was always an ugly hack because it was messing with
(persistent) file permissions on the host, outside the container. This
new adduser solution is unfortunately much more code but it does not
leak any side effect outside the container.
Do not fix scripts/docker-run.sh yet because there is still no UID
mismatch between Github Actions and the SOF container (they're both
1001) but add a warning + TODO.
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
(cherry picked from commit d09844a)
Collaborator
Author
|
Zephyr builds failed in https://sof-ci.01.org/sofpr/PR5831/build390/build/ because sof-ci/jenkins ignores the default zephyr version, always uses the zephyr main branch. Known internal issue 215 Zephyr build in https://github.com/thesofproject/sof/runs/6461188193?check_suite_focus=true is fixed (which is the entire purpose of this PR). |
lgirdwood
approved these changes
May 18, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Clean cherry--picks, same as https://github.com/thesofproject/sof/commits/stable-v2.0/scripts
See longer story in review #5654 for commit 7ec25f1
IMPORTANT: this "unharcodes" the Zephyr version, switches to an SOF branch. See commit message of "xtensa-build-zephyr.sh: switch to new Zephyr branch sof/stable-v2.0"