[PATCH 0/3] Prepare the tree for 4.17 RC

[PATCH 0/3] Prepare the tree for 4.17 RC

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

Hi all,

This small series is to get the tree ready for cutting the first
4.17 release candidate.

I haven't prepared any RC in the past. So I mainly followed the
guideline in docs/process/release-technician-checklist.txt. Please
let me know if I missed anything.

Cheers,

Julien Grall (3):
  process/release-technician-checklist: Explain how the banner in README
    is generated
  Config.mk pin QEMU_UPSTREAM_REVISION (prep for Xen 4.17 RC1)
  Update Xen version to 4.17-rc

 Config.mk                                     |  2 +-
 README                                        | 16 ++++++++--------
 SUPPORT.md                                    |  2 +-
 docs/process/release-technician-checklist.txt |  1 +
 xen/Makefile                                  |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

-- 
2.37.1

[PATCH 1/3] process/release-technician-checklist: Explain how the banner in README is generated

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

Signed-off-by: Julien Grall <jgrall@amazon.com>
---
 docs/process/release-technician-checklist.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/process/release-technician-checklist.txt b/docs/process/release-technician-checklist.txt
index 7515da202c92..914f31959ab0 100644
--- a/docs/process/release-technician-checklist.txt
+++ b/docs/process/release-technician-checklist.txt
@@ -49,6 +49,7 @@ t=RELEASE-$r
 * consider bumping sonames of shlibs
 
 * change xen-unstable README (should say "Xen 4.5" in releases and on stable branches, "Xen 4.5-unstable" on unstable)
+*   The banner is generated using figlet
 * change xen-unstable Config.mk
 #   QEMU_UPSTREAM_REVISION,
 #   QEMU_TRADITIONAL_REVISION
-- 
2.37.1

[PATCH 2/3] Config.mk pin QEMU_UPSTREAM_REVISION (prep for Xen 4.17 RC1)

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

Signed-off-by: Julien Grall <jgrall@amazon.com>
---
 Config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Config.mk b/Config.mk
index 69af1e60d4cc..e0ce59346896 100644
--- a/Config.mk
+++ b/Config.mk
@@ -229,7 +229,7 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= 7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5
-QEMU_UPSTREAM_REVISION ?= master
+QEMU_UPSTREAM_REVISION ?= b746458e1ce1bec85e58b458386f8b7a0bedfaa6
 MINIOS_UPSTREAM_REVISION ?= 5bcb28aaeba1c2506a82fab0cdad0201cd9b54b3
 
 SEABIOS_UPSTREAM_REVISION ?= rel-1.16.0
-- 
2.37.1

[PATCH 3/3] Update Xen version to 4.17-rc

[Julien Grall]

From: Julien Grall <jgrall@amazon.com>

Signed-off-by: Julien Grall <jgrall@amazon.com>
---
 README       | 16 ++++++++--------
 SUPPORT.md   |  2 +-
 xen/Makefile |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 89a1d0b43c4c..2fdca8861bef 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
