diff mbox series

[1/2] Branching: Update version files etc. for newly unstable

Message ID 20210324162831.7587-1-iwj@xenproject.org (mailing list archive)
State New, archived
Headers show
Series [1/2] Branching: Update version files etc. for newly unstable | expand

Commit Message

Ian Jackson March 24, 2021, 4:28 p.m. UTC 
Signed-off-by: Ian Jackson <iwj@xenproject.org>
---
 CHANGELOG.md |  2 ++
 Config.mk    |  4 ++--
 README       | 16 ++++++++--------
 SUPPORT.md   |  2 +-
 xen/Makefile |  4 ++--
 5 files changed, 15 insertions(+), 13 deletions(-)

Comments

Jan Beulich March 24, 2021, 4:46 p.m. UTC | #1 
On 24.03.2021 17:28, Ian Jackson wrote:
> --- a/xen/Makefile
> +++ b/xen/Makefile
> @@ -1,8 +1,8 @@
>  # This is the correct place to edit the build version.
>  # All other places this is stored (eg. compile.h) should be autogenerated.
>  export XEN_VERSION       = 4
> -export XEN_SUBVERSION    = 15
> -export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION)
> +export XEN_SUBVERSION    = 16
> +export XEN_EXTRAVERSION ?= -unstable-rc$(XEN_VENDORVERSION)

I suppose you didn't mean to leave "-rc" in there?

Jan
Ian Jackson March 26, 2021, 11:44 a.m. UTC | #2 
Jan Beulich writes ("Re: [PATCH 1/2] Branching: Update version files etc. for newly unstable"):
> I suppose you didn't mean to leave "-rc" in there?

You are right.  I will fix it in a moment.

Ian.
Ian Jackson March 26, 2021, 11:46 a.m. UTC | #3 
Ian Jackson writes ("Re: [PATCH 1/2] Branching: Update version files etc. for newly unstable"):
> Jan Beulich writes ("Re: [PATCH 1/2] Branching: Update version files etc. for newly unstable"):
> > I suppose you didn't mean to leave "-rc" in there?
> 
> You are right.  I will fix it in a moment.

Oh Andy already did so.  Thanks,

Ian.
diff mbox series

Patch

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c407f6bb2f..f76fadf8c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@  Notable changes to Xen will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## [unstable UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD
+
 ## [4.15.0 UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.15.0) - TBD
 
 ## Added / support upgraded
diff --git a/Config.mk b/Config.mk
index a56a971028..9a174c77f3 100644
--- a/Config.mk
+++ b/Config.mk
@@ -244,7 +244,7 @@  QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
-OVMF_UPSTREAM_REVISION ?= a3741780fe3535e19e02efa869a7cac481891129
+OVMF_UPSTREAM_REVISION ?= master
 QEMU_UPSTREAM_REVISION ?= 7ea428895af2840d85c524f0bd11a38aac308308
 MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5
 
@@ -253,7 +253,7 @@  SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= xen-4.15.0-rc1
+QEMU_TRADITIONAL_REVISION ?= 3d273dd05e51e5a1ffba3d98c7437ee84e8f8764
 # Wed Jul 15 10:01:40 2020 +0100
 # qemu-trad: remove Xen path dependencies
 
diff --git a/README b/README
index aa8b4fe126..fad96672af 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@ 
-#################################
- _  _    _ ____
-| || |  / | ___|       _ __ ___
-| || |_ | |___ \ _____| '__/ __|
-|__   _|| |___) |_____| | | (__
-   |_|(_)_|____/      |_|  \___|
-
-#################################
+############################################################
+__  __                                _        _     _
+\ \/ /___ _ __        _   _ _ __  ___| |_ __ _| |__ | | ___
+ \  // _ \ '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
+ /  \  __/ | | |_____| |_| | | | \__ \ || (_| | |_) | |  __/
+/_/\_\___|_| |_|      \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
+
+############################################################
 
 https://www.xen.org/
 
diff --git a/SUPPORT.md b/SUPPORT.md
index a1efd8fcfd..3ef072681b 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -9,7 +9,7 @@  for the definitions of the support status levels etc.
 
 # Release Support
 
-    Xen-Version: 4.15-rc
+    Xen-Version: unstable
     Initial-Release: n/a
     Supported-Until: TBD
     Security-Support-Until: Unreleased - not yet security-supported
diff --git a/xen/Makefile b/xen/Makefile
index 0b97e459e2..ab7d86d226 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -1,8 +1,8 @@ 
 # This is the correct place to edit the build version.
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
-export XEN_SUBVERSION    = 15
-export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION)
+export XEN_SUBVERSION    = 16
+export XEN_EXTRAVERSION ?= -unstable-rc$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version