e28f3504fe
12.2 + Xen 4.2 + 'xl' toolstack xen-pygrub-grub-args.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=208
189 lines
7.1 KiB
Diff
189 lines
7.1 KiB
Diff
Index: xen-4.2.0-testing/tools/xenstore/Makefile
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/xenstore/Makefile
|
|
+++ xen-4.2.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
|
|
|
|
@@ -38,7 +39,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
|
|
@@ -66,6 +67,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)
|
|
|
|
@@ -93,7 +97,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
|
|
@@ -110,6 +114,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)
|
|
@@ -118,6 +123,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.2.0-testing/tools/hotplug/Linux/Makefile
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/hotplug/Linux/Makefile
|
|
+++ xen-4.2.0-testing/tools/hotplug/Linux/Makefile
|
|
@@ -41,18 +41,6 @@ endif
|
|
UDEV_RULES_DIR = $(CONFIG_DIR)/udev
|
|
UDEV_RULES = xen-backend.rules xend.rules
|
|
|
|
-DI = $(if $(DISTDIR),$(shell readlink -f $(DISTDIR)),)
|
|
-DE = $(if $(DESTDIR),$(shell readlink -f $(DESTDIR)),)
|
|
-ifeq ($(findstring $(DI),$(DE)),$(DI))
|
|
-HOTPLUGS=install-hotplug install-udev
|
|
-else
|
|
-ifeq ($(shell [ $(UDEVVER) -ge 059 ] && echo 1),1)
|
|
-HOTPLUGS=install-udev
|
|
-else
|
|
-HOTPLUGS=install-hotplug
|
|
-endif
|
|
-endif
|
|
-
|
|
.PHONY: all
|
|
all:
|
|
|
|
@@ -60,18 +48,18 @@ all:
|
|
build:
|
|
|
|
.PHONY: install
|
|
-install: all install-initd install-scripts $(HOTPLUGS)
|
|
+install: all install-initd install-scripts install-udev
|
|
|
|
# See docs/misc/distro_mapping.txt for INITD_DIR location
|
|
.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/
|
|
$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(INITD_DIR)
|
|
$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR)
|
|
- $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains
|
|
+ $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/
|
|
$(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR)
|
|
- $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xencommons
|
|
+ $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/
|
|
$(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(INITD_DIR)
|
|
|
|
.PHONY: install-scripts
|
|
Index: xen-4.2.0-testing/tools/firmware/etherboot/Makefile
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/firmware/etherboot/Makefile
|
|
+++ xen-4.2.0-testing/tools/firmware/etherboot/Makefile
|
|
@@ -28,12 +28,12 @@ all: $(ROMS)
|
|
$(MAKE) -C $D/src bin/$(*F).rom
|
|
|
|
$T:
|
|
- if ! wget -O _$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 ! wget -O _$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
|
|
Index: xen-4.2.0-testing/stubdom/Makefile
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/stubdom/Makefile
|
|
+++ xen-4.2.0-testing/stubdom/Makefile
|
|
@@ -396,7 +396,7 @@ install-grub: pv-grub
|
|
|
|
install-xenstore: xenstore-stubdom
|
|
$(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/boot"
|
|
- $(INSTALL_PROG) mini-os-$(XEN_TARGET_ARCH)-xenstore/mini-os.gz "$(DESTDIR)/usr/lib/xen/boot/xenstore-stubdom.gz"
|
|
+ $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-xenstore/mini-os.gz "$(DESTDIR)/usr/lib/xen/boot/xenstore-stubdom.gz"
|
|
|
|
#######
|
|
# clean
|
|
Index: xen-4.2.0-testing/tools/blktap2/vhd/lib/Makefile
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/blktap2/vhd/lib/Makefile
|
|
+++ xen-4.2.0-testing/tools/blktap2/vhd/lib/Makefile
|
|
@@ -68,7 +68,7 @@ libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR
|
|
|
|
install: all
|
|
$(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR)
|
|
- $(INSTALL_PROG) libvhd.a $(DESTDIR)$(INST-DIR)
|
|
+ $(INSTALL_DATA) libvhd.a $(DESTDIR)$(INST-DIR)
|
|
$(INSTALL_PROG) libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)
|
|
ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR)
|
|
ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so
|
|
Index: xen-4.2.0-testing/tools/blktap/lib/Makefile
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/blktap/lib/Makefile
|
|
+++ xen-4.2.0-testing/tools/blktap/lib/Makefile
|
|
@@ -23,23 +23,26 @@ OBJS = $(SRCS:.c=.o)
|
|
OBJS_PIC = $(SRCS:.c=.opic)
|
|
IBINS :=
|
|
|
|
-LIB = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
|
|
+LIB = libblktap.a
|
|
+LIB_SO = libblktap.so.$(MAJOR).$(MINOR)
|
|
+LIB_ALL = $(LIB) $(LIB_SO)
|
|
|
|
.PHONY: all
|
|
-all: $(LIB)
|
|
+all: $(LIB_ALL)
|
|
|
|
.PHONY: install
|
|
install: all
|
|
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
|
|
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
|
|
- $(INSTALL_PROG) $(LIB) $(DESTDIR)$(LIBDIR)
|
|
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
|
|
+ $(INSTALL_PROG) $(LIB_SO) $(DESTDIR)$(LIBDIR)
|
|
ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
|
|
ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
|
|
$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
|
|
|
|
.PHONY: clean
|
|
clean:
|
|
- rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen TAGS
|
|
+ rm -rf *.a *.so* *.o *.opic *.rpm $(LIB_ALL) *~ $(DEPS) xen TAGS
|
|
|
|
libblktap.so.$(MAJOR).$(MINOR): $(OBJS_PIC)
|
|
$(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_LDFLAGS) \
|