From e08f3834c2f375153f104c827dd7c2fea93b288e Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 10 Sep 2015 14:31:34 +0100 Subject: [PATCH] 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 --- Config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index b9a37d9206..114db9acfd 100644 --- a/Config.mk +++ b/Config.mk @@ -242,14 +242,14 @@ 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-unstable.git -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-xen.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git MINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/mini-os.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-xen.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -- 2.39.5