[PATCH] docs: Pull Xen version from canonical location

[PATCH] docs: Pull Xen version from canonical location

[Andrew Cooper]

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

Re: [PATCH] docs: Pull Xen version from canonical location

[Ian Campbell]

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)

Re: [PATCH] docs: Pull Xen version from canonical location

[George Dunlap]

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>

Re: [PATCH] docs: Pull Xen version from canonical location

[Ian Campbell]

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.

Re: [PATCH] docs: Pull Xen version from canonical location

[Ian Campbell]

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.

Re: [PATCH] docs: Pull Xen version from canonical location

[Andrew Cooper]

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

Re: [PATCH] docs: Pull Xen version from canonical location

[Ian Campbell]

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.