install more documentation to /usr/share/doc/xen and /etc/xen
Also resync xmexample3 with xmexample1 and 2.
Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
diff -r 439400414adc Config.mk
--- a/Config.mk Tue Aug 05 12:11:42 2008 +0100
+++ b/Config.mk Tue Aug 05 12:38:44 2008 +0100
@@ -19,6 +19,8 @@ HOSTCFLAGS += -fno-strict-aliasing
 
 DISTDIR ?= $(XEN_ROOT)/dist
 DESTDIR ?= /
+DOCDIR ?= /usr/share/doc/xen
+MANDIR ?= /usr/share/man
 
 # Allow phony attribute to be listed as dependency rather than fake target
 .PHONY: .phony
diff -r 439400414adc docs/Docs.mk
--- a/docs/Docs.mk Tue Aug 05 12:11:42 2008 +0100
+++ b/docs/Docs.mk Tue Aug 05 12:38:44 2008 +0100
@@ -7,7 +7,3 @@ POD2MAN := pod2man
 POD2MAN := pod2man
 DOT := dot
 NEATO := neato
-
-pkgdocdir := /usr/share/doc/xen
-mandir := /usr/share/man
-
diff -r 439400414adc docs/Makefile
--- a/docs/Makefile Tue Aug 05 12:11:42 2008 +0100
+++ b/docs/Makefile Tue Aug 05 12:38:44 2008 +0100
@@ -80,17 +80,17 @@ distclean: clean
 
 .PHONY: install
 install: all
- rm -rf $(DESTDIR)$(pkgdocdir)
- $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
+ rm -rf $(DESTDIR)$(DOCDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
 
 $(MAKE) -C xen-api install
 
- cp -dR ps $(DESTDIR)$(pkgdocdir)
- cp -dR pdf $(DESTDIR)$(pkgdocdir)
- $(INSTALL_DIR) $(DESTDIR)$(mandir)
- cp -dR man1 $(DESTDIR)$(mandir)
- cp -dR man5 $(DESTDIR)$(mandir)
- [ ! -d html ] || cp -dR html $(DESTDIR)$(pkgdocdir)
+ cp -dR ps $(DESTDIR)$(DOCDIR)
+ cp -dR pdf $(DESTDIR)$(DOCDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ cp -dR man1 $(DESTDIR)$(MANDIR)
+ cp -dR man5 $(DESTDIR)$(MANDIR)
+ [ ! -d html ] || cp -dR html $(DESTDIR)$(DOCDIR)
 
 pdf/%.pdf: ps/%.ps
 $(INSTALL_DIR) $(@D)
diff -r 439400414adc docs/xen-api/Makefile
--- a/docs/xen-api/Makefile Tue Aug 05 12:11:42 2008 +0100
+++ b/docs/xen-api/Makefile Tue Aug 05 12:38:44 2008 +0100
@@ -16,11 +16,11 @@ build: xenapi.pdf xenapi.ps
 build: xenapi.pdf xenapi.ps
 
 install:
- $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)/ps
- $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)/pdf
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/ps
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/pdf
 
- [ -e xenapi.ps ] && cp xenapi.ps $(DESTDIR)$(pkgdocdir)/ps || true
- [ -e xenapi.pdf ] && cp xenapi.pdf $(DESTDIR)$(pkgdocdir)/pdf || true
+ [ -e xenapi.ps ] && cp xenapi.ps $(DESTDIR)$(DOCDIR)/ps || true
+ [ -e xenapi.pdf ] && cp xenapi.pdf $(DESTDIR)$(DOCDIR)/pdf || true
 
 xenapi.dvi: $(TEX) $(EPS) $(EPSDOT)
 $(LATEX) xenapi.tex
diff -r 439400414adc stubdom/Makefile
--- a/stubdom/Makefile Tue Aug 05 12:11:42 2008 +0100
+++ b/stubdom/Makefile Tue Aug 05 12:38:44 2008 +0100
@@ -297,10 +297,14 @@ pv-grub: mini-os-grub libxc grub
 #########
 
 ifeq ($(STUBDOM_SUPPORTED),1)
-install: install-ioemu install-grub
+install: install-readme install-ioemu install-grub
 else
 install:
 endif
