[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v3 04/15] xenstore: move init-xenstore-domain to tools/helpers
The program init-xenstore-domain to start a xenstore domain instead of the xenstored daemon is built, but not installed. Change that. Move the program to a new tools subdirectory "helpers" to be able to use libxl in a later patch. Otherwise a dependency loop will be created. Signed-off-by: Juergen Gross <jgross@xxxxxxxx> --- V3: don't adapt coding style as requested by Ian Campbell adjust .gitignore --- .gitignore | 2 +- tools/Makefile | 1 + tools/helpers/Makefile | 34 ++++++++++++++++++++++ tools/{xenstore => helpers}/init-xenstore-domain.c | 0 tools/xenstore/Makefile | 9 ------ 5 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 tools/helpers/Makefile rename tools/{xenstore => helpers}/init-xenstore-domain.c (100%) diff --git a/.gitignore b/.gitignore index e0df903..ec1cde3 100644 --- a/.gitignore +++ b/.gitignore @@ -132,6 +132,7 @@ tools/flask/utils/flask-loadpolicy tools/flask/utils/flask-setenforce tools/flask/utils/flask-set-bool tools/flask/utils/flask-label-pci +tools/helpers/init-xenstore-domain tools/hotplug/common/hotplugpath.sh tools/hotplug/FreeBSD/rc.d/xencommons tools/hotplug/FreeBSD/rc.d/xendriverdomain @@ -200,7 +201,6 @@ tools/xenmon/xenbaked tools/xenpaging/xenpaging tools/xenpmd/xenpmd tools/xenstat/xentop/xentop -tools/xenstore/init-xenstore-domain tools/xenstore/xenstore tools/xenstore/xenstore-chmod tools/xenstore/xenstore-exists diff --git a/tools/Makefile b/tools/Makefile index 9f74ac7..124919b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -30,6 +30,7 @@ endif SUBDIRS-y += xenpmd SUBDIRS-y += libxl +SUBDIRS-y += helpers SUBDIRS-$(CONFIG_X86) += xenpaging SUBDIRS-$(CONFIG_X86) += debugger/gdbsx SUBDIRS-$(CONFIG_X86) += debugger/kdd diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile new file mode 100644 index 0000000..52347fd --- /dev/null +++ b/tools/helpers/Makefile @@ -0,0 +1,34 @@ +# +# tools/helpers/Makefile +# + +XEN_ROOT = $(CURDIR)/../.. +include $(XEN_ROOT)/tools/Rules.mk + +ifeq ($(CONFIG_Linux),y) +PROGS += init-xenstore-domain +endif + +INIT_XENSTORE_DOMAIN_OBJS = init-xenstore-domain.o +$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenguest) +$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenctrl) +$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenstore) + +.PHONY: all +all: $(PROGS) + +init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS) + $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) + +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) +ifeq ($(CONFIG_Linux),y) + $(INSTALL_PROG) init-xenstore-domain $(DESTDIR)$(LIBEXEC_BIN) +endif + +.PHONY: clean +clean: + $(RM) -f *.o $(PROGS) $(DEPS) + +distclean: clean diff --git a/tools/xenstore/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c similarity index 100% rename from tools/xenstore/init-xenstore-domain.c rename to tools/helpers/init-xenstore-domain.c diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 1b4a494..404d4cb 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -46,10 +46,6 @@ ifeq ($(XENSTORE_XENSTORED),y) ALL_TARGETS += xs_tdb_dump xenstored endif -ifeq ($(CONFIG_Linux),y) -ALL_TARGETS += init-xenstore-domain -endif - ifdef CONFIG_STUBDOM CFLAGS += -DNO_SOCKETS=1 endif @@ -72,11 +68,6 @@ xenstored_probes.o: xenstored_solaris.o CFLAGS += -DHAVE_DTRACE=1 endif -init-xenstore-domain.o: CFLAGS += $(CFLAGS_libxenguest) - -init-xenstore-domain: init-xenstore-domain.o $(LIBXENSTORE) - $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) -o $@ $(APPEND_LDFLAGS) - xenstored: $(XENSTORED_OBJS) $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) -- 2.6.2 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |