xenstore: Make building of xenstored optional

In principle it would be possible to make a rumpuser-xen-based stub
xenstored, but all the necessary pieces do not yet exist.

So provide a facility to disable compilation of xenstored, and use it
to disable it on rump kernels.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/config/NetBSDRump.mk b/config/NetBSDRump.mk
index e06327253e65c21ed85c8146fc4519768374450c..e32c1cd7bcb27f5346ff11ab0e6918d9cd3019ba 100644 (file)
--- a/config/NetBSDRump.mk
+++ b/config/NetBSDRump.mk
@@ -6,3 +6,5 @@ PTHREAD_LIBS =
 XEN_LOCK_DIR = /var/lib
 
 WGET = ftp
+
+XENSTORE_XENSTORED=n

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 13d8fc13b3176b0d89d316c55fecce8b6063a342..0a8dd3eba2728fc3ab7d05f13a3f9d9ed5c649c7 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -19,6 +19,8 @@ XEN_LIBVCHAN       = $(XEN_ROOT)/tools/libvchan
 
 CFLAGS_xeninclude = -I$(XEN_INCLUDE)
 
+XENSTORE_XENSTORED ?= y
+
 CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
 LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so
 SHLIB_libxenctrl  = -Wl,-rpath-link=$(XEN_LIBXC)

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 8421865f4067e7da8ae4284943bd01ae9bd45c53..a9473d6d2c999b45d00571637e0befbff8e0eb45 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -28,7 +28,10 @@ LIBXENSTORE := libxenstore.a
 xenstore xenstore-control: CFLAGS += -static
 endif
 
-ALL_TARGETS = libxenstore.so libxenstore.a clients xs_tdb_dump xenstored
+ALL_TARGETS = libxenstore.so libxenstore.a clients
+ifeq ($(XENSTORE_XENSTORED),y)
+ALL_TARGETS += xs_tdb_dump xenstored
+endif
 
 ifeq ($(CONFIG_Linux),y)
 ALL_TARGETS += init-xenstore-domain
@@ -114,8 +117,10 @@ install: all
        $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat
+ifeq ($(XENSTORE_XENSTORED),y)
        $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
        $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
+endif
        $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
        $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR)
        set -e ; for c in $(CLIENTS) ; do \