[PATCH for-4.5 0/4] Misc build system tweaks

[PATCH for-4.5 0/4] Misc build system tweaks

[Andrew Cooper]

This is a collection of 4 misc build system changes which I have collected
while attempting to port Xen-4.5 to a XenServer experimental branch (in the
hopes of testing the RCs)

I am requesting a release ack on the grounds of these being minor build system
changes, unrelated to code itself.

Andrew Cooper (4):
  gitignore: Cleanup
  tools/xenstore: Introduce clients-install target
  tools/xenstore: Only create SBINDIR if it is to be used
  tools/ocaml: Gate building tests on CONFIG_TESTS

 .gitignore              |   39 ---------------------------------------
 tools/ocaml/Makefile    |    5 +++--
 tools/xenstore/Makefile |   10 +++++++++-
 3 files changed, 12 insertions(+), 42 deletions(-)

-- 
1.7.10.4

[PATCH for-4.5 1/4] gitignore: Cleanup

[Andrew Cooper]

This is a rough pruning based mainly on directories which no longer exist.
Some of this was code deleted in 2007.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <JBeulich@suse.com>
CC: Tim Deegan <tim@xen.org>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 .gitignore |   39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2201cb0..b24e905 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,24 +52,6 @@ extras/mini-os/include/xen
 extras/mini-os/include/list.h
 extras/mini-os/mini-os*
 install/*
-linux-[^/]*-paravirt/*
-linux-2.6[^/]*/*
-linux-[^/]*-rc/*
-linux-[^/]*-tip/*
-linux-[^/]*-git/*
-linux-[^/]*.patch
-mkddbxen
-netbsd-[^/]*-tools/*
-netbsd-[^/]*-xen0/*
-netbsd-[^/]*-xenU/*
-netbsd-[^/]*.patch
-patches/*/.makedep
-patches/ebtables-brnf-5_vs_2.4.25.diff
-patches/ebtables.diff
-patches/tmp/*
-pristine-*
-ref-*
-tmp-*
 stubdom/autom4te.cache/
 stubdom/binutils-*
 stubdom/config.log
@@ -124,7 +106,6 @@ tools/blktap/drivers/img2qcow
 tools/blktap/drivers/qcow-create
 tools/blktap/drivers/qcow2raw
 tools/blktap/drivers/tapdisk
-tools/check/.*
 tools/console/xenconsole
 tools/console/xenconsoled
 tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/*
@@ -158,7 +139,6 @@ tools/flask/utils/flask-loadpolicy
 tools/flask/utils/flask-setenforce
 tools/flask/utils/flask-set-bool
 tools/flask/utils/flask-label-pci
-tools/fs-back/fs-backend
 tools/hotplug/common/hotplugpath.sh
 tools/hotplug/FreeBSD/rc.d/xencommons
 tools/hotplug/Linux/init.d/xen-watchdog
@@ -193,8 +173,6 @@ tools/misc/lowmemd
 tools/misc/xencov
 tools/pygrub/build/*
 tools/python/build/*
-tools/remus/imqebt/imqebt
-tools/remus/kmod/*(.cmd|.mod|.ko|.mod.c|.symvers|.xen)
 tools/security/secpol_tool
 tools/security/xen/*
 tools/security/xensec_tool
@@ -208,22 +186,14 @@ tools/tests/regression/build/*
 tools/tests/regression/downloads/*
 tools/tests/mem-sharing/memshrtool
 tools/tests/mce-test/tools/xen-mceinj
-tools/vtpm/tpm_emulator-*.tar.gz
-tools/vtpm/tpm_emulator/*
-tools/vtpm/vtpm/*
-tools/vtpm_manager/manager/vtpm_managerd
 tools/xcutils/lsevtchn
 tools/xcutils/readnotes
-tools/xenfb/sdlfb
-tools/xenfb/vncfb
 tools/xenmon/xentrace_setmask
 tools/xenmon/xenbaked
 tools/xenpaging/xenpaging
 tools/xenpmd/xenpmd
 tools/xenstat/xentop/xentop
-tools/xenstore/testsuite/tmp/*
 tools/xenstore/init-xenstore-domain
-tools/xenstore/xen
 tools/xenstore/xenstore
 tools/xenstore/xenstore-chmod
 tools/xenstore/xenstore-exists
@@ -235,17 +205,11 @@ tools/xenstore/xenstore-control
 tools/xenstore/xenstore-ls
 tools/xenstore/xenstored
 tools/xenstore/xenstored_test
-tools/xenstore/xs_crashme
-tools/xenstore/xs_random
-tools/xenstore/xs_stress
 tools/xenstore/xs_tdb_dump
-tools/xenstore/xs_test
-tools/xenstore/xs_watch_stress
 tools/xentrace/xentrace_setsize
 tools/xentrace/tbctl
 tools/xentrace/xenctx
 tools/xentrace/xentrace
-tools/ocaml-xenstored*
 xen/.banner
 xen/System.map
 xen/arch/arm/asm-offsets.s
@@ -264,13 +228,10 @@ xen/arch/*/efi/boot.c
 xen/arch/*/efi/compat.c
 xen/arch/*/efi/efi.h
 xen/arch/*/efi/runtime.c
-xen/ddb/*
 xen/include/headers.chk
 xen/include/asm
 xen/include/asm-*/asm-offsets.h
 xen/include/compat/*
-xen/include/hypervisor-ifs/arch
-xen/include/linux
 xen/include/public/public
 xen/include/xen/*.new
 xen/include/xen/acm_policy.h
-- 
1.7.10.4

[PATCH for-4.5 2/4] tools/xenstore: Introduce clients-install target

[Andrew Cooper]

...to match the existing 'clients' built target.  This is particularly useful
when rebuilding the xenstore clients separately for a non-dom0 environment.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
---
 tools/xenstore/Makefile |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 563abd4..cb4ab42 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -150,6 +150,14 @@ endif
 	ln -sf xenstore-compat/xs.h  $(DESTDIR)$(INCLUDEDIR)/xs.h
 	ln -sf xenstore-compat/xs_lib.h $(DESTDIR)$(INCLUDEDIR)/xs_lib.h
 
+.PHONY: clients-install
+clients-install: clients
+	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+	$(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR)
+	set -e ; for c in $(CLIENTS) ; do \
+		ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \
+	done
+
 -include $(DEPS)
 
 # never delete any intermediate files.
-- 
1.7.10.4

[PATCH for-4.5 3/4] tools/xenstore: Only create SBINDIR if it is to be used

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
---
 tools/xenstore/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index cb4ab42..bff9b25 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -126,10 +126,10 @@ tarball: clean
 .PHONY: install
 install: all
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat
 ifeq ($(XENSTORE_XENSTORED),y)
+	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED)
 	$(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
 endif
-- 
1.7.10.4

[PATCH for-4.5 4/4] tools/ocaml: Gate building tests on CONFIG_TESTS

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: David Scott <dave.scott@eu.citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
---
 tools/ocaml/Makefile |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/ocaml/Makefile b/tools/ocaml/Makefile
index 8e4ca36..5710a5f 100644
--- a/tools/ocaml/Makefile
+++ b/tools/ocaml/Makefile
@@ -1,9 +1,12 @@
 XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-SUBDIRS_PROGRAMS = xenstored test
+SUBDIRS := libs
+SUBDIRS += xenstored
 
-SUBDIRS = libs $(SUBDIRS_PROGRAMS)
+ifeq ($(CONFIG_TESTS),y)
+SUBDIRS += test
+endif
 
 .NOTPARALLEL:
 # targets here must be run in order, otherwise we can try
-- 
1.7.10.4

Re: [PATCH for-4.5 4/4] tools/ocaml: Gate building tests on CONFIG_TESTS

[Dave Scott]

Looks good to me!

Acked-by: David Scott <dave.scott@citrix.com>

On 7 Oct 2014, at 12:02, Andrew Cooper <andrew.cooper3@citrix.com> wrote:

> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: David Scott <dave.scott@eu.citrix.com>
> CC: Ian Campbell <Ian.Campbell@citrix.com>
> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> CC: Wei Liu <wei.liu2@citrix.com>
> ---
> tools/ocaml/Makefile |    7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/ocaml/Makefile b/tools/ocaml/Makefile
> index 8e4ca36..5710a5f 100644
> --- a/tools/ocaml/Makefile
> +++ b/tools/ocaml/Makefile
> @@ -1,9 +1,12 @@
> XEN_ROOT = $(CURDIR)/../..
> include $(XEN_ROOT)/tools/Rules.mk
> 
> -SUBDIRS_PROGRAMS = xenstored test
> +SUBDIRS := libs
> +SUBDIRS += xenstored
> 
> -SUBDIRS = libs $(SUBDIRS_PROGRAMS)
> +ifeq ($(CONFIG_TESTS),y)
> +SUBDIRS += test
> +endif
> 
> .NOTPARALLEL:
> # targets here must be run in order, otherwise we can try
> -- 
> 1.7.10.4
> 

Re: [PATCH for-4.5 0/4] Misc build system tweaks

[Konrad Rzeszutek Wilk]

On Tue, Oct 07, 2014 at 12:02:06PM +0100, Andrew Cooper wrote:
> This is a collection of 4 misc build system changes which I have collected
> while attempting to port Xen-4.5 to a XenServer experimental branch (in the
> hopes of testing the RCs)
> 
> I am requesting a release ack on the grounds of these being minor build system
> changes, unrelated to code itself.
> 
> Andrew Cooper (4):
>   gitignore: Cleanup
>   tools/xenstore: Introduce clients-install target
>   tools/xenstore: Only create SBINDIR if it is to be used
>   tools/ocaml: Gate building tests on CONFIG_TESTS
> 
>  .gitignore              |   39 ---------------------------------------
>  tools/ocaml/Makefile    |    5 +++--
>  tools/xenstore/Makefile |   10 +++++++++-
>  3 files changed, 12 insertions(+), 42 deletions(-)

42! You can't go wrong with this kind of patchset!

Quick, check it in before the count number changes!

Released-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

> 
> -- 
> 1.7.10.4
> 

Re: [PATCH for-4.5 0/4] Misc build system tweaks

[Ian Campbell]

On Tue, 2014-10-07 at 10:47 -0400, Konrad Rzeszutek Wilk wrote:
> On Tue, Oct 07, 2014 at 12:02:06PM +0100, Andrew Cooper wrote:
> > This is a collection of 4 misc build system changes which I have collected
> > while attempting to port Xen-4.5 to a XenServer experimental branch (in the
> > hopes of testing the RCs)
> > 
> > I am requesting a release ack on the grounds of these being minor build system
> > changes, unrelated to code itself.
> > 
> > Andrew Cooper (4):
> >   gitignore: Cleanup
> >   tools/xenstore: Introduce clients-install target
> >   tools/xenstore: Only create SBINDIR if it is to be used
> >   tools/ocaml: Gate building tests on CONFIG_TESTS
> > 
> >  .gitignore              |   39 ---------------------------------------
> >  tools/ocaml/Makefile    |    5 +++--
> >  tools/xenstore/Makefile |   10 +++++++++-
> >  3 files changed, 12 insertions(+), 42 deletions(-)
> 
> 42! You can't go wrong with this kind of patchset!
> 
> Quick, check it in before the count number changes!
> 
> Released-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Acked + Applied.