ts-xen-build: Do not set QEMU_REMOTE unless $r{tree_qemu} is set

4.4 and earlier do not check if QEMU_REMOTE is empty before using it.
From 4.5 onwards if QEMU_REMOTE is empty then default is used.

This should fix the build-*-prev job for 4.5 and earlier. In this job
we deliberately don't specify tree_qemu since we want whatever
that branch gives us.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/ts-xen-build b/ts-xen-build
index cebfaf34a15e876b14c451166104937c4c5ea394..b02e73768df18ef214b578ccaf0d2e0f76a72b7d 100755 (executable)
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -52,11 +52,13 @@ sub checkout () {
        echo >>.config debug=$debug_build
        echo >>.config GIT_HTTP=y
        echo >>.config LIBLEAFDIR_x86_64=lib
-       echo >>.config QEMU_REMOTE='$r{tree_qemu}'
        echo >>.config KERNELS=''
 END
                (nonempty($r{enable_xsm}) ? <<END : '').
        echo >>.config XSM_ENABLE='${build_xsm}'
+END
+               (nonempty($r{tree_qemu}) ? <<END : '').
+       echo >>.config QEMU_REMOTE='$r{tree_qemu}'
 END
                (nonempty($r{revision_qemu}) ? <<END : '').
        echo >>.config QEMU_TAG='$r{revision_qemu}'