* [PATCH] docs: Pull Xen version from canonical location
@ 2013-07-02 20:02 Andrew Cooper
2013-07-03 8:57 ` Ian Campbell
2013-07-03 10:03 ` George Dunlap
0 siblings, 2 replies; 7+ messages in thread
From: Andrew Cooper @ 2013-07-02 20:02 UTC (permalink / raw)
To: Xen-devel; +Cc: George Dunlap, Andrew Cooper, Ian Jackson, Ian Campbell
rather than hard coding it and being wrong every time we branch for a release.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
--
This should be placed in unstable, and backported to 4.3 and 4.2
---
docs/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/Makefile b/docs/Makefile
index 72bd5e4..472b7ed 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -2,7 +2,7 @@ XEN_ROOT=$(CURDIR)/..
include $(XEN_ROOT)/Config.mk
-include $(XEN_ROOT)/config/Docs.mk
-VERSION = xen-unstable
+VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion)
DOC_MAN5SRC := $(wildcard man/*.pod.5)
DOC_MAN1SRC := $(wildcard man/*.pod.1)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] docs: Pull Xen version from canonical location
2013-07-02 20:02 [PATCH] docs: Pull Xen version from canonical location Andrew Cooper
@ 2013-07-03 8:57 ` Ian Campbell
2013-07-03 10:03 ` George Dunlap
1 sibling, 0 replies; 7+ messages in thread
From: Ian Campbell @ 2013-07-03 8:57 UTC (permalink / raw)
To: Andrew Cooper; +Cc: George Dunlap, Ian Jackson, Xen-devel
On Tue, 2013-07-02 at 21:02 +0100, Andrew Cooper wrote:
> rather than hard coding it and being wrong every time we branch for a release.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
>
> --
> This should be placed in unstable, and backported to 4.3 and 4.2
> ---
> docs/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/docs/Makefile b/docs/Makefile
> index 72bd5e4..472b7ed 100644
> --- a/docs/Makefile
> +++ b/docs/Makefile
> @@ -2,7 +2,7 @@ XEN_ROOT=$(CURDIR)/..
> include $(XEN_ROOT)/Config.mk
> -include $(XEN_ROOT)/config/Docs.mk
>
> -VERSION = xen-unstable
> +VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion)
>
> DOC_MAN5SRC := $(wildcard man/*.pod.5)
> DOC_MAN1SRC := $(wildcard man/*.pod.1)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] docs: Pull Xen version from canonical location
2013-07-02 20:02 [PATCH] docs: Pull Xen version from canonical location Andrew Cooper
2013-07-03 8:57 ` Ian Campbell
@ 2013-07-03 10:03 ` George Dunlap
2013-07-03 10:52 ` Ian Campbell
1 sibling, 1 reply; 7+ messages in thread
From: George Dunlap @ 2013-07-03 10:03 UTC (permalink / raw)
To: Andrew Cooper; +Cc: Ian Jackson, Ian Campbell, Xen-devel
On 02/07/13 21:02, Andrew Cooper wrote:
> rather than hard coding it and being wrong every time we branch for a release.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-acked-by: George Dunlap <george.dunlap@eu.citrix.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] docs: Pull Xen version from canonical location
2013-07-03 10:03 ` George Dunlap
@ 2013-07-03 10:52 ` Ian Campbell
2013-07-03 15:38 ` Ian Campbell
0 siblings, 1 reply; 7+ messages in thread
From: Ian Campbell @ 2013-07-03 10:52 UTC (permalink / raw)
To: George Dunlap; +Cc: Andrew Cooper, Ian Jackson, Xen-devel
On Wed, 2013-07-03 at 11:03 +0100, George Dunlap wrote:
> On 02/07/13 21:02, Andrew Cooper wrote:
> > rather than hard coding it and being wrong every time we branch for a release.
> >
> > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
> Release-acked-by: George Dunlap <george.dunlap@eu.citrix.com>
I'm not sure how this works, I can commit to staging but I can't then
backport to 4.3. Shall I just do the former and leave the latter to IanJ
or shall I leave it all to Ian?
Ian.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] docs: Pull Xen version from canonical location
2013-07-03 10:52 ` Ian Campbell
@ 2013-07-03 15:38 ` Ian Campbell
2013-07-03 15:39 ` Andrew Cooper
0 siblings, 1 reply; 7+ messages in thread
From: Ian Campbell @ 2013-07-03 15:38 UTC (permalink / raw)
To: George Dunlap; +Cc: Andrew Cooper, Ian Jackson, Xen-devel
On Wed, 2013-07-03 at 11:52 +0100, Ian Campbell wrote:
> On Wed, 2013-07-03 at 11:03 +0100, George Dunlap wrote:
> > On 02/07/13 21:02, Andrew Cooper wrote:
> > > rather than hard coding it and being wrong every time we branch for a release.
> > >
> > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> >
> > Release-acked-by: George Dunlap <george.dunlap@eu.citrix.com>
>
> I'm not sure how this works, I can commit to staging but I can't then
> backport to 4.3. Shall I just do the former and leave the latter to IanJ
> or shall I leave it all to Ian?
I've pushed this to staging now.
Apparently it is fine for me to push to 4.3, up until we actually
release, so I shall do so too once I figure out the runes...
Ian.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] docs: Pull Xen version from canonical location
2013-07-03 15:38 ` Ian Campbell
@ 2013-07-03 15:39 ` Andrew Cooper
2013-07-03 15:40 ` Ian Campbell
0 siblings, 1 reply; 7+ messages in thread
From: Andrew Cooper @ 2013-07-03 15:39 UTC (permalink / raw)
To: Ian Campbell; +Cc: George Dunlap, Ian Jackson, Xen-devel
On 03/07/13 16:38, Ian Campbell wrote:
> On Wed, 2013-07-03 at 11:52 +0100, Ian Campbell wrote:
>> On Wed, 2013-07-03 at 11:03 +0100, George Dunlap wrote:
>>> On 02/07/13 21:02, Andrew Cooper wrote:
>>>> rather than hard coding it and being wrong every time we branch for a release.
>>>>
>>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>>> Release-acked-by: George Dunlap <george.dunlap@eu.citrix.com>
>> I'm not sure how this works, I can commit to staging but I can't then
>> backport to 4.3. Shall I just do the former and leave the latter to IanJ
>> or shall I leave it all to Ian?
> I've pushed this to staging now.
>
> Apparently it is fine for me to push to 4.3, up until we actually
> release, so I shall do so too once I figure out the runes...
>
> Ian.
>
Cool. Presumably the backport to 4.2 needs to go through the official
channels?
~Andrew
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] docs: Pull Xen version from canonical location
2013-07-03 15:39 ` Andrew Cooper
@ 2013-07-03 15:40 ` Ian Campbell
0 siblings, 0 replies; 7+ messages in thread
From: Ian Campbell @ 2013-07-03 15:40 UTC (permalink / raw)
To: Andrew Cooper; +Cc: George Dunlap, Ian Jackson, Xen-devel
On Wed, 2013-07-03 at 16:39 +0100, Andrew Cooper wrote:
> On 03/07/13 16:38, Ian Campbell wrote:
> > On Wed, 2013-07-03 at 11:52 +0100, Ian Campbell wrote:
> >> On Wed, 2013-07-03 at 11:03 +0100, George Dunlap wrote:
> >>> On 02/07/13 21:02, Andrew Cooper wrote:
> >>>> rather than hard coding it and being wrong every time we branch for a release.
> >>>>
> >>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> >>> Release-acked-by: George Dunlap <george.dunlap@eu.citrix.com>
> >> I'm not sure how this works, I can commit to staging but I can't then
> >> backport to 4.3. Shall I just do the former and leave the latter to IanJ
> >> or shall I leave it all to Ian?
> > I've pushed this to staging now.
> >
> > Apparently it is fine for me to push to 4.3, up until we actually
> > release, so I shall do so too once I figure out the runes...
> Cool. Presumably the backport to 4.2 needs to go through the official
> channels?
I suppose so.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-07-03 15:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-02 20:02 [PATCH] docs: Pull Xen version from canonical location Andrew Cooper
2013-07-03 8:57 ` Ian Campbell
2013-07-03 10:03 ` George Dunlap
2013-07-03 10:52 ` Ian Campbell
2013-07-03 15:38 ` Ian Campbell
2013-07-03 15:39 ` Andrew Cooper
2013-07-03 15:40 ` Ian Campbell
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.