Config.mk, etc.: Prepare 4.9.0-rc1

* Update Config.mk REVISION values to refer to relevant tags.
* Update README version number
* Update xen/Makefile version number

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

diff --git a/Config.mk b/Config.mk
index 7a0f94b2f2853d2628f7740058bce1c358a000b0..d01c8320069194b897b8f1f4bb3c08a0447df122 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -268,8 +268,8 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= 5920a9d16b1ab887c2858224316a98e961d71b05
-QEMU_UPSTREAM_REVISION ?= master
-MINIOS_UPSTREAM_REVISION ?= ca013fa9baf92f47469ba1f2e1aaa31c41d8a0bb
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.9.0-rc1
+MINIOS_UPSTREAM_REVISION ?= xen-4.9.0-rc1
 # Tue Dec 13 15:02:02 2016 +0000
 # build: prepend OBJ_DIR to linker script
 
@@ -280,7 +280,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.10.0
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= 8051789e982499050680a26febeada7467e18a8d
+QEMU_TRADITIONAL_REVISION ?= xen-4.9.0-rc1
 # Thu Mar 9 11:14:55 2017 +0000
 # cirrus/vnc: zap drop bitblit support from console code.
 

diff --git a/README b/README
index 76433a9b4154757fe77ec46fbbf7be0fd033ba6d..05e92d0ec873fa54aed2f9af521a605f72535110 100644 (file)
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
 #################################
-__  __            _  _   ___                        _        _     _
-\ \/ /___ _ __   | || | / _ \       _   _ _ __  ___| |_ __ _| |__ | | ___
- \  // _ \ '_ \  | || || (_) |_____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
- /  \  __/ | | | |__   _\__, |_____| |_| | | | \__ \ || (_| | |_) | |  __/
-/_/\_\___|_| |_|    |_|(_)/_/       \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
+__  __            _  _   ___
+\ \/ /___ _ __   | || | / _ \       _ __ ___
+ \  // _ \ '_ \  | || || (_) |_____| '__/ __|
+ /  \  __/ | | | |__   _\__, |_____| | | (__
+/_/\_\___|_| |_|    |_|(_)/_/      |_|  \___|
 
 #################################
 

diff --git a/xen/Makefile b/xen/Makefile
index fcd5c7e9d652498dc5ce82b329c8b23a2e6ea2c6..750bb8a4f46d061fad512b5707f1ac4ecb6f31dc 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    = 9
-export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version