From a6dd5d8cfb874b6f208ff131775b959743a4598b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 25 Jun 2018 15:48:32 +0100 Subject: [PATCH] process docs: Add some detail about changes during branching Split out the required work for the new and old branches and be more specific about what is to be done. In the RT checklist, reformat and expand the "turn off debug" instructions. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- docs/process/branching-checklist.txt | 13 +++++++++---- docs/process/release-technician-checklist.txt | 11 ++++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt index f91aa0f1ab..caf18d9827 100644 --- a/docs/process/branching-checklist.txt +++ b/docs/process/branching-checklist.txt @@ -80,9 +80,14 @@ Check this with grep unstable Config.mk which should produce no output. Replace as necessary. -Update both new branches according to release-checklist.txt section re -README etc. - -Update new stable tree's MAINTAINERS to contain correct info for this stable branch +Update newly diverging staging (unstable) according to +release-technician-checklist.txt section re README etc. +Update newly diverging staging-$v according to +release-technician-checklist.txt section re README etc., +including turning off debug. +Update new stable tree's MAINTAINERS to contain correct info for this +stable branch: usually, copy text from previous +staging-$ov:MAINTAINERS section "Stable Release Maintenance" +into new staging-$v, deleting what's there. diff --git a/docs/process/release-technician-checklist.txt b/docs/process/release-technician-checklist.txt index c228e1088a..99746624cf 100644 --- a/docs/process/release-technician-checklist.txt +++ b/docs/process/release-technician-checklist.txt @@ -56,9 +56,14 @@ t=RELEASE-$r # if main version number has changed (eg 4.7 -> 4.8) rerun ./autogen.sh * rerun ./autogen.sh to update version number in configure # - XEN_EXTRAVERSION should be `.0-rc$(XEN_VENDORVERSION)' -# - turn off debug on stable branches -# - tools/Rules.mk debug ?= n -# - Kconfig.debug default n +# +# - turn off debug on stable branches, if not already done +# - tools/Rules.mk +# debug ?= n +# - xen/Kconfig.debug +# config DEBUG +# default n + * tag xen-unstable # In xen.git -- 2.30.2