Generate rpms from xen-api-libs.hg:

xapi-devel: devel libraries needed by xapi
xapi-utils: utility binaries
xapi-fe: fork/exec daemon

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/Makefile.in b/Makefile.in
index 5869f177e49aafd339c2117ceeeb0d1f15fffa74..03062979ea1246d9763784bdb0b7e28e51b74d3b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,7 +133,6 @@ bininstall:
        $(MAKE) -C stdext bininstall
        $(MAKE) -C close-and-exec bininstall
        $(MAKE) -C forking_executioner bininstall
-       $(MAKE) -C scripts bininstall
 
 binuninstall:
        $(MAKE) -C pciutil binuninstall
@@ -142,7 +141,6 @@ binuninstall:
        $(MAKE) -C stdext binuninstall
        $(MAKE) -C close-and-exec binuninstall
        $(MAKE) -C forking_executioner binuninstall
-       $(MAKE) -C scripts binuninstall
 
 .PHONY: doc
 doc:
@@ -198,3 +196,19 @@ cleanxen:
        $(MAKE) -C xsrpc clean
        $(MAKE) -C eventchn clean
 
+RPM_SPECSDIR=/usr/src/redhat/SPECS
+RPM_SOURCEDIR=/usr/src/redhat/SOURCES
+XEN_RELEASE=xcp0.2
+
+$(RPM_SPECSDIR)/xapi-libs.spec: xapi.spec.in
+       sed -e s\,@XEN_RELEASE@,$(XEN_RELEASE),g   \
+           < xapi.spec.in                         \
+           > $(RPM_SPECSDIR)/xapi-libs.spec
+
+$(RPM_SOURCEDIR)/xapi-libs-0.tar.bz2:
+       hg archive -p xapi-0 -t tbz2 $(RPM_SOURCEDIR)/xapi-libs-0.tar.bz2
+
+.PHONY: rpm
+rpm: $(RPM_SPECSDIR)/xapi-libs.spec $(RPM_SOURCEDIR)/xapi-libs-0.tar.bz2
+       rpmbuild -ba $(RPM_SPECSDIR)/xapi-libs.spec
+

diff --git a/Makefile.xcp b/Makefile.xcp
index b5fa9c2b6f0106b203d099e4c06e1cd1dcae9f5b..149a63ecef291e01620bedfc7c720291365e2e24 100644 (file)
--- a/Makefile.xcp
+++ b/Makefile.xcp
@@ -15,6 +15,6 @@ endif
 
 .PHONY: srpm
 srpm:
-       hg archive -p xapi-libs-0 -t tbz2 $(RPM_SOURCEDIR)/xapi-libs-0.tar.bz2
+       hg archive -p xapi-0 -t tbz2 $(RPM_SOURCEDIR)/xapi-libs-0.tar.bz2
        rpmbuild --define "XEN_RELEASE $(XEN_RELEASE)" -bs --nodeps xapi-libs.spec
 

diff --git a/camldm/Makefile b/camldm/Makefile
index 2d6217237b694f0448bd17f04af3d28ef43b44d2..5eca24fa27564b509816598956060f45025e46fe 100644 (file)
--- a/camldm/Makefile
+++ b/camldm/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
+CFLAGS = -Wall -fPIC -O2 -I/usr/lib/ocaml
 OCAMLC = ocamlc -g
 OCAMLOPT = ocamlopt
 

diff --git a/cdrom/Makefile b/cdrom/Makefile
index 23c08c48e9f15c6b95fd5af7c421fd52725bf337..63d5a4d2c18f169ea04944b2b1822fc0f3b7bd90 100644 (file)
--- a/cdrom/Makefile
+++ b/cdrom/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
+CFLAGS = -Wall -fPIC -O2 -I/usr/lib/ocaml
 OCAMLC = ocamlc -g
 OCAMLOPT = ocamlopt
 

diff --git a/cpuid/Makefile b/cpuid/Makefile
index 4a4f028c2155d99753fb824115f5ad8837ef4976..8c4752826e8785ac0f6666e5d23049b4bc991fbf 100644 (file)
--- a/cpuid/Makefile
+++ b/cpuid/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml -I$(XEN_ROOT)/usr/include
+CFLAGS = -Wall -fPIC -O2 -I/usr/lib/ocaml -I$(XEN_ROOT)/usr/include
 OCAMLC = ocamlc -g
 OCAMLOPT = ocamlopt
 INCLUDES = -I ../stdext -I ../xc -I ../xen-utils

