| Message ID | 20240702134310.1307657-1-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | xen: Fix XEN_EXTRAVERSION after 4.19-rc1 | expand |
I forgot the for-4.19 in the subject. Hopefully it's obvious why... ~Andrew On 02/07/2024 2:43 pm, Andrew Cooper wrote: > EXTRAVERSION needs a . separator for numbers. Currently, the banner reports: > > __ __ _ _ _ ___ ___ > \ \/ /___ _ __ | || | / |/ _ \ / _ \ _ __ ___ > \ // _ \ '_ \ | || |_ | | (_) | | | |__| '__/ __| > / \ __/ | | | |__ _|| |\__, | |_| |__| | | (__ > /_/\_\___|_| |_| |_|(_)_| /_/ \___/ |_| \___| > > and xl reports: > > # xl info xen_version > 4.190-rc > > Fixes: 4a73eb4c205d ("Update Xen version to 4.19-rc") > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Jan Beulich <JBeulich@suse.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > CC: Julien Grall <julien@xen.org> > CC: Oleksii Kurochko <oleksii.kurochko@gmail.com> > > For 4.19. This is a minor mistake when creating Xen-4.19-rc1. > --- > xen/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/xen/Makefile b/xen/Makefile > index 58ce6e468eab..037c49f83d39 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 = 19 > -export XEN_EXTRAVERSION ?= 0-rc$(XEN_VENDORVERSION) > +export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) > export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > -include xen-version > > > base-commit: 08daa72cdcb660c2f0aef52ee76a3704e2dd1b5b
On 02.07.2024 15:43, Andrew Cooper wrote: > EXTRAVERSION needs a . separator for numbers. Not exactly. It needs the 0 dropped, if we follow what we've done in the past. Then ... > Currently, the banner reports: > > __ __ _ _ _ ___ ___ > \ \/ /___ _ __ | || | / |/ _ \ / _ \ _ __ ___ > \ // _ \ '_ \ | || |_ | | (_) | | | |__| '__/ __| > / \ __/ | | | |__ _|| |\__, | |_| |__| | | (__ > /_/\_\___|_| |_| |_|(_)_| /_/ \___/ |_| \___| > > and xl reports: > > # xl info xen_version > 4.190-rc > > Fixes: 4a73eb4c205d ("Update Xen version to 4.19-rc") > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Jan Beulich <jbeulich@suse.com> > --- > CC: Jan Beulich <JBeulich@suse.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > CC: Julien Grall <julien@xen.org> > CC: Oleksii Kurochko <oleksii.kurochko@gmail.com> > > For 4.19. This is a minor mistake when creating Xen-4.19-rc1. > --- > xen/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/xen/Makefile b/xen/Makefile > index 58ce6e468eab..037c49f83d39 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 = 19 > -export XEN_EXTRAVERSION ?= 0-rc$(XEN_VENDORVERSION) > +export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) > export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > -include xen-version > > > base-commit: 08daa72cdcb660c2f0aef52ee76a3704e2dd1b5b
On 02/07/2024 3:14 pm, Jan Beulich wrote: > On 02.07.2024 15:43, Andrew Cooper wrote: >> EXTRAVERSION needs a . separator for numbers. > Not exactly. It needs the 0 dropped, if we follow what we've done in the > past. Then ... > >> Currently, the banner reports: >> >> __ __ _ _ _ ___ ___ >> \ \/ /___ _ __ | || | / |/ _ \ / _ \ _ __ ___ >> \ // _ \ '_ \ | || |_ | | (_) | | | |__| '__/ __| >> / \ __/ | | | |__ _|| |\__, | |_| |__| | | (__ >> /_/\_\___|_| |_| |_|(_)_| /_/ \___/ |_| \___| >> >> and xl reports: >> >> # xl info xen_version >> 4.190-rc >> >> Fixes: 4a73eb4c205d ("Update Xen version to 4.19-rc") >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > Acked-by: Jan Beulich <jbeulich@suse.com> I'm happy either way, but it definitely needs changing from what is here now. ~Andrew
On Tue, 2024-07-02 at 15:15 +0100, Andrew Cooper wrote: > On 02/07/2024 3:14 pm, Jan Beulich wrote: > > On 02.07.2024 15:43, Andrew Cooper wrote: > > > EXTRAVERSION needs a . separator for numbers. > > Not exactly. It needs the 0 dropped, if we follow what we've done > > in the > > past. Then ... > > > > > Currently, the banner reports: > > > > > > __ __ _ _ _ ___ ___ > > > \ \/ /___ _ __ | || | / |/ _ \ / _ \ _ __ ___ > > > \ // _ \ '_ \ | || |_ | | (_) | | | |__| '__/ __| > > > / \ __/ | | | |__ _|| |\__, | |_| |__| | | (__ > > > /_/\_\___|_| |_| |_|(_)_| /_/ \___/ |_| \___| > > > > > > and xl reports: > > > > > > # xl info xen_version > > > 4.190-rc > > > > > > Fixes: 4a73eb4c205d ("Update Xen version to 4.19-rc") > > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > > Acked-by: Jan Beulich <jbeulich@suse.com> > > I'm happy either way, but it definitely needs changing from what is > here > now. Release-Acked-By: Oleksii Kurochko <oleksii.kurochko@gmail.com> ~ Oleksii
Hi, On 02/07/2024 15:14, Jan Beulich wrote: > On 02.07.2024 15:43, Andrew Cooper wrote: >> EXTRAVERSION needs a . separator for numbers. > > Not exactly. It needs the 0 dropped, if we follow what we've done in the > past. Then ... From docs/process/release-technician-checklist.txt: # - XEN_EXTRAVERSION should be as follows # `.0-rc$(XEN_VENDORVERSION)' during freeze, first rc onwards (including staging, before branching) So the original version from Andrew was correct... Cheers,
diff --git a/xen/Makefile b/xen/Makefile index 58ce6e468eab..037c49f83d39 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 = 19 -export XEN_EXTRAVERSION ?= 0-rc$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version
EXTRAVERSION needs a . separator for numbers. Currently, the banner reports: __ __ _ _ _ ___ ___ \ \/ /___ _ __ | || | / |/ _ \ / _ \ _ __ ___ \ // _ \ '_ \ | || |_ | | (_) | | | |__| '__/ __| / \ __/ | | | |__ _|| |\__, | |_| |__| | | (__ /_/\_\___|_| |_| |_|(_)_| /_/ \___/ |_| \___| and xl reports: # xl info xen_version 4.190-rc Fixes: 4a73eb4c205d ("Update Xen version to 4.19-rc") Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Jan Beulich <JBeulich@suse.com> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Julien Grall <julien@xen.org> CC: Oleksii Kurochko <oleksii.kurochko@gmail.com> For 4.19. This is a minor mistake when creating Xen-4.19-rc1. --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 08daa72cdcb660c2f0aef52ee76a3704e2dd1b5b