Build: Use mirror paths for qemu unless there are patches

Cloning from the working tree is running into build problems saying it
can't find the right changeset, even though the changeset is present
in the working tree.  For now, use the mirror directory.

This needs to be sorted out properly somehow.

Signed-off-by: George Dunlap <george.dunlap@citrix.com>

diff --git a/recipe.go b/recipe.go
index 61341ed1a9c3595401242ec87738c8fc4700349d..09e337ac139fae0f553541f3ea6253e42eedf075 100644 (file)
--- a/recipe.go
+++ b/recipe.go
@@ -456,15 +456,19 @@ func (r *Recipe) Build(prefix string) (err error) {
        config += "OVMF_UPSTREAM_URL ?= file://" + mirrorpath + "ovmf.git\n"
        config += "SEABIOS_UPSTREAM_URL ?= file://" + mirrorpath + "seabios.git\n"
        config += "MINIOS_UPSTREAM_URL ?= file://" + mirrorpath + "mini-os.git\n"
-       config += "QEMU_UPSTREAM_URL ?= file://" + G.repos.XenRepos[TreeQemuU].GetPath() + "\n"
-       config += "QEMU_TRADITIONAL_URL ?= file://" + G.repos.XenRepos[TreeQemuT].GetPath() + "\n"
 
        if tr, prs := r.Recipes[TreeQemuU]; prs && tr.HasPatches() {
+               config += "QEMU_UPSTREAM_URL ?= file://" + G.repos.XenRepos[TreeQemuU].GetPath() + "\n"
                config += "QEMU_UPSTREAM_REVISION = origin/" + branch + "\n"
+       } else {
+               config += "QEMU_UPSTREAM_URL ?= file://" + mirrorpath + "qemu-xen.git\n"
        }
 
        if tr, prs := r.Recipes[TreeQemuT]; prs && tr.HasPatches() {
+               config += "QEMU_TRADITIONAL_URL ?= file://" + G.repos.XenRepos[TreeQemuT].GetPath() + "\n"
                config += "QEMU_TRADITIONAL_REVISION = origin/" + branch + "\n"
+       } else {
+               config += "QEMU_TRADITIONAL_URL ?= file://" + mirrorpath + "qemu-xen-traditional.git\n"
        }
 
        fmt.Printf("Writing config file:\n%s\n", config)