-############################################################
-__  __                                _        _     _
-\ \/ /___ _ __        _   _ _ __  ___| |_ __ _| |__ | | ___
- \  // _ \ '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
- /  \  __/ | | |_____| |_| | | | \__ \ || (_| | |_) | |  __/
-/_/\_\___|_| |_|      \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
-
-############################################################
+###############################################
+__  __            _  _    _ _____
+\ \/ /___ _ __   | || |  / |___  |    _ __ ___
+ \  // _ \ '_ \  | || |_ | |  / /____| '__/ __|
+ /  \  __/ | | | |__   _|| | / /_____| | | (__
+/_/\_\___|_| |_|    |_|(_)_|/_/      |_|  \___|
+
+###############################################
 
 https://www.xen.org/
 
diff --git a/SUPPORT.md b/SUPPORT.md
index 29f74ac5063e..cf2ddfacaf09 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -9,7 +9,7 @@ for the definitions of the support status levels etc.
 
 # Release Support
 
-    Xen-Version: unstable
+    Xen-Version: 4.17-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 4e6e661261ae..9d0df5e2c543 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    = 17
-export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version
 
-- 
2.37.1

RE: [PATCH 1/3] process/release-technician-checklist: Explain how the banner in README is generated

[Henry Wang]

Hi Julien,

> -----Original Message-----
> From: Julien Grall <julien@xen.org>
> Subject: [PATCH 1/3] process/release-technician-checklist: Explain how the
> banner in README is generated
> 
> From: Julien Grall <jgrall@amazon.com>
> 
> Signed-off-by: Julien Grall <jgrall@amazon.com>

Release-acked-by: Henry Wang <Henry.Wang@arm.com>

Kind regards,
Henry

Re: [PATCH 1/3] process/release-technician-checklist: Explain how the banner in README is generated

[Juergen Gross]

[-- Attachment #1.1.1: Type: text/plain, Size: 200 bytes --]

On 07.10.22 11:13, Julien Grall wrote:
> From: Julien Grall <jgrall@amazon.com>
> 
> Signed-off-by: Julien Grall <jgrall@amazon.com>

Reviewed-by: Juergen Gross <jgross@suse.com>


Juergen


[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3149 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]

RE: [PATCH 2/3] Config.mk pin QEMU_UPSTREAM_REVISION (prep for Xen 4.17 RC1)

[Henry Wang]

Hi Julien,

> -----Original Message-----
> From: Julien Grall <julien@xen.org>
> Subject: [PATCH 2/3] Config.mk pin QEMU_UPSTREAM_REVISION (prep for
> Xen 4.17 RC1)
> 
> From: Julien Grall <jgrall@amazon.com>
> 
> Signed-off-by: Julien Grall <jgrall@amazon.com>

Release-acked-by: Henry Wang <Henry.Wang@arm.com>

Kind regards,
Henry

RE: [PATCH 3/3] Update Xen version to 4.17-rc

[Henry Wang]

Hi Julien,

> -----Original Message-----
> From: Julien Grall <julien@xen.org>
> Subject: [PATCH 3/3] Update Xen version to 4.17-rc
> 
> From: Julien Grall <jgrall@amazon.com>
> 
> Signed-off-by: Julien Grall <jgrall@amazon.com>

I am not very sure, but I think the name should be 4.17-rc1 since
we will likely to have rc2 to rc4 according to the previous plan in
xen-devel [1]?

[1] https://lore.kernel.org/xen-devel/AS8PR08MB7991DD9E3E7C966E9C6DCA03927B9@AS8PR08MB7991.eurprd08.prod.outlook.com/

Kind regards,
Henry

> ---
>  README       | 16 ++++++++--------
>  SUPPORT.md   |  2 +-
>  xen/Makefile |  2 +-
>  3 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/README b/README
> index 89a1d0b43c4c..2fdca8861bef 100644
> --- a/README
> +++ b/README
> @@ -1,11 +1,11 @@
> -############################################################
> -__  __                                _        _     _
> -\ \/ /___ _ __        _   _ _ __  ___| |_ __ _| |__ | | ___
> - \  // _ \ '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
> - /  \  __/ | | |_____| |_| | | | \__ \ || (_| | |_) | |  __/
> -/_/\_\___|_| |_|      \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
> -
> -############################################################
> +###############################################
> +__  __            _  _    _ _____
> +\ \/ /___ _ __   | || |  / |___  |    _ __ ___
> + \  // _ \ '_ \  | || |_ | |  / /____| '__/ __|
> + /  \  __/ | | | |__   _|| | / /_____| | | (__
> +/_/\_\___|_| |_|    |_|(_)_|/_/      |_|  \___|
> +
> +###############################################
> 
>  https://www.xen.org/
> 
> diff --git a/SUPPORT.md b/SUPPORT.md
> index 29f74ac5063e..cf2ddfacaf09 100644
> --- a/SUPPORT.md
> +++ b/SUPPORT.md
> @@ -9,7 +9,7 @@ for the definitions of the support status levels etc.
> 
>  # Release Support
> 
> -    Xen-Version: unstable
> +    Xen-Version: 4.17-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 4e6e661261ae..9d0df5e2c543 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    = 17
> -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
> +export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION)
>  export XEN_FULLVERSION   =
> $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
>  -include xen-version
> 
> --
> 2.37.1

Re: [PATCH 3/3] Update Xen version to 4.17-rc

[Julien Grall]

On 07/10/2022 10:51, Henry Wang wrote:
> Hi Julien,

Hi Henry,

>> -----Original Message-----
>> From: Julien Grall <julien@xen.org>
>> Subject: [PATCH 3/3] Update Xen version to 4.17-rc
>>
>> From: Julien Grall <jgrall@amazon.com>
>>
>> Signed-off-by: Julien Grall <jgrall@amazon.com>
> 
> I am not very sure, but I think the name should be 4.17-rc1 since
> we will likely to have rc2 to rc4 according to the previous plan in
> xen-devel [1]?

Looking at previous release, we are not updating the files for every RC. 
Instead, we only tag the commit with X-rc<N>.

Cheers,

-- 
Julien Grall

RE: [PATCH 3/3] Update Xen version to 4.17-rc

[Henry Wang]

Hi Julien,

> -----Original Message-----
> From: Julien Grall <julien@xen.org>
> Subject: Re: [PATCH 3/3] Update Xen version to 4.17-rc
> On 07/10/2022 10:51, Henry Wang wrote:
> > Hi Julien,
> 
> Hi Henry,
> 
> >> -----Original Message-----
> >> From: Julien Grall <julien@xen.org>
> >> Subject: [PATCH 3/3] Update Xen version to 4.17-rc
> >>
> >> From: Julien Grall <jgrall@amazon.com>
> >>
> >> Signed-off-by: Julien Grall <jgrall@amazon.com>
> >
> > I am not very sure, but I think the name should be 4.17-rc1 since
> > we will likely to have rc2 to rc4 according to the previous plan in
> > xen-devel [1]?
> 
> Looking at previous release, we are not updating the files for every RC.
> Instead, we only tag the commit with X-rc<N>.

Ah, my bad, sorry for the noise then.

Release-acked-by: Henry Wang <Henry.Wang@arm.com>

Kind regards,
Henry

> 
> Cheers,
> 
> --
> Julien Grall

Re: [PATCH 1/3] process/release-technician-checklist: Explain how the banner in README is generated

[Jan Beulich]

On 07.10.2022 11:13, Julien Grall wrote:
> --- a/docs/process/release-technician-checklist.txt
> +++ b/docs/process/release-technician-checklist.txt
> @@ -49,6 +49,7 @@ t=RELEASE-$r
>  * consider bumping sonames of shlibs
>  
>  * change xen-unstable README (should say "Xen 4.5" in releases and on stable branches, "Xen 4.5-unstable" on unstable)

This line may also want updating, to include the 4.5-rc case as well.

Jan

> +*   The banner is generated using figlet
>  * change xen-unstable Config.mk
>  #   QEMU_UPSTREAM_REVISION,
>  #   QEMU_TRADITIONAL_REVISION

Re: [PATCH 3/3] Update Xen version to 4.17-rc

[Jan Beulich]

On 07.10.2022 11:13, Julien Grall wrote:
> From: Julien Grall <jgrall@amazon.com>
> 
> Signed-off-by: Julien Grall <jgrall@amazon.com>
> ---
>  README       | 16 ++++++++--------
>  SUPPORT.md   |  2 +-
>  xen/Makefile |  2 +-
>  3 files changed, 10 insertions(+), 10 deletions(-)

I assume CHANGELOG.md is then going to be updated only once for the actual
release? (Not that I think that the -rc is relevant to have there, but the
version could as well be changed to 4.17.0 already now.)

Jan

Re: [PATCH 1/3] process/release-technician-checklist: Explain how the banner in README is generated

[Julien Grall]

Hi Jan,

On 07/10/2022 12:02, Jan Beulich wrote:
> On 07.10.2022 11:13, Julien Grall wrote:
>> --- a/docs/process/release-technician-checklist.txt
>> +++ b/docs/process/release-technician-checklist.txt
>> @@ -49,6 +49,7 @@ t=RELEASE-$r
>>   * consider bumping sonames of shlibs
>>   
>>   * change xen-unstable README (should say "Xen 4.5" in releases and on stable branches, "Xen 4.5-unstable" on unstable)
> 
> This line may also want updating, to include the 4.5-rc case as well.

Good point. I will respin this patch.

Cheers,

> 
> Jan
> 
>> +*   The banner is generated using figlet
>>   * change xen-unstable Config.mk
>>   #   QEMU_UPSTREAM_REVISION,
>>   #   QEMU_TRADITIONAL_REVISION
> 

-- 
Julien Grall

Re: [PATCH 3/3] Update Xen version to 4.17-rc

[Julien Grall]

Hi Jan,

On 07/10/2022 12:06, Jan Beulich wrote:
> On 07.10.2022 11:13, Julien Grall wrote:
>> From: Julien Grall <jgrall@amazon.com>
>>
>> Signed-off-by: Julien Grall <jgrall@amazon.com>
>> ---
>>   README       | 16 ++++++++--------
>>   SUPPORT.md   |  2 +-
>>   xen/Makefile |  2 +-
>>   3 files changed, 10 insertions(+), 10 deletions(-)
> 
> I assume CHANGELOG.md is then going to be updated only once for the actual
> release? (Not that I think that the -rc is relevant to have there, but the
> version could as well be changed to 4.17.0 already now.)

In the past, this was updated once we are ready to release 4.17. I would 
prefer if we follow the same approach as it will be less error-prone and 
work.

I would otherwise have to temporarily remove the section "unstable" (to 
avoid someone mistakenly updating the changelog) and then re-introduce it.

Cheers,

-- 
Julien Grall