ts-xen-build: only enable xend for x86 builds

diff --git a/make-flight b/make-flight
index 14b20375840f31047c6e16e16248bb7cf67f34eb..070fba361c62d416cd3e3fd40b1a24c994807387 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -72,6 +72,11 @@ if [ x$buildflight = x ]; then
         suite_runvars=
     fi
 
+    case "$arch" in
+    i386|amd64) enable_xend=true;;
+    *) enable_xend=false;;
+    esac
+
     eval "
        arch_runvars=\"\$ARCH_RUNVARS_$arch\"
     "
@@ -79,7 +84,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                                                   \
+               arch=$arch enable_xend=$enable_xend                                                  \
        tree_qemu=$TREE_QEMU         \
        tree_qemuu=$TREE_QEMU_UPSTREAM       \
        tree_xen=$TREE_XEN                   \

diff --git a/ts-xen-build b/ts-xen-build
index f0ea8ca8753c457cba22e812915ab070506ad54b..8a905f50f4145b0dd569f7dfe9b759092c89b939 100755 (executable)
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -124,13 +124,15 @@ sub build () {
                 print "setopt CONFIG_DEBUG_INFO y\\n" or die \$!;
         ' buildconfigs/enable-xen-config
 END
+    my $xend_opt= $r{enable_xend} =~ m/true/ ? "--enable-xend" : "--disable-xend";
+
     buildcmd_stamped_logged(300, 'configure', <<END,<<END,<<END);
             if test -f configure; then
-                if grep -q -- --enable-xend tools/configure ; then
-                    enable_xend=--enable-xend
+                if grep -q -- $xend_opt tools/configure ; then
+                   xend=$xend_opt
                 fi
 END
-                ./configure --sysconfdir=/etc \$enable_xend
+                ./configure --sysconfdir=/etc \$xend
 END
             fi
 END