# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1275056756 -3600
# Node ID 1709c85adc098e4db1e255268e1b9b471d1ffc00
# Parent c94d5736091cce2e12899ff85583646535d9d33a
Add RPM .spec file for xapi and associated tools.
Signed-off-by: David Scott <dave.scott@xxxxxxxxxxxxx>
diff -r c94d5736091c -r 1709c85adc09 Makefile
--- a/Makefile Fri May 28 15:25:56 2010 +0100
+++ b/Makefile Fri May 28 15:25:56 2010 +0100
@@ -11,7 +11,6 @@
.PHONY: all
all:
- omake ocaml/util/version.ml
omake phase1 phase2
omake lib-uninstall
omake lib-install
@@ -86,3 +85,32 @@
.PHONY: clean
clean:
+
+
+ifdef B_BASE
+include $(B_BASE)/common.mk
+include $(B_BASE)/rpmbuild.mk
+REPO=$(call hg_loc,xen-api)
+else
+MY_OUTPUT_DIR ?= $(CURDIR)/output
+MY_OBJ_DIR ?= $(CURDIR)/obj
+REPO ?= $(CURDIR)
+
+RPM_SPECSDIR?=/usr/src/redhat/SPECS
+RPM_SRPMSDIR?=/usr/src/redhat/SRPMS
+RPM_SOURCESDIR?=/usr/src/redhat/SOURCES
+RPMBUILD?=rpmbuild
+XEN_RELEASE?=unknown
+endif
+
+.PHONY: srpm
+srpm:
+ mkdir -p $(RPM_SOURCESDIR) $(RPM_SPECSDIR) $(RPM_SRPMSDIR)
+ hg archive -t tbz2 $(RPM_SOURCESDIR)/xapi-0.2.tar.bz2
+ make -C $(REPO) version
+ rm -f $(RPM_SOURCESDIR)/xapi-version.patch
+ (cd $(REPO); diff -u /dev/null ocaml/util/version.ml >
$(RPM_SOURCESDIR)/xapi-version.patch) || true
+ cp -f xapi.spec $(RPM_SPECSDIR)/
+ chown root.root $(RPM_SPECSDIR)/xapi.spec
+ $(RPMBUILD) -bs --nodeps $(RPM_SPECSDIR)/xapi.spec
+
diff -r c94d5736091c -r 1709c85adc09 ocaml/idl/OMakefile
--- a/ocaml/idl/OMakefile Fri May 28 15:25:56 2010 +0100
+++ b/ocaml/idl/OMakefile Fri May 28 15:25:56 2010 +0100
@@ -53,7 +53,8 @@
xenenterpriseapi-html-doc: datamodel #xenapi-datamodel-graph.dot
xenenterpriseapi-datamodel-graph.gif xenenterpriseapi-datamodel-graph.map
mkdir -p $(DOCDIR)/model/xe
- cp xenenterpriseapi-datamodel-graph.{map,gif} $(DOCDIR)/model/xe
+ cp xenenterpriseapi-datamodel-graph.map $(DOCDIR)/model/xe
+ cp xenenterpriseapi-datamodel-graph.gif $(DOCDIR)/model/xe
cp api.css userguide.css $(DOCDIR)/model/xe
cp xensource_logo.png xensource_toplogo.gif check.png $(DOCDIR)/model/xe
./datamodel -closed -html $(DOCDIR)/model/xe
@@ -108,7 +109,8 @@
.PHONY: sdk-install
sdk-install: datamodel html_build xenenterpriseapi.pdf
mkdir -p $(SDK)/docs/html
- cp xenenterpriseapi-datamodel-graph.{map,gif} $(SDK)/docs/html
+ cp xenenterpriseapi-datamodel-graph.map $(SDK)/docs/html
+ cp xenenterpriseapi-datamodel-graph.gif $(SDK)/docs/html
cp html/*.css html/*.js html/*.html $(SDK)/docs/html
mkdir -p $(SDK)/docs/html/images
cp html/images/* $(SDK)/docs/html/images
@@ -132,10 +134,6 @@
cp sdk-README.html $(SDK)/README.html
lynx -dump sdk-README.html > $(SDK)/README.txt
cp sdk-index.html $(SDK)/index.html
- # and then the version suitable for the website
- mkdir -p $(SDKWWW)/docs/html
- sh -c '/bin/cp -ar $(SDK)/docs $(SDKWWW)'
- cp sdkwww-index.html $(SDKWWW)/index.html
META: META.in
diff -r c94d5736091c -r 1709c85adc09 scripts/OMakefile
--- a/scripts/OMakefile Fri May 28 15:25:56 2010 +0100
+++ b/scripts/OMakefile Fri May 28 15:25:56 2010 +0100
@@ -100,6 +100,7 @@
.PHONY: sdk-install
sdk-install: install
+ mkdir -p $(SDK)
cp motd $(SDK)/motd
$(IPROG) init.d-sdkinit $(DESTDIR)/etc/rc.d/init.d/sdkinit
mkdir -p $(DESTDIR)/usr/lib/python2.4/site-packages/xen/lowlevel
diff -r c94d5736091c -r 1709c85adc09 xapi.spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xapi.spec Fri May 28 15:25:56 2010 +0100
@@ -0,0 +1,378 @@
+# -*- rpm-spec -*-
+
+%define XEN_RELEASE %(test -z "${XEN_RELEASE}" && echo unknown || echo
$XEN_RELEASE)
+
+Summary: xapi - xen toolstack for XCP
+Name: xapi
+Version: 0.2
+Release: %{XEN_RELEASE}
+Group: System/Hypervisor
+License: LGPL+linking exception
+URL: http://www.xen.org
+Source0: xapi-%{version}.tar.bz2
+Patch0: xapi-version.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: pam-devel tetex xapi-libs-devel ocaml omake ocaml-findlib
ocaml-xmlm
+
+%description
+XCP toolstack.
+
+%package core
+Summary: The xapi toolstack
+Group: System/Hypervisor
+
+%description core
+This package contains the xapi toolstack.
+
+%package xe
+Summary: The xapi toolstack CLI
+Group: System/Hypervisor
+
+%description xe
+The command-line interface for controlling XCP hosts.
+
+%package www
+Summary: The XenAPI www interface
+Group: System/Hypervisor
+
+%description www
+This package contains the XenAPI www interface
+
+%package tests
+Summary: Toolstack test programs
+Group: System/Hypervisor
+
+%description tests
+This package contains a series of simple regression tests.
+
+%package squeezed
+Summary: The memory ballooning daemon
+Group: System/Hypervisor
+
+%description squeezed
+This package contains the Xen virtual firmware (hvmloader)
+
+%package xenops
+Summary: Low-level debugging tools
+Group: System/Hypervisor
+
+%description xenops
+This package contains the xenops-based low-level debugging tools.
+
+%package client-devel
+Summary: xapi Development Headers and Libraries
+Group: Development/Libraries
+
+%description client-devel
+This package contains the xapi development libraries and header files
+for building addon tools.
+
+%package datamodel-devel
+Summary: xapi Datamodel headers and libraries
+Group: Development/Libraries
+
+%description datamodel-devel
+This package contains the internal xapi datamodel as a library suitable
+for writing additional code generators.
+
+%package docs
+Summary: Xen-API documentation and examples
+Group: Development/Documentation
+
+%description docs
+This package contains Xen-API documentation and examples in several
programming languages.
+
+%prep
+%setup -q
+%patch0 -p0 -b xapi-version.patch
+
+%build
+COMPILE_JAVA=no %{__make}
+
+%install
+rm -rf %{buildroot}
+
+DESTDIR=$RPM_BUILD_ROOT %{__make} install
+DESTDIR=$RPM_BUILD_ROOT %{__make} lib-install
+DESTDIR=$RPM_BUILD_ROOT %{__make} sdk-install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post core
+[ ! -x /sbin/chkconfig ] || chkconfig xapi on
+
+%post squeezed
+[ ! -x /sbin/chkconfig ] || chkconfig squeezed on
+
+%files core
+%defattr(-,root,root,-)
+/opt/xensource/bin/xapi
+/etc/logrotate.d/audit
+/etc/logrotate.d/v6d
+/etc/logrotate.d/xapi
+/etc/pam.d/xapi
+/etc/rc.d/init.d/management-interface
+/etc/rc.d/init.d/perfmon
+/etc/rc.d/init.d/v6d
+/etc/rc.d/init.d/xapi
+/etc/rc.d/init.d/xapi-domains
+/etc/rc.d/init.d/xapissl
+/etc/rc.d/init.d/xenservices
+/etc/rc.d/init.d/sdkinit
+/etc/sysconfig/perfmon
+/etc/sysconfig/xapi
+/etc/udev/rules.d/xen-backend.rules
+/etc/udev/rules.d/xen-frontend.rules
+/etc/udev/xen-backend.rules
+/etc/udev/xen-frontend.rules
+/etc/xapi.d/plugins/DRAC.py
+/etc/xapi.d/plugins/DRAC.pyo
+/etc/xapi.d/plugins/DRAC.pyc
+/etc/xapi.d/plugins/echo
+/etc/xapi.d/plugins/extauth-hook
+/etc/xapi.d/plugins/extauth-hook-AD.py
+/etc/xapi.d/plugins/extauth-hook-AD.pyo
+/etc/xapi.d/plugins/extauth-hook-AD.pyc
+/etc/xapi.d/plugins/iLO.py
+/etc/xapi.d/plugins/iLO.pyo
+/etc/xapi.d/plugins/iLO.pyc
+/etc/xapi.d/plugins/iLOPowerON.xml
+/etc/xapi.d/plugins/perfmon
+/etc/xapi.d/plugins/power-on-host
+/etc/xapi.d/plugins/wake-on-lan
+/etc/xapi.d/plugins/wlan.py
+/etc/xapi.d/plugins/wlan.pyo
+/etc/xapi.d/plugins/wlan.pyc
+/etc/xensource/db.conf
+/etc/xensource/db.conf.rio
+/etc/xensource/log.conf
+/etc/xensource/master.d/01-example
+/etc/xensource/master.d/03-mpathalert-daemon
+/etc/xensource/pool.conf
+/etc/xensource/scripts/block
+/etc/xensource/scripts/block-frontend
+/etc/xensource/scripts/tap
+/etc/xensource/scripts/vif
+/etc/xensource/xapi-ssl.conf
+/etc/xensource/xapi.conf
+/etc/xensource/xenstored.conf
+/opt/xensource/bin/fix_firewall.sh
+/opt/xensource/bin/list_domains
+/opt/xensource/bin/mpathalert
+/opt/xensource/bin/perfmon
+/opt/xensource/bin/static-vdis
+/opt/xensource/bin/v6d-reopen-logs
+/opt/xensource/bin/xapi-autostart-vms
+/opt/xensource/bin/xapi-db-process
+/opt/xensource/bin/xapi-wait-init-complete
+/opt/xensource/bin/xe-backup-metadata
+/opt/xensource/bin/xe-edit-bootloader
+/opt/xensource/bin/xe-mount-iso-sr
+/opt/xensource/bin/xe-restore-metadata
+/opt/xensource/bin/xe-scsi-dev-map
+/opt/xensource/bin/xe-set-iscsi-iqn
+/opt/xensource/bin/xe-toolstack-restart
+/opt/xensource/bin/xe-xentrace
+/opt/xensource/bin/xenstored
+/opt/xensource/bin/xsh
+/opt/xensource/libexec/fakeguestagent
+/opt/xensource/libexec/InterfaceReconfigure.py
+/opt/xensource/libexec/InterfaceReconfigure.pyo
+/opt/xensource/libexec/InterfaceReconfigure.pyc
+/opt/xensource/libexec/InterfaceReconfigureBridge.py
+/opt/xensource/libexec/InterfaceReconfigureBridge.pyo
+/opt/xensource/libexec/InterfaceReconfigureBridge.pyc
+/opt/xensource/libexec/InterfaceReconfigureVswitch.py
+/opt/xensource/libexec/InterfaceReconfigureVswitch.pyo
+/opt/xensource/libexec/InterfaceReconfigureVswitch.pyc
+/opt/xensource/libexec/backup-metadata-cron
+/opt/xensource/libexec/backup-sr-metadata.py
+/opt/xensource/libexec/backup-sr-metadata.pyo
+/opt/xensource/libexec/backup-sr-metadata.pyc
+/opt/xensource/libexec/block_device_io
+/opt/xensource/libexec/c_rehash
+/opt/xensource/libexec/cdrommon
+/opt/xensource/libexec/dumpcore
+/opt/xensource/libexec/fence
+/opt/xensource/libexec/fence.bin
+/opt/xensource/libexec/generate_ssl_cert
+/opt/xensource/libexec/host-backup
+/opt/xensource/libexec/host-bugreport-upload
+/opt/xensource/libexec/host-restore
+/opt/xensource/libexec/interface-reconfigure
+/opt/xensource/libexec/interface-visualise
+/opt/xensource/libexec/license-check.py
+/opt/xensource/libexec/license-check.pyo
+/opt/xensource/libexec/license-check.pyc
+/opt/xensource/libexec/link-vms-by-sr.py
+/opt/xensource/libexec/link-vms-by-sr.pyo
+/opt/xensource/libexec/link-vms-by-sr.pyc
+/opt/xensource/libexec/logrotate.sh
+/opt/xensource/libexec/logs-download
+/opt/xensource/libexec/lw-force-domain-leave
+/opt/xensource/libexec/mail-alarm
+/opt/xensource/libexec/print-custom-templates
+/opt/xensource/libexec/probe-device-for-file
+/opt/xensource/libexec/qemu-dm-wrapper
+/opt/xensource/libexec/restore-sr-metadata.py
+/opt/xensource/libexec/restore-sr-metadata.pyo
+/opt/xensource/libexec/restore-sr-metadata.pyc
+/opt/xensource/libexec/rewrite-management-interface
+/opt/xensource/libexec/set-dom0-memory-target-from-packs
+/opt/xensource/libexec/set-hostname
+/opt/xensource/libexec/shell.py
+/opt/xensource/libexec/shell.pyo
+/opt/xensource/libexec/shell.pyc
+/opt/xensource/libexec/shutdown
+/opt/xensource/libexec/update-mh-info
+/opt/xensource/libexec/upload-wrapper
+/opt/xensource/libexec/v6d
+/opt/xensource/libexec/vncterm-wrapper
+/opt/xensource/libexec/xapi-health-check
+/opt/xensource/libexec/xapi-rolling-upgrade
+/opt/xensource/libexec/xenguest
+/opt/xensource/libexec/xha-lc
+/opt/xensource/libexec/xiu
+/opt/xensource/packages/post-install-scripts/debian-etch
+/opt/xensource/packages/post-install-scripts/debug
+/usr/lib/python2.4/site-packages/XenAPI.py
+/usr/lib/python2.4/site-packages/XenAPI.pyo
+/usr/lib/python2.4/site-packages/XenAPI.pyc
+/usr/lib/python2.4/site-packages/XenAPIPlugin.py
+/usr/lib/python2.4/site-packages/XenAPIPlugin.pyo
+/usr/lib/python2.4/site-packages/XenAPIPlugin.pyc
+/usr/lib/python2.4/site-packages/inventory.py
+/usr/lib/python2.4/site-packages/inventory.pyo
+/usr/lib/python2.4/site-packages/inventory.pyc
+%exclude /usr/lib/python2.4/site-packages/xen/*
+%exclude /usr/lib/python2.4/site-packages/xen/lowlevel/*
+/var/xapi/udhcpd.skel
+
+%files xe
+%defattr(-,root,root,-)
+/opt/xensource/bin/xe
+/usr/bin/xe
+/etc/bash_completion.d/cli
+
+%files squeezed
+%defattr(-,root,root,-)
+/opt/xensource/libexec/squeezed
+/etc/logrotate.d/squeezed
+/etc/rc.d/init.d/squeezed
+/opt/xensource/bin/squeezed_client
+
+
+%files xenops
+%defattr(-,root,root,-)
+/opt/xensource/debug/xenops
+/opt/xensource/debug/add_vbd
+/opt/xensource/debug/add_vif
+/opt/xensource/debug/build_domain
+/opt/xensource/debug/build_hvm
+/opt/xensource/debug/create_domain
+/opt/xensource/debug/debug_ha_query_liveset
+/opt/xensource/debug/destroy_domain
+/opt/xensource/debug/event_listen
+/opt/xensource/debug/graph
+/opt/xensource/debug/memory_breakdown
+/opt/xensource/debug/memory_summary
+/opt/xensource/debug/pause_domain
+/opt/xensource/debug/restore_domain
+/opt/xensource/debug/rrddump
+/opt/xensource/debug/shutdown_domain
+/opt/xensource/debug/sm_stress
+/opt/xensource/debug/suspend_domain
+/opt/xensource/debug/unpause_domain
+/opt/xensource/debug/vncproxy
+/opt/xensource/debug/with-vdi
+/opt/xensource/debug/xal
+/opt/xensource/debug/xs
+
+%files www
+%defattr(-,root,root,-)
+#/opt/xensource/debug/www/XenServerConsole.jar
+/opt/xensource/debug/www/api.js
+/opt/xensource/debug/www/apicall.css
+/opt/xensource/debug/www/apicall.js
+/opt/xensource/debug/www/construct_tree.js
+/opt/xensource/debug/www/devweb.css
+/opt/xensource/debug/www/devweb.js
+/opt/xensource/debug/www/editables.js
+/opt/xensource/debug/www/graphs.js
+/opt/xensource/debug/www/haplan.css
+/opt/xensource/debug/www/haplan.js
+/opt/xensource/debug/www/images/xen_logo.gif
+/opt/xensource/debug/www/index.html
+/opt/xensource/debug/www/jquery/jqDnR.css
+/opt/xensource/debug/www/jquery/jqDnR.js
+/opt/xensource/debug/www/jquery/jqModal.css
+/opt/xensource/debug/www/jquery/jqModal.js
+/opt/xensource/debug/www/jquery/jquery-1.3.2.js
+/opt/xensource/debug/www/jquery/jquery-dom.js
+/opt/xensource/debug/www/jquery/jquery.autocomplete.css
+/opt/xensource/debug/www/jquery/jquery.autocomplete.js
+/opt/xensource/debug/www/jquery/jquery.bgiframe.js
+/opt/xensource/debug/www/jquery/jquery.color.js
+/opt/xensource/debug/www/jquery/jquery.cookie.js
+/opt/xensource/debug/www/jquery/jquery.jeditable.js
+/opt/xensource/debug/www/jquery/jquery.rpc.js
+/opt/xensource/debug/www/jquery/jquery.treeview.js
+/opt/xensource/debug/www/main.js
+/opt/xensource/debug/www/messages.js
+/opt/xensource/debug/www/networks.css
+/opt/xensource/debug/www/networks.js
+/opt/xensource/debug/www/objectviewoverrides.js
+/opt/xensource/debug/www/offline.js
+/opt/xensource/debug/www/process_rrd.js
+/opt/xensource/debug/www/tree.css
+/opt/xensource/debug/www/vmsearch.js
+/opt/xensource/debug/www/xenapi.js
+
+%files tests
+%defattr(-,root,root,-)
+/etc/xapi.d/plugins/lvhdrt-helper
+/etc/xapi.d/plugins/lvhdrt-trash-vdi
+/etc/xapi.d/plugins/multipathrt-helper
+/opt/xensource/debug/cli-rt-domu-shar.sh
+/opt/xensource/debug/cli_test
+/opt/xensource/debug/install-debian-pv-inside.sh
+/opt/xensource/debug/install-debian-pv.sh
+/opt/xensource/debug/lvhdrt
+/opt/xensource/debug/multipathrt
+/opt/xensource/debug/myfirstpatch.asc
+/opt/xensource/debug/perftest
+/opt/xensource/debug/quicktest
+/opt/xensource/debug/quicktestbin
+/opt/xensource/debug/watch_test
+/cli-rt/*
+
+%files client-devel
+%defattr(-,root,root,-)
+/usr/lib/ocaml/xapi-client/*
+
+%files datamodel-devel
+%defattr(-,root,root,-)
+/usr/lib/ocaml/xapi-datamodel/*
+
+%files docs
+%defattr(-,root,root,-)
+/usr/share/doc/xapi/*
+#/usr/share/doc/xapi/client-examples/*/*
+#/usr/share/doc/xapi/docs/html/API/Classes/*/index.html
+#/usr/share/doc/xapi/docs/html/API/Classes/*/Explicit/*
+#/usr/share/doc/xapi/docs/html/API/Classes/*/Implicit/*
+#/usr/share/doc/xapi/docs/html/API/Classes/*/Fields/*
+#/usr/share/doc/xapi/docs/html/*
+#/usr/share/doc/xapi/docs/html/images/*
+#/usr/share/doc/xapi/docs/pdf/xenenterpriseapi.pdf
+
+%changelog
+
+
+
+
+
+
+
+
_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
|
Home