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=23

Browse Source
This commit is contained in:
OBS User unknown
2007-07-25 00:03:48 +00:00
committed by Git OBS Bridge
parent 4c207325e4
commit 8c81bc310e
9 changed files with 176 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
xen-destdir.diff
View File

@@ -1,7 +1,7 @@
Index: xen-3.0.5-testing/docs/Makefile
Index: xen-3.1-testing/docs/Makefile
===================================================================
--- xen-3.0.5-testing.orig/docs/Makefile
+++ xen-3.0.5-testing/docs/Makefile
--- xen-3.1-testing.orig/docs/Makefile
+++ xen-3.1-testing/docs/Makefile
@@ -90,7 +90,8 @@ install: all
$(INSTALL_DIR) $(DESTDIR)$(mandir)
cp -dR man1 $(DESTDIR)$(mandir)
@@ -22,10 +22,10 @@ Index: xen-3.0.5-testing/docs/Makefile
+ ln -sf $*.html html.done/$*/index.html
+ rm -rf html/
+
Index: xen-3.0.5-testing/tools/xentrace/Makefile
Index: xen-3.1-testing/tools/xentrace/Makefile
===================================================================
--- xen-3.0.5-testing.orig/tools/xentrace/Makefile
+++ xen-3.0.5-testing/tools/xentrace/Makefile
--- xen-3.1-testing.orig/tools/xentrace/Makefile
+++ xen-3.1-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 ] || \
@@ -47,10 +47,10 @@ Index: xen-3.0.5-testing/tools/xentrace/Makefile
.PHONY: clean
clean:
Index: xen-3.0.5-testing/tools/examples/Makefile
Index: xen-3.1-testing/tools/examples/Makefile
===================================================================
--- xen-3.0.5-testing.orig/tools/examples/Makefile
+++ xen-3.0.5-testing/tools/examples/Makefile
--- xen-3.1-testing.orig/tools/examples/Makefile
+++ xen-3.1-testing/tools/examples/Makefile
@@ -41,18 +41,6 @@ XEN_HOTPLUG_SCRIPTS = xen-backend.agent
UDEV_RULES_DIR = /etc/udev
UDEV_RULES = xen-backend.rules
@@ -100,10 +100,10 @@ Index: xen-3.0.5-testing/tools/examples/Makefile
done
.PHONY: clean
Index: xen-3.0.5-testing/tools/security/Makefile
Index: xen-3.1-testing/tools/security/Makefile
===================================================================
--- xen-3.0.5-testing.orig/tools/security/Makefile
+++ xen-3.0.5-testing/tools/security/Makefile
--- xen-3.1-testing.orig/tools/security/Makefile
+++ xen-3.1-testing/tools/security/Makefile
@@ -69,9 +69,9 @@ install: all $(ACM_CONFIG_FILE)
$(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
$(INSTALL_PROG) $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
@@ -116,10 +116,10 @@ Index: xen-3.0.5-testing/tools/security/Makefile
endif
else
.PHONY: all
Index: xen-3.0.5-testing/tools/pygrub/Makefile
Index: xen-3.1-testing/tools/pygrub/Makefile
===================================================================
--- xen-3.0.5-testing.orig/tools/pygrub/Makefile
+++ xen-3.0.5-testing/tools/pygrub/Makefile
--- xen-3.1-testing.orig/tools/pygrub/Makefile
+++ xen-3.1-testing/tools/pygrub/Makefile
@@ -16,7 +16,7 @@ install: all
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
else
@@ -129,10 +129,10 @@ Index: xen-3.0.5-testing/tools/pygrub/Makefile
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
endif
Index: xen-3.0.5-testing/tools/python/Makefile
Index: xen-3.1-testing/tools/python/Makefile
===================================================================
--- xen-3.0.5-testing.orig/tools/python/Makefile
+++ xen-3.0.5-testing/tools/python/Makefile
--- xen-3.1-testing.orig/tools/python/Makefile
+++ xen-3.1-testing/tools/python/Makefile
@@ -60,7 +60,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
@@ -142,10 +142,10 @@ Index: xen-3.0.5-testing/tools/python/Makefile
endif
install-dtd: all
Index: xen-3.0.5-testing/tools/Makefile
Index: xen-3.1-testing/tools/Makefile
===================================================================
--- xen-3.0.5-testing.orig/tools/Makefile
+++ xen-3.0.5-testing/tools/Makefile
--- xen-3.1-testing.orig/tools/Makefile
+++ xen-3.1-testing/tools/Makefile
@@ -25,7 +25,6 @@ SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
# These don't cross-compile
ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
@@ -154,10 +154,10 @@ Index: xen-3.0.5-testing/tools/Makefile
endif
.PHONY: all
Index: xen-3.0.5-testing/docs/Docs.mk
Index: xen-3.1-testing/docs/Docs.mk
===================================================================
--- xen-3.0.5-testing.orig/docs/Docs.mk
+++ xen-3.0.5-testing/docs/Docs.mk
--- xen-3.1-testing.orig/docs/Docs.mk
+++ xen-3.1-testing/docs/Docs.mk
@@ -8,6 +8,6 @@ POD2MAN := pod2man
DOT := dot
NEATO := neato
@@ -167,10 +167,10 @@ Index: xen-3.0.5-testing/docs/Docs.mk
+pkgdocdir := $(DOCDIR)
+mandir := $(MANDIR)
Index: xen-3.0.5-testing/tools/misc/xen-python-path
Index: xen-3.1-testing/tools/misc/xen-python-path
===================================================================
--- xen-3.0.5-testing.orig/tools/misc/xen-python-path
+++ xen-3.0.5-testing/tools/misc/xen-python-path
--- xen-3.1-testing.orig/tools/misc/xen-python-path
+++ xen-3.1-testing/tools/misc/xen-python-path
@@ -30,7 +30,8 @@ import sys
for p in ['python%s' % sys.version[:3], 'python']:
@@ -181,10 +181,10 @@ Index: xen-3.0.5-testing/tools/misc/xen-python-path
if os.path.exists(os.path.join(d, AUXBIN)):
sys.path.append(d)
import xen.util.auxbin
Index: xen-3.0.5-testing/tools/xenstore/Makefile
Index: xen-3.1-testing/tools/xenstore/Makefile
===================================================================
--- xen-3.0.5-testing.orig/tools/xenstore/Makefile
+++ xen-3.0.5-testing/tools/xenstore/Makefile
--- xen-3.1-testing.orig/tools/xenstore/Makefile
+++ xen-3.1-testing/tools/xenstore/Makefile
@@ -24,6 +24,7 @@ TESTENV = XENSTORED_ROOTDIR=$(TESTDIR)
CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod
CLIENTS += xenstore-write
@@ -237,3 +237,16 @@ Index: xen-3.0.5-testing/tools/xenstore/Makefile
$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
Index: xen-3.1-testing/tools/misc/Makefile
===================================================================
--- xen-3.1-testing.orig/tools/misc/Makefile
+++ xen-3.1-testing/tools/misc/Makefile
@@ -14,7 +14,7 @@ TARGETS-$(CONFIG_X86) += xen-detect
TARGETS := $(TARGETS-y)
INSTALL_BIN = $(TARGETS) xencons
-INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf
+INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend
.PHONY: all
all: build