cr-daily-branch: Actually use Linux 6.1 by default on Arm
PATCH 1/1 cr-daily-branch: Actually use Linux 6.1 by default on Arm
Commit 95ee1714750b wasn't effective at changing the default version of Linux, osstest kept on using "linux-arm-xen".
This time, make osstest use the same revision for both LINUX and LINUX_ARM, like it was done for "linux*" branches only before.
If for some reason $BASE_TAG_LINUX and $BASE_TAG_LINUX_ARM are different, this change would be wrong, but there's shouldn't be a need for them to be different.
Fixes 95ee1714750b ("ap-common: Switch to Linux 6.1 by default on Arm")
Signed-off-by Anthony PERARD <[email protected]>
---
Notes:
Already pushed.
ap-common | 2 +- cr-daily-branch | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-)
ap-common +1 -1
@@ -60,7 +60,7 @@ : ${PUSH_TREE_LINUX:=$XENBITS:/home/xen/git/linux-pvops.git} : ${BASE_TREE_LINUX:=git://xenbits.xen.org/linux-pvops.git} : ${BASE_TAG_LINUX:=tested/linux-6.1} -: ${BASE_TAG_LINUX_ARM:=tested/linux-6.1} +: ${BASE_TAG_LINUX_ARM:=${BASE_TAG_LINUX}} if [ "x${TREE_LINUX}" = x ]; then : ${TREE_LINUX:=${BASE_TREE_LINUX}}
cr-daily-branch +4 -10
@@ -186,16 +186,10 @@ if [ "x$REVISION_LINUX" = x ]; then export REVISION_LINUX fi if [ "x$REVISION_LINUX_ARM" = x ]; then - if [ "x$tree" = "xlinux" ] ; then - TREE_LINUX_ARM=$TREE_LINUX - export TREE_LINUX_ARM - REVISION_LINUX_ARM=$REVISION_LINUX - export REVISION_LINUX_ARM - else - determine_version REVISION_LINUX_ARM ${linuxbranch:-linux-arm-xen} \ - LINUX_ARM - export REVISION_LINUX_ARM - fi + TREE_LINUX_ARM=$TREE_LINUX + export TREE_LINUX_ARM + REVISION_LINUX_ARM=$REVISION_LINUX + export REVISION_LINUX_ARM fi if [ "x$REVISION_SEABIOS" = x ]; then case "$branch" in
Signature · 1 line
Anthony PERARD