Final touches for Xen 4.7.0-rc1

* Update README and xen/Makefile to "Xen 4.7-rc"
* Fix QEMU_UPSTREAM_REVISION to a tag, so we get a specific commit

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Config.mk b/Config.mk
index 79321dc51fbe2269da2d77b019edf4fffc431180..ddedeaab94340919c92f6f05f12846ba95859878 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -271,7 +271,7 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-QEMU_UPSTREAM_REVISION ?= master
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.7.0-rc1
 MINIOS_UPSTREAM_REVISION ?= e085b7e5613576601e2f100e6f1ee9e0778c3eb9
 # Sun Apr 10 00:46:32 2016 +0200
 # Fix time update

diff --git a/README b/README
index a95eed042f4f0a7bc3032dafef8587ebd924a2fb..d3f432a869dc6d423b9d13c71c990ed4a05de4f0 100644 (file)
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
 #################################
-__  __            _  _   _____                     _        _     _
-\ \/ /___ _ __   | || | |___  |    _   _ _ __  ___| |_ __ _| |__ | | ___
- \  // _ \ '_ \  | || |_   / /____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
- /  \  __/ | | | |__   _| / /_____| |_| | | | \__ \ || (_| | |_) | |  __/
-/_/\_\___|_| |_|    |_|(_)_/       \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
-
+__  __            _  _   _____              
+\ \/ /___ _ __   | || | |___  |    _ __ ___ 
+ \  // _ \ '_ \  | || |_   / /____| '__/ __|
+ /  \  __/ | | | |__   _| / /_____| | | (__ 
+/_/\_\___|_| |_|    |_|(_)_/      |_|  \___|
+                                            
 #################################
 
 http://www.xen.org/

diff --git a/xen/Makefile b/xen/Makefile
index f49014b6b2ed3a4b2d9e54ccb074f7bbb7e6bc67..0d5f240edbb3f3c6af91f846ccc46097811b9284 100644 (file)
--- 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    = 7
-export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version