OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xtensa-build-zephyr.sh: add new -u zephyr_remote option 

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>
This commit is contained in:
Marc Herbert 2022-03-11 22:49:17 -08:00 committed by Liam Girdwood
parent 901d3947b8
commit 177e18f701
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/xtensa-build-zephyr.sh
View File

@ -57,6 +57,9 @@ usage: $0 [options] [ platform(s) ] [ -- cmake arguments ]
Incompatible with -p. To stop after downloading Zephyr, do not Incompatible with -p. To stop after downloading Zephyr, do not
pass any platform or cmake argument. pass any platform or cmake argument.
-u Initial Zephyr remote for the -c option. Default value:
https://github.com/zephyrproject-rtos/zephyr
-z Initial Zephyr git ref for the -c option. Can be a branch, tag, -z Initial Zephyr git ref for the -c option. Can be a branch, tag,
full SHA1 in a fork, magic pull/12345/merge,... anything as long as full SHA1 in a fork, magic pull/12345/merge,... anything as long as
it is fetchable from https://github.com/zephyrproject-rtos/zephyr/ it is fetchable from https://github.com/zephyrproject-rtos/zephyr/
@ -111,18 +114,26 @@ zephyr_fetch_and_switch()
# link back to sof/ # link back to sof/
west_init_update() west_init_update()
{ {
local init_ref="$1" # Default Zephyr remote and branch if nothing passed on the
# command line.
local init_remote="${1:-https://github.com/zephyrproject-rtos/zephyr}"
# Or, we could have a default value: # This can be a branch, a 40-digit SHA or empty to fetch the
# init_ref=${1:-811a09bd8305} # default branch. Example:
# local init_ref=${2:-sof/stable-v2.1}
local init_ref="$2"
git clone --depth=5 https://github.com/zephyrproject-rtos/zephyr \ # git fetch accepts anything, even 40-digits SHA but git clone is
"$WEST_TOP"/zephyr # less flexible. So we git clone the default branch first to get
# started and then we switch to any 'z_ref' thanks to git fetch.
( set -x
git clone --depth=5 "$init_remote" "$WEST_TOP"/zephyr
)
# To keep things simple, this moves to a detached HEAD even when # To keep things simple, this moves to a detached HEAD even when
# init_ref is a (remote) branch. # init_ref is a (remote) branch.
test -z "$init_ref" || test -z "$init_ref" ||
zephyr_fetch_and_switch origin "${init_ref}" zephyr_fetch_and_switch "${init_remote}" "${init_ref}"
# This shows how to point CI at any Zephyr commit from anywhere # This shows how to point CI at any Zephyr commit from anywhere
# and to run all tests on it. Simply edit remote and reference, # and to run all tests on it. Simply edit remote and reference,
@ -302,14 +313,15 @@ build_platforms()
parse_args() parse_args()
{ {
local zeproj local zeproj
unset zephyr_ref unset zephyr_remote zephyr_ref
local OPTIND=1 local OPTIND=1
# Parse -options # Parse -options
while getopts "acz:j:k:p:v" OPTION; do while getopts "acu:z:j:k:p:v" OPTION; do
case "$OPTION" in case "$OPTION" in
a) PLATFORMS=("${DEFAULT_PLATFORMS[@]}") ;; a) PLATFORMS=("${DEFAULT_PLATFORMS[@]}") ;;
c) DO_CLONE=yes ;; c) DO_CLONE=yes ;;
u) zephyr_remote="$OPTARG" ;;
z) zephyr_ref="$OPTARG" ;; z) zephyr_ref="$OPTARG" ;;
j) BUILD_JOBS="$OPTARG" ;; j) BUILD_JOBS="$OPTARG" ;;
k) RIMAGE_KEY_OPT="$OPTARG" ;; k) RIMAGE_KEY_OPT="$OPTARG" ;;
@ -328,8 +340,8 @@ parse_args()
die 'Cannot use -p with -c, -c supports %s only' "${SOF_TOP}/zephyrproject" die 'Cannot use -p with -c, -c supports %s only' "${SOF_TOP}/zephyrproject"
fi fi
if [ -n "$zephyr_ref" ] && [ -z "$DO_CLONE" ]; then if [ -n "$zephyr_remote" -o -n "$zephyr_ref" ] && [ -z "$DO_CLONE" ]; then
die '%s' '-z without -c makes no sense' die '%s' '-u or -z without -c makes no sense'
fi fi
if [ -n "$zeproj" ]; then if [ -n "$zeproj" ]; then
@ -407,7 +419,7 @@ see https://docs.zephyrproject.org/latest/getting_started/index.html"
# Resolve symlinks # Resolve symlinks
mkdir "$zep"; WEST_TOP=$( cd "$zep" && /bin/pwd ) mkdir "$zep"; WEST_TOP=$( cd "$zep" && /bin/pwd )
west_init_update "${zephyr_ref}" west_init_update "${zephyr_remote}" "${zephyr_ref}"
else else
# Look for Zephyr and define WEST_TOP # Look for Zephyr and define WEST_TOP