[PATCH for-xen-4.5 0/3] tools: build system fixes and cleanups

[PATCH for-xen-4.5 0/3] tools: build system fixes and cleanups

[Daniel Kiper]

Hi,

Here are three tools build system patches:
  - tools/hotplug: distclean target should remove files generated by configure,
  - gitignore: ignore some files generated by configure,
  - gitignore: group tools/hotplug files in one place.

First two are real fixes. Last one is a cleanup which is nice to have
but not required at this stage of 4.5 development.

Daniel

 .gitignore             |   12 +++++++-----
 tools/Makefile         |    3 +++
 tools/hotplug/Makefile |    5 ++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

Daniel Kiper (3):
      tools/hotplug: distclean target should remove files generated by configure
      gitignore: ignore some files generated by configure
      gitignore: group tools/hotplug files in one place

[PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure

[Daniel Kiper]

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
---
 tools/Makefile         |    3 +++
 tools/hotplug/Makefile |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/Makefile b/tools/Makefile
index af9798a..19b24f3 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -261,6 +261,9 @@ subdir-all-debugger/kdd: .phony
 subdir-distclean-firmware: .phony
 	$(MAKE) -C firmware distclean
 
+subdir-distclean-hotplug: .phony
+	$(MAKE) -C hotplug distclean
+
 subtree-force-update:
 ifeq ($(CONFIG_QEMU_XEN),y)
 	$(MAKE) qemu-xen-dir-force-update
diff --git a/tools/hotplug/Makefile b/tools/hotplug/Makefile
index 14ae9a8..a29a522 100644
--- a/tools/hotplug/Makefile
+++ b/tools/hotplug/Makefile
@@ -6,5 +6,8 @@ SUBDIRS-$(CONFIG_NetBSD) += NetBSD
 SUBDIRS-$(CONFIG_Linux) += Linux
 SUBDIRS-$(CONFIG_FreeBSD) += FreeBSD
 
-.PHONY: all clean install
+.PHONY: all clean distclean install
 all clean install: %: subdirs-%
+
+distclean:
+	rm -f Linux/init.d/sysconfig.xencommons Linux/init.d/xencommons NetBSD/rc.d/xencommons
-- 
1.7.10.4

Re: [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure

[Konrad Rzeszutek Wilk]

On Tue, Dec 02, 2014 at 04:16:28PM +0100, Daniel Kiper wrote:
> Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>

This usage scenario which I can see this being useful (and
I've tripped over this) is when you rebuild a new version
from the same repo. As in, this affects developers, but
not end-users and not distros. But perhaps I am missing
one scenario?

As such I would lean towards deferring this (and the other
two) to Xen 4.6.

Thank you!
> ---
>  tools/Makefile         |    3 +++
>  tools/hotplug/Makefile |    5 ++++-
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/Makefile b/tools/Makefile
> index af9798a..19b24f3 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -261,6 +261,9 @@ subdir-all-debugger/kdd: .phony
>  subdir-distclean-firmware: .phony
>  	$(MAKE) -C firmware distclean
>  
> +subdir-distclean-hotplug: .phony
> +	$(MAKE) -C hotplug distclean
> +
>  subtree-force-update:
>  ifeq ($(CONFIG_QEMU_XEN),y)
>  	$(MAKE) qemu-xen-dir-force-update
> diff --git a/tools/hotplug/Makefile b/tools/hotplug/Makefile
> index 14ae9a8..a29a522 100644
> --- a/tools/hotplug/Makefile
> +++ b/tools/hotplug/Makefile
> @@ -6,5 +6,8 @@ SUBDIRS-$(CONFIG_NetBSD) += NetBSD
>  SUBDIRS-$(CONFIG_Linux) += Linux
>  SUBDIRS-$(CONFIG_FreeBSD) += FreeBSD
>  
> -.PHONY: all clean install
> +.PHONY: all clean distclean install
>  all clean install: %: subdirs-%
> +
> +distclean:
> +	rm -f Linux/init.d/sysconfig.xencommons Linux/init.d/xencommons NetBSD/rc.d/xencommons
> -- 
> 1.7.10.4
> 

Re: [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure

[Daniel Kiper]

On Tue, Dec 02, 2014 at 01:36:20PM -0500, Konrad Rzeszutek Wilk wrote:
> On Tue, Dec 02, 2014 at 04:16:28PM +0100, Daniel Kiper wrote:
> > Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
>
> This usage scenario which I can see this being useful (and
> I've tripped over this) is when you rebuild a new version
> from the same repo. As in, this affects developers, but
> not end-users and not distros. But perhaps I am missing
> one scenario?
>
> As such I would lean towards deferring this (and the other
> two) to Xen 4.6.

As I know Debian build system sometimes complain if make distclean
does not leave build tree in distclean state (read "state before
configure" != "state after distclean"). It means that from
distros point of view we should apply this patch. However,
other two are not required and we can deffer them to Xen 4.6.

Daniel

Re: [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure

[Konrad Rzeszutek Wilk]

On Wed, Dec 03, 2014 at 04:53:53PM +0100, Daniel Kiper wrote:
> On Tue, Dec 02, 2014 at 01:36:20PM -0500, Konrad Rzeszutek Wilk wrote:
> > On Tue, Dec 02, 2014 at 04:16:28PM +0100, Daniel Kiper wrote:
> > > Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
> >
> > This usage scenario which I can see this being useful (and
> > I've tripped over this) is when you rebuild a new version
> > from the same repo. As in, this affects developers, but
> > not end-users and not distros. But perhaps I am missing
> > one scenario?
> >
> > As such I would lean towards deferring this (and the other
> > two) to Xen 4.6.
> 
> As I know Debian build system sometimes complain if make distclean
> does not leave build tree in distclean state (read "state before
> configure" != "state after distclean"). It means that from
> distros point of view we should apply this patch. However,
> other two are not required and we can deffer them to Xen 4.6.

Cc-ing Axel and Debian Xen Team.
> 
> Daniel

Re: [Pkg-xen-devel] [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure

[Ian Campbell]

On Wed, 2014-12-03 at 15:36 -0500, Konrad Rzeszutek Wilk wrote:
> On Wed, Dec 03, 2014 at 04:53:53PM +0100, Daniel Kiper wrote:
> > On Tue, Dec 02, 2014 at 01:36:20PM -0500, Konrad Rzeszutek Wilk wrote:
> > > On Tue, Dec 02, 2014 at 04:16:28PM +0100, Daniel Kiper wrote:
> > > > Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
> > >
> > > This usage scenario which I can see this being useful (and
> > > I've tripped over this) is when you rebuild a new version
> > > from the same repo. As in, this affects developers, but
> > > not end-users and not distros. But perhaps I am missing
> > > one scenario?
> > >
> > > As such I would lean towards deferring this (and the other
> > > two) to Xen 4.6.
> > 
> > As I know Debian build system sometimes complain if make distclean
> > does not leave build tree in distclean state (read "state before
> > configure" != "state after distclean"). It means that from
> > distros point of view we should apply this patch. However,
> > other two are not required and we can deffer them to Xen 4.6.
> 
> Cc-ing Axel and Debian Xen Team.

Debian is shipping 4.4 in the next release (8, Jessie, already frozen)
and I think it likely that the release after that will ship something
greater than 4.5 due to the timelines involved.

In any case, the Debian Xen packages cannot have any bugs of the kind
mentioned here because the package copyies the source to
debian/build/foo (for reasons other than distclean) and nuking the
entire of debian/build on clean.

Ian.

Re: [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure

[Konrad Rzeszutek Wilk]

On Tue, Dec 02, 2014 at 01:36:20PM -0500, Konrad Rzeszutek Wilk wrote:
> On Tue, Dec 02, 2014 at 04:16:28PM +0100, Daniel Kiper wrote:
> > Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
> 
> This usage scenario which I can see this being useful (and
> I've tripped over this) is when you rebuild a new version
> from the same repo. As in, this affects developers, but


Lets get it in. It fixes an issues that I keep on tripping
on and it is harmless enough that I don't see a way
for this to cause any regressions.

Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> not end-users and not distros. But perhaps I am missing
> one scenario?
> 
> As such I would lean towards deferring this (and the other
> two) to Xen 4.6.
> 
> Thank you!
> > ---
> >  tools/Makefile         |    3 +++
> >  tools/hotplug/Makefile |    5 ++++-
> >  2 files changed, 7 insertions(+), 1 deletion(-)
> > 
> > diff --git a/tools/Makefile b/tools/Makefile
> > index af9798a..19b24f3 100644
> > --- a/tools/Makefile
> > +++ b/tools/Makefile
> > @@ -261,6 +261,9 @@ subdir-all-debugger/kdd: .phony
> >  subdir-distclean-firmware: .phony
> >  	$(MAKE) -C firmware distclean
> >  
> > +subdir-distclean-hotplug: .phony
> > +	$(MAKE) -C hotplug distclean
> > +
> >  subtree-force-update:
> >  ifeq ($(CONFIG_QEMU_XEN),y)
> >  	$(MAKE) qemu-xen-dir-force-update
> > diff --git a/tools/hotplug/Makefile b/tools/hotplug/Makefile
> > index 14ae9a8..a29a522 100644
> > --- a/tools/hotplug/Makefile
> > +++ b/tools/hotplug/Makefile
> > @@ -6,5 +6,8 @@ SUBDIRS-$(CONFIG_NetBSD) += NetBSD
> >  SUBDIRS-$(CONFIG_Linux) += Linux
> >  SUBDIRS-$(CONFIG_FreeBSD) += FreeBSD
> >  
> > -.PHONY: all clean install
> > +.PHONY: all clean distclean install
> >  all clean install: %: subdirs-%
> > +
> > +distclean:
> > +	rm -f Linux/init.d/sysconfig.xencommons Linux/init.d/xencommons NetBSD/rc.d/xencommons
> > -- 
> > 1.7.10.4
> > 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure

[Daniel Kiper]

On Thu, Dec 04, 2014 at 09:53:40PM -0400, Konrad Rzeszutek Wilk wrote:
> On Tue, Dec 02, 2014 at 01:36:20PM -0500, Konrad Rzeszutek Wilk wrote:
> > On Tue, Dec 02, 2014 at 04:16:28PM +0100, Daniel Kiper wrote:
> > > Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
> >
> > This usage scenario which I can see this being useful (and
> > I've tripped over this) is when you rebuild a new version
> > from the same repo. As in, this affects developers, but
>
>
> Lets get it in. It fixes an issues that I keep on tripping
> on and it is harmless enough that I don't see a way
> for this to cause any regressions.
>
> Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Great! Thanks!

Daniel

Re: [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure

[Ian Campbell]

On Tue, 2014-12-02 at 16:16 +0100, Daniel Kiper wrote:

> +distclean:
> +	rm -f Linux/init.d/sysconfig.xencommons Linux/init.d/xencommons NetBSD/rc.d/xencommons

Configure generates a boatload more things than this, see e.g. 

$ grep hotplug/ tools/configure.ac 

Perhaps the answer would be to recurse into tools/hotplug/* and refactor
the existing XEN_SCRIPTS to have the generated stuff in XEN_SCRIPTS_GEN
instead and XEN_SCRIPTS += $(XEN_SCRIPTS). The on distclean remove the
XEN_SCRIPTS_GEN ones.

It's not ideal, but at least it puts the distclean logic in the same
place as the logic to install the files, if not their generation, which
at least increases the chance of someone adding it to the right place.

Ian.

Re: [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure

[Konrad Rzeszutek Wilk]

On Tue, Dec 09, 2014 at 02:35:37PM +0000, Ian Campbell wrote:
> On Tue, 2014-12-02 at 16:16 +0100, Daniel Kiper wrote:
> 
> > +distclean:
> > +	rm -f Linux/init.d/sysconfig.xencommons Linux/init.d/xencommons NetBSD/rc.d/xencommons
> 
> Configure generates a boatload more things than this, see e.g. 
> 
> $ grep hotplug/ tools/configure.ac 
> 
> Perhaps the answer would be to recurse into tools/hotplug/* and refactor
> the existing XEN_SCRIPTS to have the generated stuff in XEN_SCRIPTS_GEN
> instead and XEN_SCRIPTS += $(XEN_SCRIPTS). The on distclean remove the
> XEN_SCRIPTS_GEN ones.
> 
> It's not ideal, but at least it puts the distclean logic in the same
> place as the logic to install the files, if not their generation, which
> at least increases the chance of someone adding it to the right place.

Daniel pointed to me that the two other patches that were committed
solve the problem of seeing those auto-generated files sticking (and
forcing one to use git checkout XYZ -f).

So this small patch can be ditched in favour of the more encompassing
design that you have sketched out.

Thank you!
> 
> Ian.
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

[PATCH for-xen-4.5 2/3] gitignore: ignore some files generated by configure

[Daniel Kiper]

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
---
 .gitignore |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index b24e905..2b51d5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,12 +141,15 @@ tools/flask/utils/flask-set-bool
 tools/flask/utils/flask-label-pci
 tools/hotplug/common/hotplugpath.sh
 tools/hotplug/FreeBSD/rc.d/xencommons
+tools/hotplug/Linux/init.d/sysconfig.xencommons
 tools/hotplug/Linux/init.d/xen-watchdog
+tools/hotplug/Linux/init.d/xencommons
 tools/hotplug/Linux/init.d/xendomains
 tools/hotplug/Linux/vif-setup
 tools/hotplug/Linux/xen-backend.rules
 tools/hotplug/Linux/xen-hotplug-common.sh
 tools/hotplug/Linux/xendomains
+tools/hotplug/NetBSD/rc.d/xencommons
 tools/include/xen/*
 tools/include/xen-foreign/*.(c|h|size)
 tools/include/xen-foreign/checker
-- 
1.7.10.4

Re: [PATCH for-xen-4.5 2/3] gitignore: ignore some files generated by configure

[Ian Campbell]

On Tue, 2014-12-02 at 16:16 +0100, Daniel Kiper wrote:
> Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>

.gitignore updates seem harmless enough. so I've applied this and the
third patch. Awaiting Konrad's verdict on the first.

> ---
>  .gitignore |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/.gitignore b/.gitignore
> index b24e905..2b51d5f 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -141,12 +141,15 @@ tools/flask/utils/flask-set-bool
>  tools/flask/utils/flask-label-pci
>  tools/hotplug/common/hotplugpath.sh
>  tools/hotplug/FreeBSD/rc.d/xencommons
> +tools/hotplug/Linux/init.d/sysconfig.xencommons
>  tools/hotplug/Linux/init.d/xen-watchdog
> +tools/hotplug/Linux/init.d/xencommons
>  tools/hotplug/Linux/init.d/xendomains
>  tools/hotplug/Linux/vif-setup
>  tools/hotplug/Linux/xen-backend.rules
>  tools/hotplug/Linux/xen-hotplug-common.sh
>  tools/hotplug/Linux/xendomains
> +tools/hotplug/NetBSD/rc.d/xencommons
>  tools/include/xen/*
>  tools/include/xen-foreign/*.(c|h|size)
>  tools/include/xen-foreign/checker

Re: [PATCH for-xen-4.5 2/3] gitignore: ignore some files generated by configure

[Daniel Kiper]

On Thu, Dec 04, 2014 at 01:25:55PM +0000, Ian Campbell wrote:
> On Tue, 2014-12-02 at 16:16 +0100, Daniel Kiper wrote:
> > Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
>
> .gitignore updates seem harmless enough. so I've applied this and the
> third patch. Awaiting Konrad's verdict on the first.

Thanks!

Daniel

[PATCH for-xen-4.5 3/3] gitignore: group tools/hotplug files in one place

[Daniel Kiper]

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
---
 .gitignore |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b51d5f..8c8c06f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,6 +145,10 @@ tools/hotplug/Linux/init.d/sysconfig.xencommons
 tools/hotplug/Linux/init.d/xen-watchdog
 tools/hotplug/Linux/init.d/xencommons
 tools/hotplug/Linux/init.d/xendomains
+tools/hotplug/Linux/systemd/*.conf
+tools/hotplug/Linux/systemd/*.mount
+tools/hotplug/Linux/systemd/*.socket
+tools/hotplug/Linux/systemd/*.service
 tools/hotplug/Linux/vif-setup
 tools/hotplug/Linux/xen-backend.rules
 tools/hotplug/Linux/xen-hotplug-common.sh
@@ -329,8 +333,3 @@ tools/xenstore/xenstore-watch
 docs/txt/misc/*.txt
 docs/txt/man/*.txt
 docs/figs/*.png
-
-tools/hotplug/Linux/systemd/*.conf
-tools/hotplug/Linux/systemd/*.mount
-tools/hotplug/Linux/systemd/*.socket
-tools/hotplug/Linux/systemd/*.service
-- 
1.7.10.4