f18f683ba6
xen-4.7.0-testing-src.tar.bz2 - Dropped: xen-4.6.1-testing-src.tar.bz2 55f7f9d2-libxl-slightly-refine-pci-assignable-add-remove-handling.patch 5628fc67-libxl-No-emulated-disk-driver-for-xvdX-disk.patch 5644b756-x86-HVM-don-t-inject-DB-with-error-code.patch 5649bcbe-libxl-relax-readonly-check-introduced-by-XSA-142-fix.patch hotplug-Linux-block-performance-fix.patch set-mtu-from-bridge-for-tap-interface.patch xendomains-libvirtd-conflict.patch xsa154.patch xsa155-xen-0001-xen-Add-RING_COPY_REQUEST.patch xsa155-xen-0002-blktap2-Use-RING_COPY_REQUEST.patch xsa155-xen-0003-libvchan-Read-prod-cons-only-once.patch xsa170.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=414
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
Index: xen-4.7.0-testing/tools/xenstore/Makefile
|
|
===================================================================
|
|
--- xen-4.7.0-testing.orig/tools/xenstore/Makefile
|
|
+++ xen-4.7.0-testing/tools/xenstore/Makefile
|
|
@@ -21,6 +21,7 @@ LDFLAGS += $(LDFLAGS-y)
|
|
|
|
CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod
|
|
CLIENTS += xenstore-write xenstore-ls xenstore-watch
|
|
+CLIENTS_DOMU := $(patsubst xenstore-%,domu-xenstore-%,$(CLIENTS))
|
|
|
|
XENSTORED_OBJS = xenstored_core.o xenstored_watch.o xenstored_domain.o xenstored_transaction.o xs_lib.o talloc.o utils.o tdb.o hashtable.o
|
|
|
|
@@ -55,7 +56,7 @@ endif
|
|
all: $(ALL_TARGETS)
|
|
|
|
.PHONY: clients
|
|
-clients: xenstore $(CLIENTS) xenstore-control
|
|
+clients: xenstore $(CLIENTS) $(CLIENTS_DOMU) xenstore-control
|
|
|
|
ifeq ($(CONFIG_SunOS),y)
|
|
xenstored_probes.h: xenstored_probes.d
|
|
@@ -80,6 +81,9 @@ xenstored.a: $(XENSTORED_OBJS)
|
|
$(CLIENTS): xenstore
|
|
ln -f xenstore $@
|
|
|
|
+$(CLIENTS_DOMU): xenstore
|
|
+ ln -f xenstore $@
|
|
+
|
|
xenstore: xenstore_client.o $(LIBXENSTORE)
|
|
$(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
|
|
|
|
@@ -107,7 +111,7 @@ clean:
|
|
rm -f *.a *.o *.opic *.so* xenstored_probes.h
|
|
rm -f xenstored xs_random xs_stress xs_crashme
|
|
rm -f xs_tdb_dump xenstore-control init-xenstore-domain
|
|
- rm -f xenstore $(CLIENTS)
|
|
+ rm -f xenstore $(CLIENTS) $(CLIENTS_DOMU)
|
|
$(RM) $(DEPS)
|
|
|
|
.PHONY: distclean
|
|
@@ -130,12 +134,16 @@ ifeq ($(XENSTORE_XENSTORED),y)
|
|
$(INSTALL_DIR) $(DESTDIR)$(sbindir)
|
|
$(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED)
|
|
$(INSTALL_PROG) xenstored $(DESTDIR)$(sbindir)
|
|
+ $(INSTALL_DIR) $(DESTDIR)/bin
|
|
endif
|
|
$(INSTALL_PROG) xenstore-control $(DESTDIR)$(bindir)
|
|
$(INSTALL_PROG) xenstore $(DESTDIR)$(bindir)
|
|
set -e ; for c in $(CLIENTS) ; do \
|
|
ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \
|
|
done
|
|
+ for client in $(CLIENTS_DOMU); do \
|
|
+ $(INSTALL_PROG) $$client $(DESTDIR)$(bindir)/$${client/domu-}; \
|
|
+ done
|
|
$(INSTALL_DIR) $(DESTDIR)$(libdir)
|
|
$(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
|
|
ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenstore.so.$(MAJOR)
|