From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 24 Oct 2014 14:22:40 +0000 (-0400)
Subject: Xen 4.5.0-rc1: Update tag for both QEMU trees.
X-Git-Tag: 4.5.0-rc1^0
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1b068a5b485062c862c20d8ba7674faa97ee3714;p=people%2Fpauldu%2Fxen.git

Xen 4.5.0-rc1: Update tag for both QEMU trees.

And change 'unstable' to 'rc1'.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/Config.mk b/Config.mk
index 632423757c..a5b6c41c78 100644
--- a/Config.mk
+++ b/Config.mk
@@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
-QEMU_UPSTREAM_REVISION ?= master
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc1
 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5
 # Thu May 22 16:59:16 2014 -0400
 # python3 fixes for vgabios and csm builds.
@@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= b0d42741f8e9a00854c3b3faca1da84bfc69bf22
+QEMU_TRADITIONAL_REVISION ?= xen-4.5.0-rc1
 # Mon Oct 6 16:24:46 2014 +0100
 # qemu-xen-trad: Switch to $(LIBEXEC_BIN) from $(LIBEXEC)
 
diff --git a/xen/Makefile b/xen/Makefile
index 28b4b79893..bd2fa18223 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -2,7 +2,7 @@
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
 export XEN_SUBVERSION    = 5
-export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= -rc1$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version