ap-common, make-flight: use linux base branch by default

In ap-common, when defaulting TREE_LINUX, set DEFAULT_REVISION_LINUX
to the default base branch.  In make-flight, use this to default
REVISION_LINUX if nothing has set it yet.

diff --git a/ap-common b/ap-common
index 6034834dcd35f1324f77ddd04653e0e1341c05e6..4446afa3b8193282f062c30854e1b377447d397e 100644 (file)
--- a/ap-common
+++ b/ap-common
@@ -32,7 +32,6 @@
 : ${KERNEL_SCM:=${GIT_KERNEL_ORG}/pub/scm/linux/kernel/git}
 
 : ${TREEVCS_LINUX:=git}
-: ${TREE_LINUX:=${KERNEL_SCM}/stable/linux-stable.git}
 
 : ${TREE_LINUXFIRMWARE:=git://xenbits.xen.org/osstest/linux-firmware.git}
 : ${PUSH_TREE_LINUXFIRMWARE:=$XENBITS:/home/osstest/ext/linux-firmware.git}
@@ -42,6 +41,11 @@
 : ${BASE_TREE_LINUX:=git://xenbits.xen.org/linux-pvops.git}
 : ${BASE_TAG_LINUX:=tested/linux-3.4}
 
+if [ "x${TREE_LINUX}" = x ]; then
+       : ${TREE_LINUX:=${KERNEL_SCM}/stable/linux-stable.git}
+       : ${DEFAULT_REVISION_LINUX:=${BASE_TAG_LINUX}}
+fi
+
 : ${TREE_LINUX2639:=${KERNEL_SCM}/konrad/xen.git}
 : ${TAG_LINUX2639:=stable/2.6.39.x}
 

diff --git a/make-flight b/make-flight
index d29016dc0de2bbef8d566194e5e64e5c5b93f8fa..0519606060d836eba0bf69e7d6d728d48a568d0a 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -29,6 +29,8 @@ flight=`./cs-flight-create $blessing $branch`
 . ap-common
 . cri-common
 
+: ${REVISION_LINUX:=${DEFAULT_REVISION_LINUX}}
+
 suite=`getconfig DebianSuite`
 
 xenrt_images=/usr/groups/images/autoinstall