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

Browse Source
This commit is contained in:
OBS User unknown
2007-02-11 10:48:10 +00:00
committed by Git OBS Bridge
parent 241ee9df04
commit d7002a96b9
166 changed files with 35454 additions and 7164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
xen-destdir.diff
View File

@@ -1,8 +1,8 @@
Index: xen-3.0.3-testing/docs/Makefile
Index: xen-3.0.4-testing/docs/Makefile
===================================================================
--- xen-3.0.3-testing.orig/docs/Makefile
+++ xen-3.0.3-testing/docs/Makefile
@@ -12,8 +12,8 @@ LATEX2HTML := latex2html
--- xen-3.0.4-testing.orig/docs/Makefile
+++ xen-3.0.4-testing/docs/Makefile
@@ -13,8 +13,8 @@ LATEX2HTML := latex2html
DOXYGEN := doxygen
POD2MAN := pod2man
@@ -13,11 +13,37 @@ Index: xen-3.0.3-testing/docs/Makefile
DOC_MAN5SRC := $(wildcard man/*.pod.5)
DOC_MAN1SRC := $(wildcard man/*.pod.1)
Index: xen-3.0.3-testing/tools/xentrace/Makefile
@@ -87,13 +87,13 @@ distclean: clean
.PHONY: install
install: all
rm -rf $(DESTDIR)$(pkgdocdir)
- $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
+ $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)/html
cp -dR ps $(DESTDIR)$(pkgdocdir)
cp -dR pdf $(DESTDIR)$(pkgdocdir)
+ cp -dR html.done/* $(DESTDIR)$(pkgdocdir)/html
$(INSTALL_DIR) $(DESTDIR)$(mandir)
cp -dR man1 $(DESTDIR)$(mandir)
cp -dR man5 $(DESTDIR)$(mandir)
- [ ! -d html ] || cp -dR html $(DESTDIR)$(pkgdocdir)
pdf/%.pdf: ps/%.ps
$(INSTALL_DIR) $(@D)
@@ -117,3 +117,9 @@ html/%/index.html: src/%.tex
$(LATEX2HTML) -split 0 -show_section_numbers -toc_depth 3 -nonavigation \
-numbered_footnotes -local_icons -noinfo -math -dir $(@D) \
$< 1>/dev/null 2>/dev/null
+ rm -rf html.done/$*/
+ mkdir -p html.done/$*/
+ cp html/$*/*.html html/$*/*.css html/$*/*.png html.done/$*/
+ ln -sf $*.html html.done/$*/index.html
+ rm -rf html/
+
Index: xen-3.0.4-testing/tools/xentrace/Makefile
===================================================================
--- xen-3.0.3-testing.orig/tools/xentrace/Makefile
+++ xen-3.0.3-testing/tools/xentrace/Makefile
@@ -43,14 +43,14 @@ install: build
--- xen-3.0.4-testing.orig/tools/xentrace/Makefile
+++ xen-3.0.4-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
@@ -38,11 +64,11 @@ Index: xen-3.0.3-testing/tools/xentrace/Makefile
.PHONY: clean
clean:
Index: xen-3.0.3-testing/tools/examples/Makefile
Index: xen-3.0.4-testing/tools/examples/Makefile
===================================================================
--- xen-3.0.3-testing.orig/tools/examples/Makefile
+++ xen-3.0.3-testing/tools/examples/Makefile
@@ -43,18 +43,6 @@ XEN_HOTPLUG_SCRIPTS = xen-backend.agent
--- xen-3.0.4-testing.orig/tools/examples/Makefile
+++ xen-3.0.4-testing/tools/examples/Makefile
@@ -38,18 +38,6 @@ XEN_HOTPLUG_SCRIPTS = xen-backend.agent
UDEV_RULES_DIR = /etc/udev
UDEV_RULES = xen-backend.rules
@@ -61,7 +87,7 @@ Index: xen-3.0.3-testing/tools/examples/Makefile
.PHONY: all
all:
@@ -62,15 +50,15 @@ all:
@@ -57,15 +45,15 @@ all:
build:
.PHONY: install
@@ -80,7 +106,7 @@ Index: xen-3.0.3-testing/tools/examples/Makefile
.PHONY: install-configs
install-configs: $(XEN_CONFIGS)
@@ -111,9 +99,7 @@ install-udev:
@@ -106,9 +94,7 @@ install-udev:
$(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d
for i in $(UDEV_RULES); \
do \
@@ -91,10 +117,10 @@ Index: xen-3.0.3-testing/tools/examples/Makefile
done
.PHONY: clean
Index: xen-3.0.3-testing/tools/security/Makefile
Index: xen-3.0.4-testing/tools/security/Makefile
===================================================================
--- xen-3.0.3-testing.orig/tools/security/Makefile
+++ xen-3.0.3-testing/tools/security/Makefile
--- xen-3.0.4-testing.orig/tools/security/Makefile
+++ xen-3.0.4-testing/tools/security/Makefile
@@ -73,9 +73,9 @@ install: all $(ACM_CONFIG_FILE)
$(INSTALL_DIR) -p $(DESTDIR)$(ACM_SECGEN_CGIDIR)
$(INSTALL_PROG) -p $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
@@ -107,45 +133,41 @@ Index: xen-3.0.3-testing/tools/security/Makefile
endif
else
.PHONY: all
Index: xen-3.0.3-testing/tools/pygrub/Makefile
Index: xen-3.0.4-testing/tools/pygrub/Makefile
===================================================================
--- xen-3.0.3-testing.orig/tools/pygrub/Makefile
+++ xen-3.0.3-testing/tools/pygrub/Makefile
--- xen-3.0.4-testing.orig/tools/pygrub/Makefile
+++ xen-3.0.4-testing/tools/pygrub/Makefile
@@ -15,7 +15,7 @@ install: all
$(INSTALL_DIR) -p $(DESTDIR)/var/lib/xen
$(INSTALL_DIR) -p $(DESTDIR)/var/run/xend/boot
else
install: all
- CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
+ CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --prefix="/usr"
$(INSTALL_DIR) -p $(DESTDIR)/var/lib/xen
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
+ CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --prefix="/usr"
$(INSTALL_DIR) -p $(DESTDIR)/var/run/xend/boot
endif
Index: xen-3.0.3-testing/tools/python/Makefile
Index: xen-3.0.4-testing/tools/python/Makefile
===================================================================
--- xen-3.0.3-testing.orig/tools/python/Makefile
+++ xen-3.0.3-testing/tools/python/Makefile
--- xen-3.0.4-testing.orig/tools/python/Makefile
+++ xen-3.0.4-testing/tools/python/Makefile
@@ -14,7 +14,7 @@ install: all
CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force
CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force
else
install: all
- CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force
+ CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --prefix="/usr" --force
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force
+ CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --prefix="/usr" --force
endif
.PHONY: test
Index: xen-3.0.3-testing/xen/Makefile
Index: xen-3.0.4-testing/tools/Makefile
===================================================================
--- xen-3.0.3-testing.orig/xen/Makefile
+++ xen-3.0.3-testing/xen/Makefile
@@ -31,8 +31,11 @@ _install: $(TARGET).gz
$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-syms-$(XEN_FULLVERSION)
[ -d $(DESTDIR)/usr/include/xen/io ] || \
$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/io
+ [ -d $(DESTDIR)/usr/include/xen/hvm ] || \
+ $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/hvm
$(INSTALL_DATA) include/public/*.h $(DESTDIR)/usr/include/xen
$(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io
+ $(INSTALL_DATA) include/public/hvm/*.h $(DESTDIR)/usr/include/xen/hvm
$(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen
--- xen-3.0.4-testing.orig/tools/Makefile
+++ xen-3.0.4-testing/tools/Makefile
@@ -25,7 +25,6 @@ SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
# These don't cross-compile
ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
SUBDIRS-y += python
-SUBDIRS-y += pygrub
endif
.PHONY: _debug
.PHONY: all