M A Young
2010-Jul-20 18:01 UTC
[PATCH] Re: [Xen-devel] New release candidate for Xen 4.0.1
I have a minor fix for this. BASH_COMPLETION_DIR is used uninitialized in tools/libxl/Makefile which means that xl.sh can end up in / which is not ideal. The patch below sets a sensible default for this variable. Signed-off-by: Michael Young <m.a.young@durham.ac.uk> --- xen-4.0.1/tools/libxl/Makefile.orig 2010-07-16 18:27:14.000000000 +0100 +++ xen-4.0.1/tools/libxl/Makefile 2010-07-16 19:39:46.000000000 +0100 @@ -4,6 +4,7 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk +BASH_COMPLETION_DIR ?= /etc/bash_completion.d/ MAJOR = 1.0 MINOR = 0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2010-Jul-20 18:32 UTC
Re: [PATCH] Re: [Xen-devel] New release candidate for Xen 4.0.1
Shouldn''t this be in xen-unstable first, and then backported in the usual way? K. On 20/07/2010 19:01, "M A Young" <m.a.young@durham.ac.uk> wrote:> I have a minor fix for this. BASH_COMPLETION_DIR is used uninitialized in > tools/libxl/Makefile which means that xl.sh can end up in / which is not > ideal. > The patch below sets a sensible default for this variable. > > Signed-off-by: Michael Young <m.a.young@durham.ac.uk> > > --- xen-4.0.1/tools/libxl/Makefile.orig 2010-07-16 18:27:14.000000000 +0100 > +++ xen-4.0.1/tools/libxl/Makefile 2010-07-16 19:39:46.000000000 +0100 > @@ -4,6 +4,7 @@ > > XEN_ROOT = ../.. > include $(XEN_ROOT)/tools/Rules.mk > +BASH_COMPLETION_DIR ?= /etc/bash_completion.d/ > > MAJOR = 1.0 > MINOR = 0 > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
M A Young
2010-Jul-21 09:42 UTC
Re: [PATCH] Re: [Xen-devel] New release candidate for Xen 4.0.1
On Tue, 20 Jul 2010, Keir Fraser wrote:> Shouldn''t this be in xen-unstable first, and then backported in the usual > way?If that is the normal process then yes. I haven''t checked whether this bug exists in xen-unstable, but a quick glance at the Makefile I am patching suggests that it probably does. Michael Young _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2010-Jul-21 10:23 UTC
Re: [PATCH] Re: [Xen-devel] New release candidate for Xen 4.0.1
On 21/07/2010 10:42, "M A Young" <m.a.young@durham.ac.uk> wrote:> On Tue, 20 Jul 2010, Keir Fraser wrote: > >> Shouldn''t this be in xen-unstable first, and then backported in the usual >> way? > > If that is the normal process then yes. I haven''t checked whether this > bug exists in xen-unstable, but a quick glance at the Makefile I am > patching suggests that it probably does.The precise process for toolset patches now is that they get applied to http://xenbits.xen.org/staging/xen-unstable-tools.hg by Ian Jackson or Stefano Stabellini. I merge that tree into main xen-unstable.hg nearly every day. Then, for 4.0.x and 3.4.x stable branches, Ian and Stefano nominate patches for backport from xen-unstable. -- Keir> Michael Young_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Stefano Stabellini
2010-Jul-21 11:53 UTC
Re: [PATCH] Re: [Xen-devel] New release candidate for Xen 4.0.1
On Tue, 20 Jul 2010, M A Young wrote:> I have a minor fix for this. BASH_COMPLETION_DIR is used uninitialized in > tools/libxl/Makefile which means that xl.sh can end up in / which is not ideal. > The patch below sets a sensible default for this variable. > > Signed-off-by: Michael Young <m.a.young@durham.ac.uk> > > --- xen-4.0.1/tools/libxl/Makefile.orig 2010-07-16 18:27:14.000000000 +0100 > +++ xen-4.0.1/tools/libxl/Makefile 2010-07-16 19:39:46.000000000 +0100 > @@ -4,6 +4,7 @@ > > XEN_ROOT = ../.. > include $(XEN_ROOT)/tools/Rules.mk > +BASH_COMPLETION_DIR ?= /etc/bash_completion.d/ > > MAJOR = 1.0 > MINOR = 0 >I would rather backport this to xen4.0: # HG changeset patch # User Keir Fraser <keir.fraser@citrix.com> # Date 1276064492 -3600 # Node ID 0c10e80e083b115313bfc213e7683f4fc3f761bc # Parent 87fe942a90b1d96b5e378fa5b221fd8eeba439da tools: fix install bash-completion files to non-default locations. Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> diff -r 87fe942a90b1 -r 0c10e80e083b Config.mk --- a/Config.mk Wed Jun 09 07:18:30 2010 +0100 +++ b/Config.mk Wed Jun 09 07:21:32 2010 +0100 @@ -29,7 +29,7 @@ include $(XEN_ROOT)/config/$(XEN_TARGET_ SHAREDIR ?= $(PREFIX)/share DOCDIR ?= $(SHAREDIR)/doc/xen MANDIR ?= $(SHAREDIR)/man -BASH_COMPLETION_DIR ?= /etc/bash_completion.d +BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d ifneq ($(EXTRA_PREFIX),) EXTRA_INCLUDES += $(EXTRA_PREFIX)/include _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
M A Young
2010-Jul-21 12:08 UTC
Re: [PATCH] Re: [Xen-devel] New release candidate for Xen 4.0.1
On Wed, 21 Jul 2010, Stefano Stabellini wrote:> I would rather backport this to xen4.0: > > > # HG changeset patch > # User Keir Fraser <keir.fraser@citrix.com> > # Date 1276064492 -3600 > # Node ID 0c10e80e083b115313bfc213e7683f4fc3f761bc > # Parent 87fe942a90b1d96b5e378fa5b221fd8eeba439da > tools: fix install bash-completion files to non-default locations. > > Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> > > diff -r 87fe942a90b1 -r 0c10e80e083b Config.mk > --- a/Config.mk Wed Jun 09 07:18:30 2010 +0100 > +++ b/Config.mk Wed Jun 09 07:21:32 2010 +0100 > @@ -29,7 +29,7 @@ include $(XEN_ROOT)/config/$(XEN_TARGET_ > SHAREDIR ?= $(PREFIX)/share > DOCDIR ?= $(SHAREDIR)/doc/xen > MANDIR ?= $(SHAREDIR)/man > -BASH_COMPLETION_DIR ?= /etc/bash_completion.d > +BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d > > ifneq ($(EXTRA_PREFIX),) > EXTRA_INCLUDES += $(EXTRA_PREFIX)/include >Adding that line at that place looks reasonable, though that patch won''t work because there isn''t currently a BASH_COMPLETION_DIR line in Config.mk, hence the original bug. It looks like the selective backport http://xenbits.xensource.com/xen-4.0-testing.hg?rev/b1321a50f626 of xl stuff missed this. Michael Young _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Stefano Stabellini
2010-Jul-21 12:14 UTC
Re: [PATCH] Re: [Xen-devel] New release candidate for Xen 4.0.1
On Wed, 21 Jul 2010, M A Young wrote:> On Wed, 21 Jul 2010, Stefano Stabellini wrote: > > > I would rather backport this to xen4.0: > > > > > > # HG changeset patch > > # User Keir Fraser <keir.fraser@citrix.com> > > # Date 1276064492 -3600 > > # Node ID 0c10e80e083b115313bfc213e7683f4fc3f761bc > > # Parent 87fe942a90b1d96b5e378fa5b221fd8eeba439da > > tools: fix install bash-completion files to non-default locations. > > > > Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> > > > > diff -r 87fe942a90b1 -r 0c10e80e083b Config.mk > > --- a/Config.mk Wed Jun 09 07:18:30 2010 +0100 > > +++ b/Config.mk Wed Jun 09 07:21:32 2010 +0100 > > @@ -29,7 +29,7 @@ include $(XEN_ROOT)/config/$(XEN_TARGET_ > > SHAREDIR ?= $(PREFIX)/share > > DOCDIR ?= $(SHAREDIR)/doc/xen > > MANDIR ?= $(SHAREDIR)/man > > -BASH_COMPLETION_DIR ?= /etc/bash_completion.d > > +BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d > > > > ifneq ($(EXTRA_PREFIX),) > > EXTRA_INCLUDES += $(EXTRA_PREFIX)/include > > > > Adding that line at that place looks reasonable, though that patch won''t > work because there isn''t currently a BASH_COMPLETION_DIR line in > Config.mk, hence the original bug. It looks like the selective backport > http://xenbits.xensource.com/xen-4.0-testing.hg?rev/b1321a50f626 > of xl stuff missed this.Indeed. Thanks for pointing out this bug. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2010-Jul-21 12:48 UTC
Re: [PATCH] Re: [Xen-devel] New release candidate for Xen 4.0.1
On 21/07/2010 13:14, "Stefano Stabellini" <Stefano.Stabellini@eu.citrix.com> wrote:>> Adding that line at that place looks reasonable, though that patch won''t >> work because there isn''t currently a BASH_COMPLETION_DIR line in >> Config.mk, hence the original bug. It looks like the selective backport >> http://xenbits.xensource.com/xen-4.0-testing.hg?rev/b1321a50f626 >> of xl stuff missed this. > > Indeed. > Thanks for pointing out this bug.Yeah, I think we need to net effect of xen-unstable changesets 21253, 21517 and 21565 on Config.mk. I can sort that out easy enough, it''s still basically a one liner. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Dan Magenheimer
2010-Jul-21 16:30 UTC
RE: [PATCH] Re: [Xen-devel] New release candidate for Xen 4.0.1
One result of this process is that it makes it difficult to see changes via the xen-changelog mailing list as the pull by Keir into xen-unstable just shows up as a Merge, without any of the changeset title or log detail. Any way to fix this? If necessary, by adding the staging/xen-unstable-tools.hg tree to the changelog mailing list?> -----Original Message----- > From: Keir Fraser [mailto:keir.fraser@eu.citrix.com] > Sent: Wednesday, July 21, 2010 4:23 AM > To: M A Young > Cc: Ian Campbell; xen-devel@lists.xensource.com; Stefano Stabellini > Subject: Re: [PATCH] Re: [Xen-devel] New release candidate for Xen > 4.0.1 > > On 21/07/2010 10:42, "M A Young" <m.a.young@durham.ac.uk> wrote: > > > On Tue, 20 Jul 2010, Keir Fraser wrote: > > > >> Shouldn''t this be in xen-unstable first, and then backported in the > usual > >> way? > > > > If that is the normal process then yes. I haven''t checked whether > this > > bug exists in xen-unstable, but a quick glance at the Makefile I am > > patching suggests that it probably does. > > The precise process for toolset patches now is that they get applied to > http://xenbits.xen.org/staging/xen-unstable-tools.hg by Ian Jackson or > Stefano Stabellini. I merge that tree into main xen-unstable.hg nearly > every > day. Then, for 4.0.x and 3.4.x stable branches, Ian and Stefano > nominate > patches for backport from xen-unstable. > > -- Keir > > > Michael Young > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2010-Jul-21 16:46 UTC
Re: [PATCH] Re: [Xen-devel] New release candidate for Xen 4.0.1
Er, no. There''s still one email per changeset. You can ignore the merge changesets: they''re all trivial auto merges, and I''m not sure why they end up with an associated diff, it must be how mercurial consolidates and merges a branch. -- Keir On 21/07/2010 17:30, "Dan Magenheimer" <dan.magenheimer@oracle.com> wrote:> One result of this process is that it makes it difficult > to see changes via the xen-changelog mailing list as > the pull by Keir into xen-unstable just shows up as > a Merge, without any of the changeset title or log detail. > Any way to fix this? If necessary, by adding the > staging/xen-unstable-tools.hg tree to the changelog > mailing list? > >> -----Original Message----- >> From: Keir Fraser [mailto:keir.fraser@eu.citrix.com] >> Sent: Wednesday, July 21, 2010 4:23 AM >> To: M A Young >> Cc: Ian Campbell; xen-devel@lists.xensource.com; Stefano Stabellini >> Subject: Re: [PATCH] Re: [Xen-devel] New release candidate for Xen >> 4.0.1 >> >> On 21/07/2010 10:42, "M A Young" <m.a.young@durham.ac.uk> wrote: >> >>> On Tue, 20 Jul 2010, Keir Fraser wrote: >>> >>>> Shouldn''t this be in xen-unstable first, and then backported in the >> usual >>>> way? >>> >>> If that is the normal process then yes. I haven''t checked whether >> this >>> bug exists in xen-unstable, but a quick glance at the Makefile I am >>> patching suggests that it probably does. >> >> The precise process for toolset patches now is that they get applied to >> http://xenbits.xen.org/staging/xen-unstable-tools.hg by Ian Jackson or >> Stefano Stabellini. I merge that tree into main xen-unstable.hg nearly >> every >> day. Then, for 4.0.x and 3.4.x stable branches, Ian and Stefano >> nominate >> patches for backport from xen-unstable. >> >> -- Keir >> >>> Michael Young >> >> >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xensource.com >> http://lists.xensource.com/xen-devel_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2010-Jul-23 15:49 UTC
Re: [PATCH] Re: [Xen-devel] New release candidate for Xen 4.0.1
Keir Fraser writes ("Re: [PATCH] Re: [Xen-devel] New release candidate for
Xen 4.0.1"):> Er, no. There''s still one email per changeset. You can ignore the
merge
> changesets: they''re all trivial auto merges, and I''m not
sure why they end
> up with an associated diff, it must be how mercurial consolidates and
merges
> a branch.
Right.
We could add the separate tools tree to the patchbot but it would
result in every tools patch being mailed out twice.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel