ia64/xen-unstable
changeset 18270:4ce366cde89c
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@eu.citrix.com>
Also resync xmexample3 with xmexample1 and 2.
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
| author | Keir Fraser <keir.fraser@citrix.com> |
|---|---|
| date | Wed Aug 06 09:34:55 2008 +0100 (2008-08-06) |
| parents | 5a89f4f1ece1 |
| children | 172fa773c5ef |
| files | Config.mk docs/Docs.mk docs/Makefile docs/xen-api/Makefile stubdom/Makefile tools/blktap/Makefile tools/examples/Makefile tools/examples/README tools/examples/xmexample3 tools/xenmon/Makefile |
line diff
1.1 --- a/Config.mk Wed Aug 06 09:33:10 2008 +0100 1.2 +++ b/Config.mk Wed Aug 06 09:34:55 2008 +0100 1.3 @@ -19,6 +19,8 @@ HOSTCFLAGS += -fno-strict-aliasing 1.4 1.5 DISTDIR ?= $(XEN_ROOT)/dist 1.6 DESTDIR ?= / 1.7 +DOCDIR ?= /usr/share/doc/xen 1.8 +MANDIR ?= /usr/share/man 1.9 1.10 # Allow phony attribute to be listed as dependency rather than fake target 1.11 .PHONY: .phony
2.1 --- a/docs/Docs.mk Wed Aug 06 09:33:10 2008 +0100 2.2 +++ b/docs/Docs.mk Wed Aug 06 09:34:55 2008 +0100 2.3 @@ -7,7 +7,3 @@ DOXYGEN := doxygen 2.4 POD2MAN := pod2man 2.5 DOT := dot 2.6 NEATO := neato 2.7 - 2.8 -pkgdocdir := /usr/share/doc/xen 2.9 -mandir := /usr/share/man 2.10 -
3.1 --- a/docs/Makefile Wed Aug 06 09:33:10 2008 +0100 3.2 +++ b/docs/Makefile Wed Aug 06 09:34:55 2008 +0100 3.3 @@ -80,17 +80,17 @@ distclean: clean 3.4 3.5 .PHONY: install 3.6 install: all 3.7 - rm -rf $(DESTDIR)$(pkgdocdir) 3.8 - $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir) 3.9 + rm -rf $(DESTDIR)$(DOCDIR) 3.10 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) 3.11 3.12 $(MAKE) -C xen-api install 3.13 3.14 - cp -dR ps $(DESTDIR)$(pkgdocdir) 3.15 - cp -dR pdf $(DESTDIR)$(pkgdocdir) 3.16 - $(INSTALL_DIR) $(DESTDIR)$(mandir) 3.17 - cp -dR man1 $(DESTDIR)$(mandir) 3.18 - cp -dR man5 $(DESTDIR)$(mandir) 3.19 - [ ! -d html ] || cp -dR html $(DESTDIR)$(pkgdocdir) 3.20 + cp -dR ps $(DESTDIR)$(DOCDIR) 3.21 + cp -dR pdf $(DESTDIR)$(DOCDIR) 3.22 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) 3.23 + cp -dR man1 $(DESTDIR)$(MANDIR) 3.24 + cp -dR man5 $(DESTDIR)$(MANDIR) 3.25 + [ ! -d html ] || cp -dR html $(DESTDIR)$(DOCDIR) 3.26 3.27 pdf/%.pdf: ps/%.ps 3.28 $(INSTALL_DIR) $(@D)
4.1 --- a/docs/xen-api/Makefile Wed Aug 06 09:33:10 2008 +0100 4.2 +++ b/docs/xen-api/Makefile Wed Aug 06 09:34:55 2008 +0100 4.3 @@ -16,11 +16,11 @@ all: build 4.4 build: xenapi.pdf xenapi.ps 4.5 4.6 install: 4.7 - $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)/ps 4.8 - $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)/pdf 4.9 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/ps 4.10 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/pdf 4.11 4.12 - [ -e xenapi.ps ] && cp xenapi.ps $(DESTDIR)$(pkgdocdir)/ps || true 4.13 - [ -e xenapi.pdf ] && cp xenapi.pdf $(DESTDIR)$(pkgdocdir)/pdf || true 4.14 + [ -e xenapi.ps ] && cp xenapi.ps $(DESTDIR)$(DOCDIR)/ps || true 4.15 + [ -e xenapi.pdf ] && cp xenapi.pdf $(DESTDIR)$(DOCDIR)/pdf || true 4.16 4.17 xenapi.dvi: $(TEX) $(EPS) $(EPSDOT) 4.18 $(LATEX) xenapi.tex
5.1 --- a/stubdom/Makefile Wed Aug 06 09:33:10 2008 +0100 5.2 +++ b/stubdom/Makefile Wed Aug 06 09:34:55 2008 +0100 5.3 @@ -296,11 +296,15 @@ pv-grub: mini-os-grub libxc grub 5.4 ######### 5.5 5.6 ifeq ($(STUBDOM_SUPPORTED),1) 5.7 -install: install-ioemu install-grub 5.8 +install: install-readme install-ioemu install-grub 5.9 else 5.10 install: 5.11 endif 5.12 5.13 +install-readme: 5.14 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) 5.15 + $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.stubdom 5.16 + 5.17 install-ioemu: ioemu-stubdom 5.18 $(INSTALL_DIR) "$(DESTDIR)/usr/lib/xen/bin" 5.19 $(INSTALL_PROG) stubdom-dm "$(DESTDIR)/usr/lib/xen/bin"
6.1 --- a/tools/blktap/Makefile Wed Aug 06 09:33:10 2008 +0100 6.2 +++ b/tools/blktap/Makefile Wed Aug 06 09:34:55 2008 +0100 6.3 @@ -8,3 +8,6 @@ SUBDIRS-y += drivers 6.4 .PHONY: all clean install 6.5 all clean install: %: subdirs-% 6.6 6.7 +install: 6.8 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) 6.9 + $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.blktap
7.1 --- a/tools/examples/Makefile Wed Aug 06 09:33:10 2008 +0100 7.2 +++ b/tools/examples/Makefile Wed Aug 06 09:34:55 2008 +0100 7.3 @@ -8,11 +8,18 @@ XENDOMAINS_SYSCONFIG = init.d/sysconfig. 7.4 7.5 # Xen configuration dir and configs to go there. 7.6 XEN_CONFIG_DIR = /etc/xen 7.7 +XEN_READMES = README 7.8 +XEN_READMES += README.incompatibilities 7.9 XEN_CONFIGS = xend-config.sxp 7.10 XEN_CONFIGS += xm-config.xml 7.11 XEN_CONFIGS += xmexample1 7.12 XEN_CONFIGS += xmexample2 7.13 +XEN_CONFIGS += xmexample3 7.14 XEN_CONFIGS += xmexample.hvm 7.15 +XEN_CONFIGS += xmexample.hvm-stubdom 7.16 +XEN_CONFIGS += xmexample.hvm-dm 7.17 +XEN_CONFIGS += xmexample.pv-grub 7.18 +XEN_CONFIGS += xmexample.nbd 7.19 XEN_CONFIGS += xmexample.vti 7.20 XEN_CONFIGS += xend-pci-quirks.sxp 7.21 XEN_CONFIGS += xend-pci-permissive.sxp 7.22 @@ -59,7 +66,16 @@ all: 7.23 build: 7.24 7.25 .PHONY: install 7.26 -install: all install-initd install-configs install-scripts $(HOTPLUGS) 7.27 +install: all install-readmes install-initd install-configs install-scripts $(HOTPLUGS) 7.28 + 7.29 +.PHONY: install-readmes 7.30 +install-readmes: 7.31 + [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \ 7.32 + $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) 7.33 + set -e; for i in $(XEN_READMES); \ 7.34 + do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \ 7.35 + $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \ 7.36 + done 7.37 7.38 .PHONY: install-initd 7.39 install-initd:
8.1 --- a/tools/examples/README Wed Aug 06 09:33:10 2008 +0100 8.2 +++ b/tools/examples/README Wed Aug 06 09:34:55 2008 +0100 8.3 @@ -44,4 +44,8 @@ xmexample3 - an advanced config 8.4 xmexample.nbd - configuration script that uses NBD filesystems 8.5 xmexample.hvm - a configuration script for creating a hvm domain with 8.6 'xm create' 8.7 +xmexample.hvm-stubdom - a configuration script for creating a hvm domain with 8.8 + 'xm create' that utilizes a stubdomain for device model 8.9 +xmexample.pv-grub - a configuration script for creating a domain with 'xm create' 8.10 + which boots PV-GRUB. 8.11 xmexample.vti - a configuration script for creating a domain on vti
9.1 --- a/tools/examples/xmexample3 Wed Aug 06 09:33:10 2008 +0100 9.2 +++ b/tools/examples/xmexample3 Wed Aug 06 09:34:55 2008 +0100 9.3 @@ -207,4 +207,26 @@ extra = "4 VMID=%d" % vmid 9.4 #on_reboot = 'restart' 9.5 #on_crash = 'restart' 9.6 9.7 +#----------------------------------------------------------------------------- 9.8 +# Configure PVSCSI devices: 9.9 +# 9.10 +#vscsi=[ 'PDEV, VDEV' ] 9.11 +# 9.12 +# PDEV gives physical SCSI device to be attached to specified guest 9.13 +# domain by one of the following identifier format. 9.14 +# - XX:XX:XX:XX (4-tuples with decimal notation which shows 9.15 +# "host:channel:target:lun") 9.16 +# - /dev/sdxx or sdx 9.17 +# - /dev/stxx or stx 9.18 +# - /dev/sgxx or sgx 9.19 +# - result of 'scsi_id -gu -s'. 9.20 +# ex. # scsi_id -gu -s /block/sdb 9.21 +# 36000b5d0006a0000006a0257004c0000 9.22 +# 9.23 +# VDEV gives virtual SCSI device by 4-tuples (XX:XX:XX:XX) as 9.24 +# which the specified guest domain recognize. 9.25 +# 9.26 + 9.27 +#vscsi = [ '/dev/sdx, 0:0:0:0' ] 9.28 + 9.29 #============================================================================
10.1 --- a/tools/xenmon/Makefile Wed Aug 06 09:33:10 2008 +0100 10.2 +++ b/tools/xenmon/Makefile Wed Aug 06 09:34:55 2008 +0100 10.3 @@ -33,6 +33,8 @@ install: build 10.4 $(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked 10.5 $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(SBINDIR)/xentrace_setmask 10.6 $(INSTALL_PROG) xenmon.py $(DESTDIR)$(SBINDIR)/xenmon.py 10.7 + $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) 10.8 + $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon 10.9 10.10 .PHONY: clean 10.11 clean: