* [PATCH 1/5] branching checklist: drop some hg tag runes
@ 2019-03-11 15:28 Ian Jackson
2019-03-11 15:28 ` [PATCH 2/5] branching checklist: Say perhaps no Config.mk changes needed Ian Jackson
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Ian Jackson @ 2019-03-11 15:28 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
We no longer use hg
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
docs/process/branching-checklist.txt | 4 ----
1 file changed, 4 deletions(-)
diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt
index 5a02d21968..4cda33656d 100644
--- a/docs/process/branching-checklist.txt
+++ b/docs/process/branching-checklist.txt
@@ -1,10 +1,6 @@
v=4.1
ov=4.0
-##* tag branchpoint
-## hg tag $v.0-branched
-## hg sign -k 'Xen tree' 4.1.0-branched
-
* make branch in qemu-iwj.git
git-branch $v-testing master
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] branching checklist: Say perhaps no Config.mk changes needed
2019-03-11 15:28 [PATCH 1/5] branching checklist: drop some hg tag runes Ian Jackson
@ 2019-03-11 15:28 ` Ian Jackson
2019-03-11 15:28 ` [PATCH 3/5] branching checklist: More detailed instructions re MAINTAINERS Ian Jackson
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Ian Jackson @ 2019-03-11 15:28 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
It is only necessary to change Config.mk if it refers to unstable
branches anywhere. This time, for example, it didn't.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
docs/process/branching-checklist.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt
index 4cda33656d..8437787446 100644
--- a/docs/process/branching-checklist.txt
+++ b/docs/process/branching-checklist.txt
@@ -75,6 +75,7 @@ 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.)
Update newly diverging staging (unstable) according to
release-technician-checklist.txt section re README etc.
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] branching checklist: More detailed instructions re MAINTAINERS
2019-03-11 15:28 [PATCH 1/5] branching checklist: drop some hg tag runes Ian Jackson
2019-03-11 15:28 ` [PATCH 2/5] branching checklist: Say perhaps no Config.mk changes needed Ian Jackson
@ 2019-03-11 15:28 ` Ian Jackson
2019-03-11 15:28 ` [PATCH 4/5] release technician checklist: Reformat Config.mk changes Ian Jackson
2019-03-11 15:28 ` [PATCH 5/5] release technician checklist: More explicit XEN_EXTRAVERSION Ian Jackson
3 siblings, 0 replies; 6+ messages in thread
From: Ian Jackson @ 2019-03-11 15:28 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
Provide a rune, following which a magit selective git add
(or git add -p) can be used to commit the appropriate changes.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
docs/process/branching-checklist.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docs/process/branching-checklist.txt b/docs/process/branching-checklist.txt
index 8437787446..9e79f64157 100644
--- a/docs/process/branching-checklist.txt
+++ b/docs/process/branching-checklist.txt
@@ -88,6 +88,8 @@ 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.
+ git cat-file blob origin/staging-$ov:MAINTAINERS >MAINTAINERS
+and review the changes, commiting ONLY THE RELEVANT ONES
Set off a manual osstest run, since the osstest cr-for-branches change
will take a while to take effect:
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] release technician checklist: Reformat Config.mk changes
2019-03-11 15:28 [PATCH 1/5] branching checklist: drop some hg tag runes Ian Jackson
2019-03-11 15:28 ` [PATCH 2/5] branching checklist: Say perhaps no Config.mk changes needed Ian Jackson
2019-03-11 15:28 ` [PATCH 3/5] branching checklist: More detailed instructions re MAINTAINERS Ian Jackson
@ 2019-03-11 15:28 ` Ian Jackson
2019-03-11 15:28 ` [PATCH 5/5] release technician checklist: More explicit XEN_EXTRAVERSION Ian Jackson
3 siblings, 0 replies; 6+ messages in thread
From: Ian Jackson @ 2019-03-11 15:28 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
One per line is a lot easier to read.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
docs/process/release-technician-checklist.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/docs/process/release-technician-checklist.txt b/docs/process/release-technician-checklist.txt
index 5dd85dbc40..ebf338c9d4 100644
--- a/docs/process/release-technician-checklist.txt
+++ b/docs/process/release-technician-checklist.txt
@@ -49,7 +49,10 @@ 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)
-* change xen-unstable Config.mk (QEMU_UPSTREAM_REVISION, QEMU_TRADITIONAL_REVISION, MINIOS_UPSTREAM_REVISION)
+* change xen-unstable Config.mk
+# QEMU_UPSTREAM_REVISION,
+# QEMU_TRADITIONAL_REVISION
+# MINIOS_UPSTREAM_REVISION
* change SUPPORT.md heading version number; -unstable or -rc tag
* (empty in stable branches after .0 release).
* insert correct version number in release-notes link
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] release technician checklist: More explicit XEN_EXTRAVERSION
2019-03-11 15:28 [PATCH 1/5] branching checklist: drop some hg tag runes Ian Jackson
` (2 preceding siblings ...)
2019-03-11 15:28 ` [PATCH 4/5] release technician checklist: Reformat Config.mk changes Ian Jackson
@ 2019-03-11 15:28 ` Ian Jackson
2019-03-11 16:13 ` Jan Beulich
3 siblings, 1 reply; 6+ messages in thread
From: Ian Jackson @ 2019-03-11 15:28 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Jan Beulich
In particular, say clearly that X.Y-unstable should be thus, not
X.Y.0-unstable.
CC: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
docs/process/release-technician-checklist.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/docs/process/release-technician-checklist.txt b/docs/process/release-technician-checklist.txt
index ebf338c9d4..f4bee4ee13 100644
--- a/docs/process/release-technician-checklist.txt
+++ b/docs/process/release-technician-checklist.txt
@@ -59,7 +59,11 @@ t=RELEASE-$r
* change xen-unstable xen/Makefile XEN_EXTRAVERSION
# 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)'
+# - XEN_EXTRAVERSION should be as follows
+# `.0-rc$(XEN_VENDORVERSION)' during freeze, first rc onwards (including staging, before branching)
+# `-unstable$(XEN_VENDORVERSION)' unstable aka unfrozen staging (or unstable branch, after branching)
+# `.0$(XEN_VENDORVERSION)' actual release of Xen X.Y.0 (aka first actual release of Xen X.Y)
+# `.Z$(XEN_VENDORVERSION)' actual release of Xen X.Y.Z (stable point realase)
#
# - turn off debug on stable branches, if not already done
# - tools/Rules.mk
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 5/5] release technician checklist: More explicit XEN_EXTRAVERSION
2019-03-11 15:28 ` [PATCH 5/5] release technician checklist: More explicit XEN_EXTRAVERSION Ian Jackson
@ 2019-03-11 16:13 ` Jan Beulich
0 siblings, 0 replies; 6+ messages in thread
From: Jan Beulich @ 2019-03-11 16:13 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
>>> On 11.03.19 at 16:28, <ian.jackson@eu.citrix.com> wrote:
> In particular, say clearly that X.Y-unstable should be thus, not
> X.Y.0-unstable.
>
> CC: Jan Beulich <jbeulich@suse.com>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Thanks! In case it matters / helps:
Acked-by: Jan Beulich <jbeulich@suse.com>
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-03-11 16:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-11 15:28 [PATCH 1/5] branching checklist: drop some hg tag runes Ian Jackson
2019-03-11 15:28 ` [PATCH 2/5] branching checklist: Say perhaps no Config.mk changes needed Ian Jackson
2019-03-11 15:28 ` [PATCH 3/5] branching checklist: More detailed instructions re MAINTAINERS Ian Jackson
2019-03-11 15:28 ` [PATCH 4/5] release technician checklist: Reformat Config.mk changes Ian Jackson
2019-03-11 15:28 ` [PATCH 5/5] release technician checklist: More explicit XEN_EXTRAVERSION Ian Jackson
2019-03-11 16:13 ` Jan Beulich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.