From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH XEN] Config: Switch to unified qemu trees. Date: Thu, 17 Sep 2015 10:37:43 +0100 Message-ID: <1442482663-32437-1-git-send-email-ian.campbell@citrix.com> References: <1442482630.18856.145.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1442482630.18856.145.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com, xen-devel@lists.xen.org, stefano.stabellini@eu.citrix.com Cc: wei.liu2@citrix.com, Ian Campbell List-Id: xen-devel@lists.xenproject.org Upstream qemu is not in qemu-xen.git and the trad fork is in qemu-xen-traditional.h 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 (cherry picked from commit dff5c395c1d23c21238ce17ddcd6f7abe2efd08d) Conflicts: Config.mk --- Config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 9936090..1b559b0 100644 --- a/Config.mk +++ b/Config.mk @@ -242,13 +242,13 @@ 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.5-testing.git -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.5-testing.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 else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.5-testing.git -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.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 endif OVMF_UPSTREAM_REVISION ?= cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd -- 2.1.4