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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=48

Browse Source
This commit is contained in:
OBS User unknown
2008-07-18 23:04:37 +00:00
committed by Git OBS Bridge
parent 8ae8ea2a74
commit f5d6338f4d
101 changed files with 2069 additions and 10556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
xen-destdir.diff
View File

@@ -1,7 +1,7 @@
Index: xen-3.2-testing/docs/Makefile
Index: xen-3.3.0-testing/docs/Makefile
===================================================================
--- xen-3.2-testing.orig/docs/Makefile
+++ xen-3.2-testing/docs/Makefile
--- xen-3.3.0-testing.orig/docs/Makefile
+++ xen-3.3.0-testing/docs/Makefile
@@ -90,7 +90,8 @@ install: all
$(INSTALL_DIR) $(DESTDIR)$(mandir)
cp -dR man1 $(DESTDIR)$(mandir)
@@ -22,36 +22,11 @@ Index: xen-3.2-testing/docs/Makefile
+ ln -sf $*.html html.done/$*/index.html
+ rm -rf html/
+
Index: xen-3.2-testing/tools/xentrace/Makefile
Index: xen-3.3.0-testing/tools/examples/Makefile
===================================================================
--- xen-3.2-testing.orig/tools/xentrace/Makefile
+++ xen-3.2-testing/tools/xentrace/Makefile
@@ -38,14 +38,14 @@ install: build
[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
[ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
- [ -d $(DESTDIR)/usr/share/man/man1 ] || \
- $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
- [ -d $(DESTDIR)/usr/share/man/man8 ] || \
- $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
+ [ -d $(DESTDIR)$(MANDIR)/man1 ] || \
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
+ [ -d $(DESTDIR)$(MANDIR)/man8 ] || \
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
- $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
- $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
+ $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MANDIR)/man8
.PHONY: clean
clean:
Index: xen-3.2-testing/tools/examples/Makefile
===================================================================
--- xen-3.2-testing.orig/tools/examples/Makefile
+++ xen-3.2-testing/tools/examples/Makefile
@@ -41,18 +41,6 @@ XEN_HOTPLUG_SCRIPTS = xen-backend.agent
--- xen-3.3.0-testing.orig/tools/examples/Makefile
+++ xen-3.3.0-testing/tools/examples/Makefile
@@ -39,18 +39,6 @@ XEN_HOTPLUG_SCRIPTS = xen-backend.agent
UDEV_RULES_DIR = /etc/udev
UDEV_RULES = xen-backend.rules
@@ -70,7 +45,7 @@ Index: xen-3.2-testing/tools/examples/Makefile
.PHONY: all
all:
@@ -60,15 +48,15 @@ all:
@@ -58,15 +46,15 @@ all:
build:
.PHONY: install
@@ -89,7 +64,7 @@ Index: xen-3.2-testing/tools/examples/Makefile
.PHONY: install-configs
install-configs: $(XEN_CONFIGS)
@@ -109,8 +97,7 @@ install-udev:
@@ -107,8 +95,7 @@ install-udev:
$(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d
set -e; for i in $(UDEV_RULES); \
do \
@@ -99,10 +74,10 @@ Index: xen-3.2-testing/tools/examples/Makefile
done
.PHONY: clean
Index: xen-3.2-testing/tools/security/Makefile
Index: xen-3.3.0-testing/tools/security/Makefile
===================================================================
--- xen-3.2-testing.orig/tools/security/Makefile
+++ xen-3.2-testing/tools/security/Makefile
--- xen-3.3.0-testing.orig/tools/security/Makefile
+++ xen-3.3.0-testing/tools/security/Makefile
@@ -64,9 +64,9 @@ install: all $(ACM_CONFIG_FILE)
$(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
$(INSTALL_PROG) $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
@@ -115,10 +90,10 @@ Index: xen-3.2-testing/tools/security/Makefile
endif
else
.PHONY: all
Index: xen-3.2-testing/tools/pygrub/Makefile
Index: xen-3.3.0-testing/tools/pygrub/Makefile
===================================================================
--- xen-3.2-testing.orig/tools/pygrub/Makefile
+++ xen-3.2-testing/tools/pygrub/Makefile
--- xen-3.3.0-testing.orig/tools/pygrub/Makefile
+++ xen-3.3.0-testing/tools/pygrub/Makefile
@@ -16,7 +16,7 @@ install: all
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
else
@@ -128,10 +103,10 @@ Index: xen-3.2-testing/tools/pygrub/Makefile
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
endif
Index: xen-3.2-testing/tools/python/Makefile
Index: xen-3.3.0-testing/tools/python/Makefile
===================================================================
--- xen-3.2-testing.orig/tools/python/Makefile
+++ xen-3.2-testing/tools/python/Makefile
--- xen-3.3.0-testing.orig/tools/python/Makefile
+++ xen-3.3.0-testing/tools/python/Makefile
@@ -80,7 +80,7 @@ install: install-messages install-dtd
CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force --install-lib="$(DESTDIR)$(LIBPATH)/python"
else
@@ -141,22 +116,10 @@ Index: xen-3.2-testing/tools/python/Makefile
endif
install-dtd: all
Index: xen-3.2-testing/tools/Makefile
Index: xen-3.3.0-testing/docs/Docs.mk
===================================================================
--- xen-3.2-testing.orig/tools/Makefile
+++ xen-3.2-testing/tools/Makefile
@@ -25,7 +25,6 @@ SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
# These don't cross-compile
ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
SUBDIRS-$(PYTHON_TOOLS) += python
-SUBDIRS-$(PYTHON_TOOLS) += pygrub
endif
.PHONY: all
Index: xen-3.2-testing/docs/Docs.mk
===================================================================
--- xen-3.2-testing.orig/docs/Docs.mk
+++ xen-3.2-testing/docs/Docs.mk
--- xen-3.3.0-testing.orig/docs/Docs.mk
+++ xen-3.3.0-testing/docs/Docs.mk
@@ -8,6 +8,6 @@ POD2MAN := pod2man
DOT := dot
NEATO := neato
@@ -166,72 +129,74 @@ Index: xen-3.2-testing/docs/Docs.mk
+pkgdocdir := $(DOCDIR)
+mandir := $(MANDIR)
Index: xen-3.2-testing/tools/xenstore/Makefile
Index: xen-3.3.0-testing/tools/xenstore/Makefile
===================================================================
--- xen-3.2-testing.orig/tools/xenstore/Makefile
+++ xen-3.2-testing/tools/xenstore/Makefile
@@ -20,6 +20,7 @@ LDFLAGS += $(PROFILE) -L$(XEN_LIBXC)
--- xen-3.3.0-testing.orig/tools/xenstore/Makefile
+++ xen-3.3.0-testing/tools/xenstore/Makefile
@@ -14,6 +14,7 @@ DEP = .*.d
CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod
CLIENTS += xenstore-write
CLIENTS_OBJS := $(patsubst xenstore-%,xenstore_%.o,$(CLIENTS))
CLIENTS += xenstore-write xenstore-ls
+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
@@ -30,7 +31,7 @@ XENSTORED_OBJS_$(CONFIG_NetBSD) = xensto
XENSTORED_OBJS += $(XENSTORED_OBJS_y)
@@ -34,7 +35,7 @@ endif
all: libxenstore.so libxenstore.a xenstored clients xs_tdb_dump
.PHONY: all
-all: libxenstore.so libxenstore.a xenstored $(CLIENTS) xs_tdb_dump xenstore-control xenstore-ls
+all: libxenstore.so libxenstore.a xenstored $(CLIENTS) $(CLIENTS_DOMU) xs_tdb_dump xenstore-control xenstore-ls
.PHONY: clients
-clients: xenstore $(CLIENTS) xenstore-control
+clients: xenstore $(CLIENTS) $(CLIENTS_DOMU) xenstore-control
xenstored: $(XENSTORED_OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl $(SOCKET_LIBS) -o $@
@@ -38,6 +39,9 @@ xenstored: $(XENSTORED_OBJS)
$(CLIENTS): xenstore-%: xenstore_%.o libxenstore.so
$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
ifeq ($(CONFIG_SunOS),y)
xenstored_probes.h: xenstored_probes.d
@@ -54,6 +55,9 @@ xenstored: $(XENSTORED_OBJS)
$(CLIENTS): xenstore
ln -f xenstore $@
+$(CLIENTS_DOMU): domu-xenstore-%: xenstore_%.o libxenstore.a
+ $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lpthread libxenstore.a $(SOCKET_LIBS) -o $@
+$(CLIENTS_DOMU): xenstore
+ ln -f xenstore $@
+
$(CLIENTS_OBJS): xenstore_%.o: xenstore_client.c
$(COMPILE.c) -DCLIENT_$(*F) -o $@ $<
xenstore: xenstore_client.o $(LIBXENSTORE)
$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@
@@ -66,7 +70,7 @@ clean:
rm -f *.a *.o *.opic *.so*
@@ -81,7 +85,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 xenstore-ls
- rm -f $(CLIENTS)
rm -f xs_tdb_dump xenstore-control
- rm -f xenstore $(CLIENTS)
+ rm -f $(CLIENTS) $(CLIENTS_DOMU)
$(RM) $(PROG_DEP)
$(RM) $(DEP)
.PHONY: TAGS
@@ -81,11 +85,15 @@ tarball: clean
@@ -96,6 +100,7 @@ tarball: clean
install: all
$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
+ $(INSTALL_DIR) $(DESTDIR)/bin
$(INSTALL_DIR) $(DESTDIR)/usr/bin
$(INSTALL_DIR) $(DESTDIR)/usr/sbin
$(INSTALL_DIR) $(DESTDIR)/usr/include
$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
@@ -105,6 +110,9 @@ install: all
set -e ; for c in $(CLIENTS) ; do \
ln -f $(DESTDIR)/usr/bin/xenstore $(DESTDIR)/usr/bin/$${c} ; \
done
+ for client in $(CLIENTS_DOMU); do \
+ $(INSTALL_PROG) $$client $(DESTDIR)/bin/$${client/domu-}; \
+ done
$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
Index: xen-3.2-testing/tools/misc/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-3.3.0-testing/tools/misc/Makefile
===================================================================
--- xen-3.2-testing.orig/tools/misc/Makefile
+++ xen-3.2-testing/tools/misc/Makefile
@@ -14,7 +14,7 @@ TARGETS-$(CONFIG_X86) += xen-detect
TARGETS := $(TARGETS-y)
--- xen-3.3.0-testing.orig/tools/misc/Makefile
+++ xen-3.3.0-testing/tools/misc/Makefile
@@ -19,7 +19,7 @@ SUBDIRS-$(CONFIG_MINITERM) += miniterm
SUBDIRS := $(SUBDIRS-y)
INSTALL_BIN = $(TARGETS) xencons
-INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf xsview
+INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xsview
.PHONY: all
all: build
DEFAULT_PYTHON_PATH := $(shell $(XEN_ROOT)/tools/python/get-path)
PYTHON_PATH ?= $(DEFAULT_PYTHON_PATH)