Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Julien Grall <julien@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
---
README | 10 +++++-----
SUPPORT.md | 2 +-
xen/Makefile | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/README b/README
index 9329f30e1366..eaee78bd7375 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
############################################################
-__ __ _ _ _
-\ \/ /___ _ __ _ _ _ __ ___| |_ __ _| |__ | | ___
- \ // _ \ '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
- / \ __/ | | |_____| |_| | | | \__ \ || (_| | |_) | | __/
-/_/\_\___|_| |_| \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
+ __ __ _ _ ____ _
+ \ \/ /___ _ __ | || | |___ \/ | _ __ ___
+ \ // _ \ '_ \ | || |_ __) | |__| '__/ __|
+ / \ __/ | | | |__ _| / __/| |__| | | (__
+ /_/\_\___|_| |_| |_|(_)_____|_| |_| \___|
############################################################
diff --git a/SUPPORT.md b/SUPPORT.md
index eb44ee85fd12..491f9ecd1bbb 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.21-unstable
+ Xen-Version: 4.21-rc
Initial-Release: n/a
Supported-Until: TBD
Security-Support-Until: Unreleased - not yet security-supported
diff --git a/xen/Makefile b/xen/Makefile
index 49da79e10fb4..ba8c7147a2f6 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST))
# All other places this is stored (eg. compile.h) should be autogenerated.
export XEN_VERSION = 4
export XEN_SUBVERSION = 21
-export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version
--
2.39.5
On Mon, Oct 06, 2025 at 09:08:40PM +0100, Andrew Cooper wrote: > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Oleksii Kurochko <oleksii.kurochko@gmail.com> > CC: Anthony PERARD <anthony.perard@vates.tech> > CC: Michal Orzel <michal.orzel@amd.com> > CC: Jan Beulich <jbeulich@suse.com> > CC: Julien Grall <julien@xen.org> > CC: Roger Pau Monné <roger.pau@citrix.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > --- > README | 10 +++++----- > SUPPORT.md | 2 +- > xen/Makefile | 2 +- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/README b/README > index 9329f30e1366..eaee78bd7375 100644 > --- a/README > +++ b/README > @@ -1,9 +1,9 @@ > ############################################################ > -__ __ _ _ _ > -\ \/ /___ _ __ _ _ _ __ ___| |_ __ _| |__ | | ___ > - \ // _ \ '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ > - / \ __/ | | |_____| |_| | | | \__ \ || (_| | |_) | | __/ > -/_/\_\___|_| |_| \__,_|_| |_|___/\__\__,_|_.__/|_|\___| > + __ __ _ _ ____ _ > + \ \/ /___ _ __ | || | |___ \/ | _ __ ___ > + \ // _ \ '_ \ | || |_ __) | |__| '__/ __| > + / \ __/ | | | |__ _| / __/| |__| | | (__ > + /_/\_\___|_| |_| |_|(_)_____|_| |_| \___| > > ############################################################ > > diff --git a/SUPPORT.md b/SUPPORT.md > index eb44ee85fd12..491f9ecd1bbb 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.21-unstable > + Xen-Version: 4.21-rc > Initial-Release: n/a > Supported-Until: TBD > Security-Support-Until: Unreleased - not yet security-supported > diff --git a/xen/Makefile b/xen/Makefile > index 49da79e10fb4..ba8c7147a2f6 100644 > --- a/xen/Makefile > +++ b/xen/Makefile > @@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST)) > # All other places this is stored (eg. compile.h) should be autogenerated. > export XEN_VERSION = 4 > export XEN_SUBVERSION = 21 > -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) > +export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION) In previous switches to start cutting RC's we didn't add the 1 to the XEN_EXTRAVERSION, see 19730dbb3fd8078743d5196bd7fc32f3765557ad for example. If we do add the rc number we need to remember to bump it each time and RC is released. Thanks, Roger.
On 07/10/2025 7:54 am, Roger Pau Monné wrote: > On Mon, Oct 06, 2025 at 09:08:40PM +0100, Andrew Cooper wrote: >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> >> --- >> CC: Oleksii Kurochko <oleksii.kurochko@gmail.com> >> CC: Anthony PERARD <anthony.perard@vates.tech> >> CC: Michal Orzel <michal.orzel@amd.com> >> CC: Jan Beulich <jbeulich@suse.com> >> CC: Julien Grall <julien@xen.org> >> CC: Roger Pau Monné <roger.pau@citrix.com> >> CC: Stefano Stabellini <sstabellini@kernel.org> >> --- >> README | 10 +++++----- >> SUPPORT.md | 2 +- >> xen/Makefile | 2 +- >> 3 files changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/README b/README >> index 9329f30e1366..eaee78bd7375 100644 >> --- a/README >> +++ b/README >> @@ -1,9 +1,9 @@ >> ############################################################ >> -__ __ _ _ _ >> -\ \/ /___ _ __ _ _ _ __ ___| |_ __ _| |__ | | ___ >> - \ // _ \ '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ >> - / \ __/ | | |_____| |_| | | | \__ \ || (_| | |_) | | __/ >> -/_/\_\___|_| |_| \__,_|_| |_|___/\__\__,_|_.__/|_|\___| >> + __ __ _ _ ____ _ >> + \ \/ /___ _ __ | || | |___ \/ | _ __ ___ >> + \ // _ \ '_ \ | || |_ __) | |__| '__/ __| >> + / \ __/ | | | |__ _| / __/| |__| | | (__ >> + /_/\_\___|_| |_| |_|(_)_____|_| |_| \___| >> >> ############################################################ >> >> diff --git a/SUPPORT.md b/SUPPORT.md >> index eb44ee85fd12..491f9ecd1bbb 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.21-unstable >> + Xen-Version: 4.21-rc >> Initial-Release: n/a >> Supported-Until: TBD >> Security-Support-Until: Unreleased - not yet security-supported >> diff --git a/xen/Makefile b/xen/Makefile >> index 49da79e10fb4..ba8c7147a2f6 100644 >> --- a/xen/Makefile >> +++ b/xen/Makefile >> @@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST)) >> # All other places this is stored (eg. compile.h) should be autogenerated. >> export XEN_VERSION = 4 >> export XEN_SUBVERSION = 21 >> -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) >> +export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION) > In previous switches to start cutting RC's we didn't add the 1 to the > XEN_EXTRAVERSION, see 19730dbb3fd8078743d5196bd7fc32f3765557ad for > example. Correct. That was also buggy and complained about. > If we do add the rc number we need to remember to bump it > each time and RC is released. Last time we had truly buggy early rc tarballs, the middle ones were bodged somewhat (incompletely, and not a straight git archive), and by RC5 we had a commit with the correct XEN_EXTRAVERSION to make the tarball correct. See 4.20.0-rc5 ~Andrew
On 07.10.2025 10:28, Andrew Cooper wrote: > On 07/10/2025 7:54 am, Roger Pau Monné wrote: >> On Mon, Oct 06, 2025 at 09:08:40PM +0100, Andrew Cooper wrote: >>> --- a/xen/Makefile >>> +++ b/xen/Makefile >>> @@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST)) >>> # All other places this is stored (eg. compile.h) should be autogenerated. >>> export XEN_VERSION = 4 >>> export XEN_SUBVERSION = 21 >>> -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) >>> +export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION) >> In previous switches to start cutting RC's we didn't add the 1 to the >> XEN_EXTRAVERSION, see 19730dbb3fd8078743d5196bd7fc32f3765557ad for >> example. > > Correct. That was also buggy and complained about. > >> If we do add the rc number we need to remember to bump it >> each time and RC is released. > > Last time we had truly buggy early rc tarballs, the middle ones were > bodged somewhat (incompletely, and not a straight git archive), and by > RC5 we had a commit with the correct XEN_EXTRAVERSION to make the > tarball correct. > > See 4.20.0-rc5 Yet then the question still is whether it is perhaps the tarball making which is what wants adjusting, to not use "$(MAKE) -C xen xenversion", but rather go from, say, the tag in git. Jan
Hi Andrew, On 07/10/2025 09:28, Andrew Cooper wrote: > On 07/10/2025 7:54 am, Roger Pau Monné wrote: >> On Mon, Oct 06, 2025 at 09:08:40PM +0100, Andrew Cooper wrote: >>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> >>> --- >>> CC: Oleksii Kurochko <oleksii.kurochko@gmail.com> >>> CC: Anthony PERARD <anthony.perard@vates.tech> >>> CC: Michal Orzel <michal.orzel@amd.com> >>> CC: Jan Beulich <jbeulich@suse.com> >>> CC: Julien Grall <julien@xen.org> >>> CC: Roger Pau Monné <roger.pau@citrix.com> >>> CC: Stefano Stabellini <sstabellini@kernel.org> >>> --- >>> README | 10 +++++----- >>> SUPPORT.md | 2 +- >>> xen/Makefile | 2 +- >>> 3 files changed, 7 insertions(+), 7 deletions(-) >>> >>> diff --git a/README b/README >>> index 9329f30e1366..eaee78bd7375 100644 >>> --- a/README >>> +++ b/README >>> @@ -1,9 +1,9 @@ >>> ############################################################ >>> -__ __ _ _ _ >>> -\ \/ /___ _ __ _ _ _ __ ___| |_ __ _| |__ | | ___ >>> - \ // _ \ '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ >>> - / \ __/ | | |_____| |_| | | | \__ \ || (_| | |_) | | __/ >>> -/_/\_\___|_| |_| \__,_|_| |_|___/\__\__,_|_.__/|_|\___| >>> + __ __ _ _ ____ _ >>> + \ \/ /___ _ __ | || | |___ \/ | _ __ ___ >>> + \ // _ \ '_ \ | || |_ __) | |__| '__/ __| >>> + / \ __/ | | | |__ _| / __/| |__| | | (__ >>> + /_/\_\___|_| |_| |_|(_)_____|_| |_| \___| >>> >>> ############################################################ >>> >>> diff --git a/SUPPORT.md b/SUPPORT.md >>> index eb44ee85fd12..491f9ecd1bbb 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.21-unstable >>> + Xen-Version: 4.21-rc >>> Initial-Release: n/a >>> Supported-Until: TBD >>> Security-Support-Until: Unreleased - not yet security-supported >>> diff --git a/xen/Makefile b/xen/Makefile >>> index 49da79e10fb4..ba8c7147a2f6 100644 >>> --- a/xen/Makefile >>> +++ b/xen/Makefile >>> @@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST)) >>> # All other places this is stored (eg. compile.h) should be autogenerated. >>> export XEN_VERSION = 4 >>> export XEN_SUBVERSION = 21 >>> -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) >>> +export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION) >> In previous switches to start cutting RC's we didn't add the 1 to the >> XEN_EXTRAVERSION, see 19730dbb3fd8078743d5196bd7fc32f3765557ad for >> example. > > Correct. That was also buggy and complained about. > >> If we do add the rc number we need to remember to bump it >> each time and RC is released. > > Last time we had truly buggy early rc tarballs, the middle ones were > bodged somewhat (incompletely, and not a straight git archive), and by > RC5 we had a commit with the correct XEN_EXTRAVERSION to make the > tarball correct. docs/process/release-technician-checklist.txt says: # `.0-rc$(XEN_VENDORVERSION)' during freeze, first rc onwards (including staging, before branching) I don't have any strong preference on whether we should also update it with the RC number. But the doc should at least be updated to reflect the decision. Can you send an update? I think we also have a few updates to the checklist which would be good to merge as well. (one is from you). Cheers, -- Julien Grall
© 2016 - 2025 Red Hat, Inc.