cr-daily-branch: use "linux-arm-xen" for arm tests unless this is a linux branch

diff --git a/cr-daily-branch b/cr-daily-branch
index cd141d37de5d5cccaa7fa7b7ad2f2750e42f2dde..3f109c0330ffb289fcd17eb525833ee5d9832452 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -116,11 +116,12 @@ if [ "x$REVISION_QEMU_UPSTREAM" = x ]; then
         export REVISION_QEMU_UPSTREAM
 fi
 if [ "x$REVISION_LINUX" = x ]; then
-       determine_version REVISION_LINUX $linuxbranch LINUX
+       determine_version REVISION_LINUX ${linuxbranch-linux} LINUX
         export REVISION_LINUX
 fi
 if [ "x$REVISION_LINUX_ARM" = x ]; then
-       determine_version REVISION_LINUX_ARM $linuxbranch LINUX_ARM
+       determine_version REVISION_LINUX_ARM ${linuxbranch-linux-arm-xen} \
+               LINUX_ARM
         export REVISION_LINUX_ARM
 fi
 if [ "x$REVISION_LINUXFIRMWARE" = x ]; then

diff --git a/cri-common b/cri-common
index 0aa3e89061c2143aed474b409185f935e968615f..c8ac311fb2a28cfc51d5d8f100be91c4736c4c77 100644 (file)
--- a/cri-common
+++ b/cri-common
@@ -47,7 +47,7 @@ select_xenbranch () {
        if [ "x$tree" = xlinux ]; then
                linuxbranch=$branch
        else
-               linuxbranch=linux
+               linuxbranch=''
        fi
 }