Re: [Xen-devel] [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure
On Tue, Dec 09, 2014 at 02:35:37PM +, 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 ___ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Re: [Xen-devel] [Pkg-xen-devel] [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure
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.ki...@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. ___ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure
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.ki...@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 ___ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure
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.ki...@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 ___ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
[Xen-devel] [PATCH for-xen-4.5 1/3] tools/hotplug: distclean target should remove files generated by configure
Signed-off-by: Daniel Kiper daniel.ki...@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 ___ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
