e09562d587
- Drop 32bit support from spec file - Dropped 520d417d-xen-Add-stdbool.h-workaround-for-BSD.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=282
104 lines
4.1 KiB
Diff
104 lines
4.1 KiB
Diff
Index: xen-4.4.0-testing/tools/xenstore/Makefile
|
|
===================================================================
|
|
--- xen-4.4.0-testing.orig/tools/xenstore/Makefile
|
|
+++ xen-4.4.0-testing/tools/xenstore/Makefile
|
|
@@ -10,6 +10,7 @@ CFLAGS += $(CFLAGS_libxenctrl)
|
|
|
|
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
|
|
|
|
@@ -41,7 +42,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
|
|
@@ -69,6 +70,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)
|
|
|
|
@@ -96,7 +100,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: TAGS
|
|
@@ -113,6 +117,7 @@ install: all
|
|
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
|
|
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
|
|
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat
|
|
+ $(INSTALL_DIR) $(DESTDIR)/bin
|
|
$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
|
|
$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
|
|
$(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
|
|
@@ -121,6 +126,9 @@ install: all
|
|
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)/bin/$${client/domu-}; \
|
|
+ done
|
|
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
|
|
$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
|
|
ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
|
|
Index: xen-4.4.0-testing/tools/hotplug/Linux/Makefile
|
|
===================================================================
|
|
--- xen-4.4.0-testing.orig/tools/hotplug/Linux/Makefile
|
|
+++ xen-4.4.0-testing/tools/hotplug/Linux/Makefile
|
|
@@ -46,14 +46,14 @@ install: all install-initd install-scrip
|
|
.PHONY: install-initd
|
|
install-initd:
|
|
[ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
|
|
- [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR)
|
|
+ [ -d $(DESTDIR)/var/adm/fillup-templates ] || $(INSTALL_DIR) $(DESTDIR)/var/adm/fillup-templates/
|
|
ifeq ($(CONFIG_XEND),y)
|
|
$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(INITD_DIR)
|
|
endif
|
|
$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR)
|
|
- $(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains
|
|
+ $(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/
|
|
$(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR)
|
|
- $(INSTALL_DATA) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xencommons
|
|
+ $(INSTALL_DATA) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/
|
|
$(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(INITD_DIR)
|
|
|
|
.PHONY: install-scripts
|
|
Index: xen-4.4.0-testing/tools/firmware/etherboot/Makefile
|
|
===================================================================
|
|
--- xen-4.4.0-testing.orig/tools/firmware/etherboot/Makefile
|
|
+++ xen-4.4.0-testing/tools/firmware/etherboot/Makefile
|
|
@@ -28,12 +28,12 @@ all: $(ROMS)
|
|
$(MAKE) -C $D/src bin/$(*F).rom
|
|
|
|
$T:
|
|
- if ! $(FETCHER) _$T $(IPXE_TARBALL_URL); then \
|
|
- $(GIT) clone $(IPXE_GIT_URL) $D.git; \
|
|
- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
|
|
- $(IPXE_GIT_TAG) | gzip >../_$T); \
|
|
- rm -rf $D.git; \
|
|
- fi
|
|
+ #if ! $(FETCHER) _$T $(IPXE_TARBALL_URL); then \
|
|
+ # $(GIT) clone $(IPXE_GIT_URL) $D.git; \
|
|
+ # (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
|
|
+ # $(IPXE_GIT_TAG) | gzip >../_$T); \
|
|
+ # rm -rf $D.git; \
|
|
+ #fi
|
|
mv _$T $T
|
|
|
|
$D/src/arch/i386/Makefile: $T Config
|