Xen 4.8.0-rc1 preparation

* Change QEMU_UPSTREAM_REVISION MINIOS_UPSTREAM_REVISION and
  QEMU_TRADITIONAL_REVISION to refer to the Xen 4.8.0-rc1 tags.

* Change README and xen/Makefile to refer to Xen 4.8.0-rc (note, the
  RC number is not included, so we do not have to update these again).

I reran autogen.sh as per the release checklist and this produced no
changes, as expected.  (Debian jessie i386.)

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/Config.mk b/Config.mk
index acb7f958eea64cf8b8d3f884489b04fa93c44d4b..3c3ff6895ef7e25ce56a1b1aedb0bdc3defa9b20 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -276,8 +276,8 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= bc54e50e0fe03c570014f363b547426913e92449
-QEMU_UPSTREAM_REVISION ?= master
-MINIOS_UPSTREAM_REVISION ?= e20998fbec0af4d783abb1a0695ab4614064c520
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.8.0-rc1
+MINIOS_UPSTREAM_REVISION ?= xen-4.8.0-rc1
 # Wed Sep 28 11:50:04 2016 +0200
 # minios: fix build issue with xen_*mb defines
 
@@ -288,7 +288,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.9.3
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= c4e0d84d3c92923fdbc7fa922638d54e5e834753
+QEMU_TRADITIONAL_REVISION ?= xen-4.8.0-rc1
 # Tue Jul 26 15:31:59 2016 +0100
 # virtio: error out if guest exceeds virtqueue size
 

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

diff --git a/xen/Makefile b/xen/Makefile
index e989a209ce266108141ded1f5a3e2d45a566c903..c51133026aae5843f2d355d2fac7aa5eacea5d83 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    = 8
-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