Skip to content

xtensa-build-zephyr.sh: build against SOF Zephyr stable-v2.1 branch #5519

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.

Sign up for GitHub

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

Closed
kv2019i wants to merge 1 commit into from
Closed

xtensa-build-zephyr.sh: build against SOF Zephyr stable-v2.1 branch #5519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions scripts/xtensa-build-zephyr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ west_init_update()
git clone --depth=5 https://github.com/zephyrproject-rtos/zephyr \
"$WEST_TOP"/zephyr

( cd "$WEST_TOP"/zephyr
set -x
git remote add sof https://github.com/thesofproject/zephyr.git
)

# To keep things simple, this moves to a detached HEAD even when
# init_ref is a (remote) branch.
test -z "$init_ref" ||
Expand All @@ -133,6 +138,7 @@ west_init_update()

# zephyr_fetch_and_switch origin pull/38374/head
# zephyr_fetch_and_switch origin 19d5448ec117fde8076bec4d0e61da53147f3315
zephyr_fetch_and_switch sof sof/stable-v2.1
Copy link
Collaborator

@marc-hb marc-hb Mar 11, 2022

Choose a reason for hiding this comment

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

This makes it impossible to clone any other Zephyr version. This hack here was never meant to be merged, only submitted. Let me submit something more flexible today.

Copy link
Collaborator

@marc-hb marc-hb Mar 12, 2022

Choose a reason for hiding this comment

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

Let me submit something more flexible today.

Done in

So the idea is to cherry-pick #5530 to stable-v2.1 once it's merged and then change only 2 lines / 2 default values on top.


# SECURITY WARNING for reviewers: never allow unknown code from
# unknown submitters on any CI system.
Expand Down