libvirt build: Set make_njobs=1 except when testing libvirt

libvirt has a -j bug.  This is allegedly going to be fixed in upstream
RSN ?  Anyway, for now, serialise all the builds on other branches so
they are not affected.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/mfi-common b/mfi-common
index 9b6c94704238dfa1a93acad54cf49ab56f3f6577..baf5380d9d2b97cc3803756883bb9abd76f97411 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -356,11 +356,17 @@ create_build_jobs () {
 
     if [ "x$REVISION_LIBVIRT" != xdisable ]; then
 
+    libvirt_build_runvars=''
+    case "$branch" in
+    libvirt*) ;;
+    *)        libvirt_build_runvars+=" make_njobs=1";;
+    esac
+
     job_create_build build-$arch-libvirt build-libvirt                       \
                 arch=$arch                                                   \
         tree_xen=$TREE_XEN                                                   \
                 $RUNVARS $BUILD_RUNVARS $BUILD_LIBVIRT_RUNVARS $arch_runvars \
-                $hostos_runvars                                              \
+                $hostos_runvars $libvirt_build_runvars                       \
                 host_hostflags=$build_hostflags                              \
                 buildjob=${bfi}build-$arch                                   \
                 tree_libvirt=$TREE_LIBVIRT revision_libvirt=$REVISION_LIBVIRT\