047483513a
xen-4.6.0-testing-src.tar.bz2 mini-os.tar.bz2 blktap2-no-uninit.patch stubdom-have-iovec.patch - Renamed xsa149.patch to CVE-2015-7969-xsa149.patch - Dropped patches now contained in tarball or unnecessary xen-4.5.2-testing-src.tar.bz2 54c2553c-grant-table-use-uint16_t-consistently-for-offset-and-length.patch 54ca33bc-grant-table-refactor-grant-copy-to-reduce-duplicate-code.patch 54ca340e-grant-table-defer-releasing-pages-acquired-in-a-grant-copy.patch 54f4985f-libxl-fix-libvirtd-double-free.patch 55103616-vm-assist-prepare-for-discontiguous-used-bit-numbers.patch 551ac326-xentop-add-support-for-qdisk.patch 552d0fd2-x86-hvm-don-t-include-asm-spinlock-h.patch 552d0fe8-x86-mtrr-include-asm-atomic.h.patch 552d293b-x86-vMSI-X-honor-all-mask-requests.patch 552d2966-x86-vMSI-X-add-valid-bits-for-read-acceleration.patch 5537a4d8-libxl-use-DEBUG-log-level-instead-of-INFO.patch 5548e903-domctl-don-t-truncate-XEN_DOMCTL_max_mem-requests.patch 5548e95d-x86-allow-to-suppress-M2P-user-mode-exposure.patch 554c7aee-x86-provide-arch_fetch_and_add.patch 554c7b00-arm-provide-arch_fetch_and_add.patch 554cc211-libxl-add-qxl.patch 55534b0a-x86-provide-add_sized.patch 55534b25-arm-provide-add_sized.patch 5555a4f8-use-ticket-locks-for-spin-locks.patch 5555a5b9-x86-arm-remove-asm-spinlock-h.patch 5555a8ec-introduce-non-contiguous-allocation.patch 556d973f-unmodified-drivers-tolerate-IRQF_DISABLED-being-undefined.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=387
60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
Index: xen-4.6.0-testing/tools/xenstore/Makefile
|
|
===================================================================
|
|
--- xen-4.6.0-testing.orig/tools/xenstore/Makefile
|
|
+++ xen-4.6.0-testing/tools/xenstore/Makefile
|
|
@@ -20,6 +20,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
|
|
|
|
@@ -58,7 +59,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
|
|
@@ -86,6 +87,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)
|
|
|
|
@@ -113,7 +117,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
|
|
@@ -136,13 +140,17 @@ 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
|
|
- $(INSTALL_DIR) $(DESTDIR)$(libdir)
|
|
+ for client in $(CLIENTS_DOMU); do \
|
|
+ $(INSTALL_PROG) $$client $(DESTDIR)/bin/$${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)
|
|
ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenstore.so
|