+
+install-readme:
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+ $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.stubdom
 
 install-ioemu: ioemu-stubdom
 $(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/bin"
diff -r 439400414adc tools/blktap/Makefile
--- a/tools/blktap/Makefile Tue Aug 05 12:11:42 2008 +0100
+++ b/tools/blktap/Makefile Tue Aug 05 12:38:44 2008 +0100
@@ -8,3 +8,6 @@ SUBDIRS-y += drivers
 .PHONY: all clean install
 all clean install: %: subdirs-%
 
+install:
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+ $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.blktap
diff -r 439400414adc tools/examples/Makefile
--- a/tools/examples/Makefile Tue Aug 05 12:11:42 2008 +0100
+++ b/tools/examples/Makefile Tue Aug 05 12:38:44 2008 +0100
@@ -8,11 +8,18 @@ XENDOMAINS_SYSCONFIG = init.d/sysconfig.
 
 # Xen configuration dir and configs to go there.
 XEN_CONFIG_DIR = /etc/xen
+XEN_READMES = README
+XEN_READMES += README.incompatibilities
 XEN_CONFIGS = xend-config.sxp
 XEN_CONFIGS += xm-config.xml
 XEN_CONFIGS += xmexample1 
 XEN_CONFIGS += xmexample2
+XEN_CONFIGS += xmexample3
 XEN_CONFIGS += xmexample.hvm
+XEN_CONFIGS += xmexample.hvm-stubdom
+XEN_CONFIGS += xmexample.hvm-dm
+XEN_CONFIGS += xmexample.pv-grub
+XEN_CONFIGS += xmexample.nbd
 XEN_CONFIGS += xmexample.vti
 XEN_CONFIGS += xend-pci-quirks.sxp
 XEN_CONFIGS += xend-pci-permissive.sxp
@@ -59,7 +66,16 @@ build:
 build:
 
 .PHONY: install
-install: all install-initd install-configs install-scripts $(HOTPLUGS)
+install: all install-readmes install-initd install-configs install-scripts 
$(HOTPLUGS)
+
+.PHONY: install-readmes
+install-readmes:
+ [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
+ set -e; for i in $(XEN_READMES); \
+ do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
+ done
 
 .PHONY: install-initd
 install-initd:
diff -r 439400414adc tools/examples/README
--- a/tools/examples/README Tue Aug 05 12:11:42 2008 +0100
+++ b/tools/examples/README Tue Aug 05 12:38:44 2008 +0100
@@ -44,4 +44,8 @@ xmexample.nbd - configuration scri
 xmexample.nbd - configuration script that uses NBD filesystems
 xmexample.hvm - a configuration script for creating a hvm domain with
 'xm create'
+xmexample.hvm-stubdom - a configuration script for creating a hvm domain with
+ 'xm create' that utilizes a stubdomain for device model
+xmexample.pv-grub - a configuration script for creating a domain with 'xm 
create'
+ which boots PV-GRUB.
 xmexample.vti - a configuration script for creating a domain on vti
diff -r 439400414adc tools/examples/xmexample3
--- a/tools/examples/xmexample3 Tue Aug 05 12:11:42 2008 +0100
+++ b/tools/examples/xmexample3 Tue Aug 05 12:38:44 2008 +0100
@@ -207,4 +207,26 @@ extra = "4 VMID=%d" % vmid
 #on_reboot = 'restart'
 #on_crash = 'restart'
 
+#-----------------------------------------------------------------------------
+# Configure PVSCSI devices:
+#
+#vscsi=[ 'PDEV, VDEV' ]
+#
+# PDEV gives physical SCSI device to be attached to specified guest
+# domain by one of the following identifier format.
+# - XX:XX:XX:XX (4-tuples with decimal notation which shows
+# "host:channel:target:lun")
+# - /dev/sdxx or sdx
+# - /dev/stxx or stx
+# - /dev/sgxx or sgx
+# - result of 'scsi_id -gu -s'.
+# ex. # scsi_id -gu -s /block/sdb
+# 36000b5d0006a0000006a0257004c0000
+#
+# VDEV gives virtual SCSI device by 4-tuples (XX:XX:XX:XX) as 
+# which the specified guest domain recognize.
+#
+
+#vscsi = [ '/dev/sdx, 0:0:0:0' ]
+
 #============================================================================
diff -r 439400414adc tools/xenmon/Makefile
--- a/tools/xenmon/Makefile Tue Aug 05 12:11:42 2008 +0100
+++ b/tools/xenmon/Makefile Tue Aug 05 12:38:44 2008 +0100
@@ -33,6 +33,8 @@ install: build
 $(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked
 $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(SBINDIR)/xentrace_setmask
 $(INSTALL_PROG) xenmon.py $(DESTDIR)$(SBINDIR)/xenmon.py
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+ $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon
 
 .PHONY: clean
 clean:
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel