Skip to content

stable-v2.0: set default value instead of hardcoding Zephyr commit - #5672

Merged
lgirdwood merged 3 commits into
thesofproject:stable-v2.0from
marc-hb:unhardcode-z2.0
Apr 21, 2022
Merged

lgirdwood merged 3 commits into
thesofproject:stable-v2.0from
marc-hb:unhardcode-z2.0

Conversation

@marc-hb

@marc-hb marc-hb commented Apr 8, 2022

Copy link
Copy Markdown
Collaborator

2 clean cherry-picks from main + unhardcoding the Zephyr commit. Review commits separately.

Zero functional change when you don't (try to) pass a zephyr commit on the command line.

kv2019i and others added 2 commits April 8, 2022 14:45
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)
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)
@marc-hb

marc-hb commented Apr 8, 2022

Copy link
Copy Markdown
Collaborator Author

This is a preliminary step before fixing stable-v2.0 compatibility with the latest Zephyr SDK, long story in #5654

@marc-hb
marc-hb requested review from keqiaozhang and kv2019i April 8, 2022 22:17
@marc-hb

marc-hb commented Apr 8, 2022 •

Copy link
Copy Markdown
Collaborator Author

https://github.com/thesofproject/sof/runs/5892208159 shows the expected Zephyr commit fd089b361d8aebbcb49cca989444aaeb0b6fbb4d

However https://sof-ci.01.org/sofpr/PR5672/build12674/build/tgl_zph.txt shows the most Zephyr commit c11b7852d15c29

[2/258] Generating include/generated/version.h
-- Zephyr version: 3.0.99 (/srv/home/jenkins/workspace/sof_generic_build/zephyrproject/zephyr), build: c11b7852d15c

@keqiaozhang can you please restrict your (very useful) "STABLE Zephyr cooldown" to the main SOF branch? It should not apply to other SOF branches.

Same problem as with the stable-v2.1 branch, example: https://sof-ci.01.org/sofpr/PR5551/build12426/build/tgl_zph.txt

@marc-hb

marc-hb commented Apr 12, 2022 •

Copy link
Copy Markdown
Collaborator Author

https://sof-ci.01.org/sof-pr-viewer/#/build/PR5672/build9070849 failed with make: *** No rule to make target 'tigerlake_ipc4_overridedefconfig'. Stop. That was not a Zephyr build so it's unrelated.

In https://sof-ci.01.org/sofpr/PR5672/build12674/devicetest/ , ZEPHYR configurations had many failures and non-Zephyr failures had none. This is likely because this was using the most current Zephyr branch instead of fd089b361d8aeb as explained above.

Everything else passed.

EDIT: same failures in https://sof-ci.01.org/sof-pr-viewer/#/build/PR5672/build9082199 and https://sof-ci.01.org/sofpr/PR5672/build12688/devicetest/

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>
@sys-pt1s

Copy link
Copy Markdown

Can one of the admins verify this patch?

@marc-hb

marc-hb commented Apr 15, 2022 •

Copy link
Copy Markdown
Collaborator Author

and now I'm not "whitelisted" in https://quickbuild.igk.intel.com/build/9120013. Never a dull moment (PTS-38280)


https://sof-ci.01.org/sof-pr-viewer/#/build/PR5672/build9086308 failed with

make: *** No rule to make target 'tigerlake_ipc4_overridedefconfig'.  Stop.

That likely means that CI cannot support this stable branch which is too old to have IPC4

@lgirdwood

Copy link
Copy Markdown
Member

@marc-hb yeah, CI does not fully support and work on older branches. Happy to merge if you see it essential since this is all build.

@marc-hb
marc-hb marked this pull request as ready for review April 20, 2022 21:12
@marc-hb

marc-hb commented Apr 20, 2022

Copy link
Copy Markdown
Collaborator Author

OK let's merge this then.

@lgirdwood
lgirdwood merged commit 6ef1af0 into thesofproject:stable-v2.0 Apr 21, 2022
@marc-hb
marc-hb deleted the unhardcode-z2.0 branch April 26, 2022 22:31
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.

4 participants