From: Ian Campbell Date: Thu, 10 Sep 2015 13:31:34 +0000 (+0100) Subject: Config: Switch to unified qemu trees. X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=aad8158460384bba77ad6f131f0ef693eee3e618;p=xen.git Config: Switch to unified qemu trees. Upstream qemu is now in qemu-xen.git and the trad fork is in qemu-xen-traditional.git. QEMU_UPSTREAM_REVISION is currently a tag and QEMU_TRADITIONAL_REVISION is a specific revision, so no changes are required to those. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Conflicts: Config.mk Signed-off-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 78833c04250416f1870c458309d3ac0e5cf915fd) Conflicts: Config.mk (cherry picked from commit 0cabed0a0b322fbef30f3519465538df4ab1d9f2) Conflicts: Config.mk (cherry picked from commit 602506b3efa8ddeae2976ec9f15d91366f823919) Conflicts: Config.mk --- diff --git a/Config.mk b/Config.mk index 0aaed5f44b..10bd71ce51 100644 --- a/Config.mk +++ b/Config.mk @@ -197,18 +197,18 @@ XEN_EXTFILES_URL=http://xenbits.xen.org/xen-extfiles # near the place in the Xen Makefiles where the file is used. ifeq ($(GIT_HTTP),y) -QEMU_REMOTE=http://xenbits.xen.org/git-http/qemu-xen-4.3-testing.git +QEMU_REMOTE ?= http://xenbits.xen.org/git-http/qemu-xen-traditional.git else -QEMU_REMOTE=git://xenbits.xen.org/qemu-xen-4.3-testing.git +QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-traditional.git endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.3-testing.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-xen.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.3-testing.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-xen.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871