rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

- bnc#681302 - xm create -x <guest> returns "ImportError: No module

Browse Source 
named ext"
  xm-create-xflag.patch

- Fix xen-utils to cope with xen-unstable c/s 21483

- xz-devel is available since 11.2, make it optional for SLES11SP1

- bnc#665610 - xm console > 1 to same VM messes up both consoles
  Upstream rejected due to portability concern, see
  http://lists.xensource.com/archives/html/xen-devel/2011-02/msg00942.html
  xenconsole-no-multiple-connections.patch
- Enable support for kernel decompression for gzip, bzip2, and LZMA
  so that kernels compressed with any of these methods can be
  launched.

- Update to Xen 4.1.0 c/s 22861

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=102
This commit is contained in:
Charles Arnold
2011-03-21 16:47:37 +00:00
committed by Git OBS Bridge
parent 213dc42b7c
commit 05bedd5488
168 changed files with 1330 additions and 24685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
xen-destdir.diff
View File

@@ -1,7 +1,7 @@
Index: xen-4.0.2-testing/docs/Makefile
Index: xen-4.1.0-testing/docs/Makefile
===================================================================
--- xen-4.0.2-testing.orig/docs/Makefile
+++ xen-4.0.2-testing/docs/Makefile
--- xen-4.1.0-testing.orig/docs/Makefile
+++ xen-4.1.0-testing/docs/Makefile
@@ -90,7 +90,8 @@ install: all
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
cp -dR man1 $(DESTDIR)$(MANDIR)
@@ -22,10 +22,10 @@ Index: xen-4.0.2-testing/docs/Makefile
+ ln -sf $*.html html.done/$*/index.html
+ rm -rf html/
+
Index: xen-4.0.2-testing/tools/security/Makefile
Index: xen-4.1.0-testing/tools/security/Makefile
===================================================================
--- xen-4.0.2-testing.orig/tools/security/Makefile
+++ xen-4.0.2-testing/tools/security/Makefile
--- xen-4.1.0-testing.orig/tools/security/Makefile
+++ xen-4.1.0-testing/tools/security/Makefile
@@ -60,8 +60,8 @@ install: all $(ACM_CONFIG_FILE)
$(INSTALL_DATA) $(ACM_INST_HTML) $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
$(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
@@ -37,10 +37,10 @@ Index: xen-4.0.2-testing/tools/security/Makefile
else
.PHONY: all
all:
Index: xen-4.0.2-testing/tools/pygrub/Makefile
Index: xen-4.1.0-testing/tools/pygrub/Makefile
===================================================================
--- xen-4.0.2-testing.orig/tools/pygrub/Makefile
+++ xen-4.0.2-testing/tools/pygrub/Makefile
--- xen-4.1.0-testing.orig/tools/pygrub/Makefile
+++ xen-4.1.0-testing/tools/pygrub/Makefile
@@ -11,7 +11,7 @@ build:
.PHONY: install
install: all
@@ -50,11 +50,11 @@ Index: xen-4.0.2-testing/tools/pygrub/Makefile
$(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(BINDIR)/pygrub
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
Index: xen-4.0.2-testing/tools/python/Makefile
Index: xen-4.1.0-testing/tools/python/Makefile
===================================================================
--- xen-4.0.2-testing.orig/tools/python/Makefile
+++ xen-4.0.2-testing/tools/python/Makefile
@@ -60,7 +60,7 @@ refresh-po: $(POTFILE)
--- xen-4.1.0-testing.orig/tools/python/Makefile
+++ xen-4.1.0-testing/tools/python/Makefile
@@ -65,7 +65,7 @@ refresh-po: $(POTFILE)
.PHONY: install
install: install-messages install-dtd
CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \
@@ -63,19 +63,19 @@ Index: xen-4.0.2-testing/tools/python/Makefile
install-dtd: all
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/xen
Index: xen-4.0.2-testing/tools/xenstore/Makefile
Index: xen-4.1.0-testing/tools/xenstore/Makefile
===================================================================
--- xen-4.0.2-testing.orig/tools/xenstore/Makefile
+++ xen-4.0.2-testing/tools/xenstore/Makefile
--- xen-4.1.0-testing.orig/tools/xenstore/Makefile
+++ xen-4.1.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
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
@@ -35,7 +36,7 @@ endif
@@ -32,7 +33,7 @@ ALL_TARGETS = libxenstore.so libxenstore
all: $(ALL_TARGETS)
.PHONY: clients
@@ -84,7 +84,7 @@ Index: xen-4.0.2-testing/tools/xenstore/Makefile
ifeq ($(CONFIG_SunOS),y)
xenstored_probes.h: xenstored_probes.d
@@ -55,6 +56,9 @@ xenstored: $(XENSTORED_OBJS)
@@ -52,6 +53,9 @@ xenstored: $(XENSTORED_OBJS)
$(CLIENTS): xenstore
ln -f xenstore $@
@@ -94,7 +94,7 @@ Index: xen-4.0.2-testing/tools/xenstore/Makefile
xenstore: xenstore_client.o $(LIBXENSTORE)
$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@
@@ -82,7 +86,7 @@ clean:
@@ -79,7 +83,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
@@ -103,15 +103,15 @@ Index: xen-4.0.2-testing/tools/xenstore/Makefile
$(RM) $(DEPS)
.PHONY: TAGS
@@ -100,6 +104,7 @@ ifneq ($(CONFIG_OCAML_XENSTORED),y)
$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
$(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
endif
+ $(INSTALL_DIR) $(DESTDIR)/bin
@@ -95,6 +99,7 @@ install: all
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
@@ -108,6 +113,9 @@ endif
+ $(INSTALL_DIR) $(DESTDIR)/bin
$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
$(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
@@ -103,6 +108,9 @@ install: all
set -e ; for c in $(CLIENTS) ; do \
ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \
done
@@ -121,11 +121,11 @@ Index: xen-4.0.2-testing/tools/xenstore/Makefile
$(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.0.2-testing/tools/hotplug/Linux/Makefile
Index: xen-4.1.0-testing/tools/hotplug/Linux/Makefile
===================================================================
--- xen-4.0.2-testing.orig/tools/hotplug/Linux/Makefile
+++ xen-4.0.2-testing/tools/hotplug/Linux/Makefile
@@ -38,18 +38,6 @@ endif
--- xen-4.1.0-testing.orig/tools/hotplug/Linux/Makefile
+++ xen-4.1.0-testing/tools/hotplug/Linux/Makefile
@@ -41,18 +41,6 @@ endif
UDEV_RULES_DIR = $(CONFIG_DIR)/udev
UDEV_RULES = xen-backend.rules xend.rules
@@ -144,34 +144,26 @@ Index: xen-4.0.2-testing/tools/hotplug/Linux/Makefile
.PHONY: all
all:
@@ -57,16 +45,16 @@ 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)$(CONFIG_DIR)/init.d ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/init.d
- [ -d $(DESTDIR)$(CONFIG_DIR)/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/sysconfig
[ -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)$(CONFIG_DIR)/init.d
- $(INSTALL_PROG) $(XEND_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xend
+ $(INSTALL_PROG) $(XEND_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/
$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
- $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xendomains
$(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
install-scripts:
@@ -96,8 +84,7 @@ install-udev:
$(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d
set -e; for i in $(UDEV_RULES); \
do \
- $(INSTALL_DATA) $$i $(DESTDIR)$(UDEV_RULES_DIR); \
- ln -sf ../$$i $(DESTDIR)$(UDEV_RULES_DIR)/rules.d; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(UDEV_RULES_DIR)/rules.d; \
done
.PHONY: clean