[PATCH v2 1/4] docs/process: branching-checklist: Reword the section about Config.mk

Julien Grall posted 4 patches 3 years ago
[PATCH v2 1/4] docs/process: branching-checklist: Reword the section about Config.mk
Posted by Julien Grall 3 years ago
From: Julien Grall <jgrall@amazon.com>

Since at least Xen 4.12, the revision for external trees don't contain
the word "unstable". So explicitely list the *_REVISION variables that
need to be updated as part of the branching process.

Signed-off-by: Julien Grall <jgrall@amazon.com>

---
    Changes in v2:
        * Explain what should be the tag format for each variables
---
 docs/process/branching-checklist.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt
index d1550385c96e..7c4c107c250c 100644
--- a/docs/process/branching-checklist.txt
+++ b/docs/process/branching-checklist.txt
@@ -69,11 +69,12 @@ ov=4.0
     git add versions
     git commit -m "Branch for $v"
 
-Ensure references to qemu trees in xen.git's Config.mk are updated.
-Check this with
-    grep unstable Config.mk
-which should produce no output.  Replace as necessary.
-(There may well be none.)
+Ensure references to qemu trees and Mini-OS in xen.git's Config.mk are updated.
+The variables and there content should be:
+  * QEMU_UPSTREAM_REVISION: qemu-xen-X.Y.0
+  * QEMU_TRADITIONAL_REVISION: xen-X.Y.0
+  * MINIOS_UPSTREAM_REVISION: xen-RELEASE-X.Y.0
+Where X.Y is the release version (e.g. 4.17).
 
 Update newly diverging staging (unstable) according to
 release-technician-checklist.txt section re README etc.
-- 
2.39.1
RE: [PATCH v2 1/4] docs/process: branching-checklist: Reword the section about Config.mk
Posted by Henry Wang 3 years ago
Hi Julien,

> -----Original Message-----
> Subject: [PATCH v2 1/4] docs/process: branching-checklist: Reword the
> section about Config.mk
> 
> From: Julien Grall <jgrall@amazon.com>
> 
> Since at least Xen 4.12, the revision for external trees don't contain
> the word "unstable". So explicitely list the *_REVISION variables that

A small typo that can be fixed on commit: s/explicitely/explicitly

> need to be updated as part of the branching process.
> 
> Signed-off-by: Julien Grall <jgrall@amazon.com>

Change looks good, thanks for updating the doc :)

Reviewed-by: Henry Wang <Henry.Wang@arm.com>

Kind regards,
Henry
Re: [PATCH v2 1/4] docs/process: branching-checklist: Reword the section about Config.mk
Posted by Julien Grall 2 years, 11 months ago

On 10/02/2023 01:57, Henry Wang wrote:
> Hi Julien,

Hi Henry,

> 
>> -----Original Message-----
>> Subject: [PATCH v2 1/4] docs/process: branching-checklist: Reword the
>> section about Config.mk
>>
>> From: Julien Grall <jgrall@amazon.com>
>>
>> Since at least Xen 4.12, the revision for external trees don't contain
>> the word "unstable". So explicitely list the *_REVISION variables that
> 
> A small typo that can be fixed on commit: s/explicitely/explicitly
> 
>> need to be updated as part of the branching process.
>>
>> Signed-off-by: Julien Grall <jgrall@amazon.com>
> 
> Change looks good, thanks for updating the doc :)
> 
> Reviewed-by: Henry Wang <Henry.Wang@arm.com>

Thanks! I fixed the typo and committed the series.

Cheers,

-- 
Julien Grall