make-flight et al: support linux-arm-xen

diff --git a/ap-common b/ap-common
index 7aa909e3ad17f6b096af4627323074ed0c035562..683e95844982811bf114aca2d1b53cd3bc59cdb4 100644 (file)
--- a/ap-common
+++ b/ap-common
@@ -40,11 +40,16 @@
 : ${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-3.4}
+: ${BASE_TAG_LINUX_ARM:=tested/linux-arm-xen}
 
 if [ "x${TREE_LINUX}" = x ]; then
        : ${TREE_LINUX:=${BASE_TREE_LINUX}}
        : ${DEFAULT_REVISION_LINUX:=${BASE_TAG_LINUX}}
 fi
+if [ "x${TREE_LINUX_ARM}" = x ]; then
+       : ${TREE_LINUX_ARM:=${BASE_TREE_LINUX}}
+       : ${DEFAULT_REVISION_LINUX_ARM:=${BASE_TAG_LINUX_ARM}}
+fi
 
 : ${TREE_LINUX2639:=${KERNEL_SCM}/konrad/xen.git}
 : ${TAG_LINUX2639:=stable/2.6.39.x}
@@ -67,6 +72,10 @@ info_linux_tree () {
                : ${TREE_LINUX_THIS:=${KERNEL_SCM}/stable/linux-stable.git}
                : ${TAG_LINUX_THIS:=linux-3.0.y}
                ;;
+       linux-arm-xen)
+               : ${TREE_LINUX_THIS:=${KERNEL_SCM}/sstabellini/xen.git}
+               : ${TAG_LINUX_THIS:=linux-arm-xen}
+               ;;
        linux-3.*)
                : ${TREE_LINUX_THIS:=${KERNEL_SCM}/stable/linux-stable.git}
                : ${TAG_LINUX_THIS:=$1.y}

diff --git a/cr-daily-branch b/cr-daily-branch
index 81ab24583708895f1f13e4b98e5c4def16feab6a..cd141d37de5d5cccaa7fa7b7ad2f2750e42f2dde 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -119,6 +119,10 @@ if [ "x$REVISION_LINUX" = x ]; then
        determine_version REVISION_LINUX $linuxbranch LINUX
         export REVISION_LINUX
 fi
+if [ "x$REVISION_LINUX_ARM" = x ]; then
+       determine_version REVISION_LINUX_ARM $linuxbranch LINUX_ARM
+        export REVISION_LINUX_ARM
+fi
 if [ "x$REVISION_LINUXFIRMWARE" = x ]; then
        determine_version REVISION_LINUXFIRMWARE linuxfirmware
         export REVISION_LINUXFIRMWARE

diff --git a/make-flight b/make-flight
index c1bfef6ca2a0565248491a6d8f9c803d2a6965a0..0505d6c09f0558e2f1407610a0bae051554d541f 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -29,8 +29,6 @@ flight=`./cs-flight-create $blessing $branch`
 . ap-common
 . cri-common
 
-: ${REVISION_LINUX:=${DEFAULT_REVISION_LINUX}}
-
 suite=`getconfig DebianSuite`
 
 xenrt_images=/usr/groups/images/autoinstall
@@ -46,6 +44,16 @@ if [ x$buildflight = x ]; then
       case "$xenbranch" in
       3.*|4.0|4.1|4.2) continue;;
       esac
+      pvops_kernel="
+       tree_linux=$TREE_LINUX_ARM
+       revision_linux=${REVISION_LINUX_ARM-${DEFAULT_REVISION_LINUX_ARM}}
+      "
+      ;;
+    *)
+      pvops_kernel="
+       tree_linux=$TREE_LINUX
+       revision_linux=${REVISION_LINUX-${DEFAULT_REVISION_LINUX}}
+      "
       ;;
     esac
 
@@ -73,9 +81,8 @@ if [ x$buildflight = x ]; then
                host_hostflags=$build_hostflags    \
                xen_kernels=linux-2.6-pvops                                  \
                revision_xen=$REVISION_XEN                                   \
-               tree_linux=$TREE_LINUX                                       \
+               $pvops_kernel                                           \
                ${TREEVCS_LINUX:+treevcs_linux=}${TREEVCS_LINUX}        \
-               revision_linux=$REVISION_LINUX                          \
                tree_linuxfirmware=$TREE_LINUXFIRMWARE                       \
                revision_linuxfirmware=$REVISION_LINUXFIRMWARE