diff --git a/eventchn/Makefile b/eventchn/Makefile
index 29d5c526ead39dc4f52548a70be496ec2ea21983..4e2aeb09ebf1e6824c08271b2a49bbbb596564bf 100644 (file)
--- a/eventchn/Makefile
+++ b/eventchn/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml -I$(XEN_ROOT)/usr/include
+CFLAGS = -Wall -fPIC -O2 -I/usr/lib/ocaml -I$(XEN_ROOT)/usr/include
 OCAMLC = ocamlc -g
 OCAMLOPT = ocamlopt
 

diff --git a/mmap/Makefile b/mmap/Makefile
index 076372d731722b0db00d13098696e80c52e43340..6f305871cf2f58d2b9c051cbfdd3a0ca85e52a32 100644 (file)
--- a/mmap/Makefile
+++ b/mmap/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
+CFLAGS = -Wall -fPIC -O2 -I/usr/lib/ocaml
 OCAMLC = ocamlc -g
 OCAMLOPT = ocamlopt
 

diff --git a/scripts/Makefile b/scripts/Makefile
deleted file mode 100644 (file)
index 8c773ab..0000000
--- a/scripts/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-IPROG=install -m 755 -o root -g root
-
-SCRIPTS=/etc/xensource/scripts/install
-
-REPO_SUFFIX:=$(shell basename "${REPO}")
-
-.PHONY: bininstall
-bininstall:
-               mkdir -p $(DESTDIR)$(SCRIPTS)
-               $(IPROG) install.sh $(DESTDIR)$(SCRIPTS)/install-$(REPO_SUFFIX).sh
-
-.PHONY: binuninstall
-               rm -f $(DESTDIR)$(SCRIPTS)/install-$(REPO_SUFFIX).sh

diff --git a/scripts/install.sh b/scripts/install.sh
deleted file mode 100644 (file)
index a1371ea..0000000
--- a/scripts/install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Run after the binaries are unpacked to complete installation
-
-chkconfig --add fe
\ No newline at end of file

diff --git a/xapi-libs.spec b/xapi-libs.spec
index 2d36f4804211b63a446cffa1e5f52a72c43566a3..8f7f1044e06644cbe247034284e9d72c87f339a3 100644 (file)
--- a/xapi-libs.spec
+++ b/xapi-libs.spec
@@ -69,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
    /opt/xensource/libexec/pciutil
    /opt/xensource/libexec/sexprpp
    /opt/xensource/libexec/xmlpp
-   /opt/xensource/libexec/extentlistset_test
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -107,8 +107,6 @@ rm -rf $RPM_BUILD_ROOT
    /usr/lib/ocaml/http-svr/http_svr.cmxa
    /usr/lib/ocaml/http-svr/server_io.cmi
    /usr/lib/ocaml/http-svr/server_io.cmx
-   /usr/lib/ocaml/http-svr/http_client.cmi
-   /usr/lib/ocaml/http-svr/http_client.cmx
    /usr/lib/ocaml/log/META
    /usr/lib/ocaml/log/debug.cmi
    /usr/lib/ocaml/log/debug.cmx
@@ -182,9 +180,6 @@ rm -rf $RPM_BUILD_ROOT
    /usr/lib/ocaml/stdext/dllstdext_stubs.so
    /usr/lib/ocaml/stdext/encodings.cmi
    /usr/lib/ocaml/stdext/encodings.cmx
-   /usr/lib/ocaml/stdext/extentlistSet.cmi
-   /usr/lib/ocaml/stdext/extentlistSet.cmx
-   /usr/lib/ocaml/stdext/extentlistset_test.cmx
    /usr/lib/ocaml/stdext/fe.cmi
    /usr/lib/ocaml/stdext/fe.cmx
    /usr/lib/ocaml/stdext/fecomms.cmi
@@ -201,11 +196,7 @@ rm -rf $RPM_BUILD_ROOT
    /usr/lib/ocaml/stdext/gzip.cmx
    /usr/lib/ocaml/stdext/hashtblext.cmi
    /usr/lib/ocaml/stdext/hashtblext.cmx
-   /usr/lib/ocaml/stdext/int64ext.cmi
-   /usr/lib/ocaml/stdext/int64ext.cmx
    /usr/lib/ocaml/stdext/libstdext_stubs.a
-   /usr/lib/ocaml/stdext/lazyList.cmi
-   /usr/lib/ocaml/stdext/lazyList.cmx
    /usr/lib/ocaml/stdext/listext.cmi
    /usr/lib/ocaml/stdext/listext.cmx
    /usr/lib/ocaml/stdext/mapext.cmi
@@ -220,8 +211,6 @@ rm -rf $RPM_BUILD_ROOT
    /usr/lib/ocaml/stdext/range.cmx
    /usr/lib/ocaml/stdext/ring.cmi
    /usr/lib/ocaml/stdext/ring.cmx
-   /usr/lib/ocaml/stdext/set_test.cmi
-   /usr/lib/ocaml/stdext/set_test.cmx
    /usr/lib/ocaml/stdext/sha1sum.cmi
    /usr/lib/ocaml/stdext/sha1sum.cmx
    /usr/lib/ocaml/stdext/stdext.a
@@ -241,10 +230,6 @@ rm -rf $RPM_BUILD_ROOT
    /usr/lib/ocaml/stdext/vIO.cmx
    /usr/lib/ocaml/stdext/zerocheck.cmi
    /usr/lib/ocaml/stdext/zerocheck.cmx
-   /usr/lib/ocaml/stdext/either.cmi
-   /usr/lib/ocaml/stdext/either.cmx
-   /usr/lib/ocaml/stdext/os.cmi
-   /usr/lib/ocaml/stdext/os.cmx
    /usr/lib/ocaml/stunnel/META
    /usr/lib/ocaml/stunnel/stunnel.a
    /usr/lib/ocaml/stunnel/stunnel.cma
@@ -271,14 +256,6 @@ rm -rf $RPM_BUILD_ROOT
    /usr/lib/ocaml/xml-light2/xml-light2.cmxa
    /usr/lib/ocaml/xml-light2/xml.cmi
    /usr/lib/ocaml/xml-light2/xml.cmx
-   /usr/lib/ocaml/vhd/META
-   /usr/lib/ocaml/vhd/dllvhd_stubs.so
-   /usr/lib/ocaml/vhd/libvhd_stubs.a
-   /usr/lib/ocaml/vhd/vhd.a
-   /usr/lib/ocaml/vhd/vhd.cma
-   /usr/lib/ocaml/vhd/vhd.cmi
-   /usr/lib/ocaml/vhd/vhd.cmx
-   /usr/lib/ocaml/vhd/vhd.cmxa
 
 %exclude /usr/lib/ocaml/close-and-exec/closeandexec_main.cmx
 %exclude /usr/lib/ocaml/pciutil/pciutil_main.cmx
@@ -296,13 +273,6 @@ rm -rf $RPM_BUILD_ROOT
    /usr/lib/ocaml/cpuid/cpuid.cmxa
    /usr/lib/ocaml/cpuid/dllcpuid_stubs.so
    /usr/lib/ocaml/cpuid/libcpuid_stubs.a
-   /usr/lib/ocaml/tapctl/META
-   /usr/lib/ocaml/tapctl/tapctl.a
-   /usr/lib/ocaml/tapctl/tapctl.cma
-   /usr/lib/ocaml/tapctl/tapctl.cmi
-   /usr/lib/ocaml/tapctl/tapctl.cmx
-   /usr/lib/ocaml/tapctl/tapctl.cmxa
-   /usr/lib/ocaml/netdev/*
    /usr/lib/ocaml/eventchn/META
    /usr/lib/ocaml/eventchn/dlleventchn_stubs.so
    /usr/lib/ocaml/eventchn/eventchn.a

diff --git a/xb/Makefile b/xb/Makefile
index f3888d151a7f4e864e0d1d56e4b1c53dc68b8ab0..e9a14c12982f0e4b6e98dc91bab52030e1203580 100644 (file)
--- a/xb/Makefile
+++ b/xb/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml -I$(XEN_ROOT)/usr/include -I../mmap
+CFLAGS = -Wall -fPIC -O2 -I/usr/lib/ocaml -I$(XEN_ROOT)/usr/include -I../mmap
 OCAMLC = ocamlc -g -I ../mmap
 OCAMLOPT = ocamlopt
 OCAMLOPTFLAGS = -g -dtypes -I ../mmap

diff --git a/xc/Makefile b/xc/Makefile
index b73f0d711d916acb94fe9c3265cb1813cf5636b7..e138a6a895fbdddb4b5d1e05c23761d3e200f3ff 100644 (file)
--- a/xc/Makefile
+++ b/xc/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml -I$(XEN_ROOT)/usr/include -I../mmap -I./
+CFLAGS = -Wall -fPIC -O2 -I/usr/lib/ocaml -I$(XEN_ROOT)/usr/include -I../mmap -I./
 OCAMLC = ocamlc -g -I ../mmap -I ../uuid
 OCAMLOPT = ocamlopt
 OCAMLOPTFLAGS = -g -dtypes -I ../mmap -I ../uuid

diff --git a/xs/Makefile b/xs/Makefile
index 5c7f623093929669b0b8a647e1e0d976657663b3..be0904c406b1331a18b4b246817dfca60783bd00 100644 (file)
--- a/xs/Makefile
+++ b/xs/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
+CFLAGS = -Wall -fPIC -O2 -I/usr/lib/ocaml
 OCAMLC = ocamlc -g -I ../xb/
 OCAMLOPT = ocamlopt