diff options
| author | CoprDistGit <infra@openeuler.org> | 2023-10-12 04:00:49 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2023-10-12 04:00:49 +0000 |
| commit | c22f60e6e55f1bf300dd76d2222a93911f3b2bb2 (patch) | |
| tree | ef665e7018377f53612ac2751dcaea35a1c587b6 /xen-destdir.patch | |
| parent | 39a4763249cd6289e5019acfe0c98dbb169f5f2e (diff) | |
automatic import of xenopeneuler22.03_LTS
Diffstat (limited to 'xen-destdir.patch')
| -rw-r--r-- | xen-destdir.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/xen-destdir.patch b/xen-destdir.patch new file mode 100644 index 0000000..4fb1ed9 --- /dev/null +++ b/xen-destdir.patch @@ -0,0 +1,57 @@ +Index: xen-4.11.0-testing/tools/xenstore/Makefile +=================================================================== +--- xen-4.11.0-testing.orig/tools/xenstore/Makefile ++++ xen-4.11.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_OBJS += xenstored_transaction.o xenstored_control.o +@@ -57,7 +58,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 +@@ -87,6 +88,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) $(LDLIBS_libxentoolcore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) + +@@ -139,7 +143,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 -f xenstore.pc + $(RM) $(DEPS_RM) + +@@ -163,12 +167,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) |