[PATCH RFC V2 2/6] Build OVMF for Xen-unstable

[Wei Liu <wei.liu2@citrix.com>]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 make-flight  |   10 +++++++++-
 ts-xen-build |    6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/make-flight b/make-flight
index 65e3abc..8d900e2 100755
--- a/make-flight
+++ b/make-flight
@@ -88,6 +88,14 @@ if [ x$buildflight = x ]; then
     *) enable_xend=false;;
     esac
 
+    case "$xenbranch" in
+    xen-3.*-testing) enable_ovmf=false;;
+    xen-4.0-testing) enable_ovmf=false;;
+    xen-4.1-testing) enable_ovmf=false;;
+    xen-4.2-testing) enable_ovmf=false;;
+    *) enable_ovmf=true;
+    esac
+
     eval "
 	arch_runvars=\"\$ARCH_RUNVARS_$arch\"
     "
@@ -95,7 +103,7 @@ if [ x$buildflight = x ]; then
     build_hostflags=share-build-$suite-$arch,arch-$arch,suite-$suite,purpose-build
 
     ./cs-job-create $flight build-$arch build				     \
-		arch=$arch enable_xend=$enable_xend						     \
+		arch=$arch enable_xend=$enable_xend enable_ovmf=$enable_ovmf	     \
 	tree_qemu=$TREE_QEMU	     \
 	tree_qemuu=$TREE_QEMU_UPSTREAM	     \
 	tree_xen=$TREE_XEN		     \
diff --git a/ts-xen-build b/ts-xen-build
index ebb7d6f..74d17f0 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -125,14 +125,18 @@ sub build () {
         ' buildconfigs/enable-xen-config
 END
     my $xend_opt= $r{enable_xend} =~ m/true/ ? "--enable-xend" : "--disable-xend";
+    my $ovmf_opt= $r{enable_ovmf} =~ m/true/ ? "--enable-ovmf" : "--disable-ovmf";
 
     buildcmd_stamped_logged(300, 'configure', <<END,<<END,<<END);
             if test -f configure; then
                 if grep -q -- $xend_opt tools/configure ; then
 		    xend=$xend_opt
                 fi
+                if grep -q -- $ovmf_opt tools/configure ; then
+                    ovmf=$ovmf_opt
+                fi
 END
-                ./configure --sysconfdir=/etc \$xend
+                ./configure --sysconfdir=/etc \$xend \$ovmf
 END
             fi
 END
-- 
1.7.10.4