* [PATCH 1/2] Branching: Update version files etc. for newly unstable
@ 2021-03-24 16:28 Ian Jackson
2021-03-24 16:28 ` [PATCH 2/2] Branching: Rerun autoconf to put version right Ian Jackson
2021-03-24 16:46 ` [PATCH 1/2] Branching: Update version files etc. for newly unstable Jan Beulich
0 siblings, 2 replies; 5+ messages in thread
From: Ian Jackson @ 2021-03-24 16:28 UTC (permalink / raw)
To: xen-devel; +Cc: iwj
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(-)
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
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] Branching: Rerun autoconf to put version right
2021-03-24 16:28 [PATCH 1/2] Branching: Update version files etc. for newly unstable Ian Jackson
@ 2021-03-24 16:28 ` Ian Jackson
2021-03-24 16:46 ` [PATCH 1/2] Branching: Update version files etc. for newly unstable Jan Beulich
1 sibling, 0 replies; 5+ messages in thread
From: Ian Jackson @ 2021-03-24 16:28 UTC (permalink / raw)
To: xen-devel; +Cc: iwj
Signed-off-by: Ian Jackson <iwj@xenproject.org>
---
configure | 18 +++++++++---------
docs/configure | 18 +++++++++---------
stubdom/configure | 18 +++++++++---------
tools/configure | 18 +++++++++---------
4 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/configure b/configure
index a2789ae480..62f6c2d47a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.15.
+# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.16.
#
# Report bugs to <xen-devel@lists.xen.org>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Xen Hypervisor'
PACKAGE_TARNAME='xen'
-PACKAGE_VERSION='4.15'
-PACKAGE_STRING='Xen Hypervisor 4.15'
+PACKAGE_VERSION='4.16'
+PACKAGE_STRING='Xen Hypervisor 4.16'
PACKAGE_BUGREPORT='xen-devel@lists.xen.org'
PACKAGE_URL='https://www.xen.org/'
@@ -1236,7 +1236,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Xen Hypervisor 4.15 to adapt to many kinds of systems.
+\`configure' configures Xen Hypervisor 4.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1302,7 +1302,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Xen Hypervisor 4.15:";;
+ short | recursive ) echo "Configuration of Xen Hypervisor 4.16:";;
esac
cat <<\_ACEOF
@@ -1403,7 +1403,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Xen Hypervisor configure 4.15
+Xen Hypervisor configure 4.16
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1420,7 +1420,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Xen Hypervisor $as_me 4.15, which was
+It was created by Xen Hypervisor $as_me 4.16, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2868,7 +2868,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Xen Hypervisor $as_me 4.15, which was
+This file was extended by Xen Hypervisor $as_me 4.16, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2922,7 +2922,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Xen Hypervisor config.status 4.15
+Xen Hypervisor config.status 4.16
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/docs/configure b/docs/configure
index e9c040cb84..569bd4c2ff 100755
--- a/docs/configure
+++ b/docs/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.15.
+# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.16.
#
# Report bugs to <xen-devel@lists.xen.org>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Xen Hypervisor Documentation'
PACKAGE_TARNAME='xen'
-PACKAGE_VERSION='4.15'
-PACKAGE_STRING='Xen Hypervisor Documentation 4.15'
+PACKAGE_VERSION='4.16'
+PACKAGE_STRING='Xen Hypervisor Documentation 4.16'
PACKAGE_BUGREPORT='xen-devel@lists.xen.org'
PACKAGE_URL='https://www.xen.org/'
@@ -1224,7 +1224,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Xen Hypervisor Documentation 4.15 to adapt to many kinds of systems.
+\`configure' configures Xen Hypervisor Documentation 4.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1286,7 +1286,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.15:";;
+ short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.16:";;
esac
cat <<\_ACEOF
@@ -1387,7 +1387,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Xen Hypervisor Documentation configure 4.15
+Xen Hypervisor Documentation configure 4.16
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1404,7 +1404,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Xen Hypervisor Documentation $as_me 4.15, which was
+It was created by Xen Hypervisor Documentation $as_me 4.16, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2821,7 +2821,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Xen Hypervisor Documentation $as_me 4.15, which was
+This file was extended by Xen Hypervisor Documentation $as_me 4.16, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2875,7 +2875,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Xen Hypervisor Documentation config.status 4.15
+Xen Hypervisor Documentation config.status 4.16
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/stubdom/configure b/stubdom/configure
index 6068f58d12..aa48df986d 100755
--- a/stubdom/configure
+++ b/stubdom/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.15.
+# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.16.
#
# Report bugs to <xen-devel@lists.xen.org>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Xen Hypervisor Stub Domains'
PACKAGE_TARNAME='xen'
-PACKAGE_VERSION='4.15'
-PACKAGE_STRING='Xen Hypervisor Stub Domains 4.15'
+PACKAGE_VERSION='4.16'
+PACKAGE_STRING='Xen Hypervisor Stub Domains 4.16'
PACKAGE_BUGREPORT='xen-devel@lists.xen.org'
PACKAGE_URL='https://www.xen.org/'
@@ -1265,7 +1265,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Xen Hypervisor Stub Domains 4.15 to adapt to many kinds of systems.
+\`configure' configures Xen Hypervisor Stub Domains 4.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1331,7 +1331,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.15:";;
+ short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.16:";;
esac
cat <<\_ACEOF
@@ -1444,7 +1444,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Xen Hypervisor Stub Domains configure 4.15
+Xen Hypervisor Stub Domains configure 4.16
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1499,7 +1499,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Xen Hypervisor Stub Domains $as_me 4.15, which was
+It was created by Xen Hypervisor Stub Domains $as_me 4.16, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4295,7 +4295,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Xen Hypervisor Stub Domains $as_me 4.15, which was
+This file was extended by Xen Hypervisor Stub Domains $as_me 4.16, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4349,7 +4349,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Xen Hypervisor Stub Domains config.status 4.15
+Xen Hypervisor Stub Domains config.status 4.16
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/tools/configure b/tools/configure
index bb5acf9d43..99d08a4d81 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.15.
+# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.16.
#
# Report bugs to <xen-devel@lists.xen.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Xen Hypervisor Tools'
PACKAGE_TARNAME='xen'
-PACKAGE_VERSION='4.15'
-PACKAGE_STRING='Xen Hypervisor Tools 4.15'
+PACKAGE_VERSION='4.16'
+PACKAGE_STRING='Xen Hypervisor Tools 4.16'
PACKAGE_BUGREPORT='xen-devel@lists.xen.org'
PACKAGE_URL='https://www.xen.org/'
@@ -1417,7 +1417,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Xen Hypervisor Tools 4.15 to adapt to many kinds of systems.
+\`configure' configures Xen Hypervisor Tools 4.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1483,7 +1483,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.15:";;
+ short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.16:";;
esac
cat <<\_ACEOF
@@ -1693,7 +1693,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Xen Hypervisor Tools configure 4.15
+Xen Hypervisor Tools configure 4.16
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2108,7 +2108,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Xen Hypervisor Tools $as_me 4.15, which was
+It was created by Xen Hypervisor Tools $as_me 4.16, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -10752,7 +10752,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Xen Hypervisor Tools $as_me 4.15, which was
+This file was extended by Xen Hypervisor Tools $as_me 4.16, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10815,7 +10815,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Xen Hypervisor Tools config.status 4.15
+Xen Hypervisor Tools config.status 4.16
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] Branching: Update version files etc. for newly unstable
2021-03-24 16:28 [PATCH 1/2] Branching: Update version files etc. for newly unstable Ian Jackson
2021-03-24 16:28 ` [PATCH 2/2] Branching: Rerun autoconf to put version right Ian Jackson
@ 2021-03-24 16:46 ` Jan Beulich
2021-03-26 11:44 ` Ian Jackson
1 sibling, 1 reply; 5+ messages in thread
From: Jan Beulich @ 2021-03-24 16:46 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] Branching: Update version files etc. for newly unstable
2021-03-24 16:46 ` [PATCH 1/2] Branching: Update version files etc. for newly unstable Jan Beulich
@ 2021-03-26 11:44 ` Ian Jackson
2021-03-26 11:46 ` Ian Jackson
0 siblings, 1 reply; 5+ messages in thread
From: Ian Jackson @ 2021-03-26 11:44 UTC (permalink / raw)
To: Jan Beulich; +Cc: xen-devel
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] Branching: Update version files etc. for newly unstable
2021-03-26 11:44 ` Ian Jackson
@ 2021-03-26 11:46 ` Ian Jackson
0 siblings, 0 replies; 5+ messages in thread
From: Ian Jackson @ 2021-03-26 11:46 UTC (permalink / raw)
To: Jan Beulich, xen-devel, Andrew Cooper
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-26 11:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-24 16:28 [PATCH 1/2] Branching: Update version files etc. for newly unstable Ian Jackson
2021-03-24 16:28 ` [PATCH 2/2] Branching: Rerun autoconf to put version right Ian Jackson
2021-03-24 16:46 ` [PATCH 1/2] Branching: Update version files etc. for newly unstable Jan Beulich
2021-03-26 11:44 ` Ian Jackson
2021-03-26 11:46 ` Ian Jackson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).