From: Julien Grall Date: Sun, 19 Feb 2023 18:42:42 +0000 (+0000) Subject: docs/process: branching-checklist: Reword the section about Config.mk X-Git-Tag: 4.18.0-rc1~1058 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=163b3cf7af475ca1ad5ba26a51f5fe2e2a647ee3;p=xen.git docs/process: branching-checklist: Reword the section about Config.mk Since at least Xen 4.12, the revision for external trees don't contain the word "unstable". So explicitly list the *_REVISION variables that need to be updated as part of the branching process. Signed-off-by: Julien Grall Reviewed-by: Henry Wang ---- Changes in v2: * Explain what should be the tag format for each variables --- diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index d1550385c9..7c4c107c25 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.