WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-api

[Xen-API] [PATCH] Build fixes for SRPM builds

To: xen-api@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-API] [PATCH] Build fixes for SRPM builds
From: Jon Ludlam <jonathan.ludlam@xxxxxxxxxxxxx>
Date: Sat, 23 Oct 2010 21:01:29 +0100
Delivery-date: Sat, 23 Oct 2010 13:02:00 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-api-request@lists.xensource.com?subject=help>
List-id: Discussion of API issues surrounding Xen <xen-api.lists.xensource.com>
List-post: <mailto:xen-api@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-api-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mercurial-patchbomb/1.4.3
# HG changeset patch
# User Jonathan Ludlam <Jonathan.Ludlam@xxxxxxxxxxxxx>
# Date 1287864044 -3600
# Node ID 81da5ae856c06eba9344d84c7a7761637af3c154
# Parent  3be1829b46b70a8ae4b2013fc20b71a76f3b55ee
Some fixes to ensure that the SRPM of xapi-libs builds using mock

Signed-off-by: Jon Ludlam <jonathan.ludlam@xxxxxxxxxxxxx>

diff -r 3be1829b46b7 -r 81da5ae856c0 close-and-exec/Makefile
--- a/close-and-exec/Makefile
+++ b/close-and-exec/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755 
 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g
diff -r 3be1829b46b7 -r 81da5ae856c0 forking_executioner/Makefile
--- a/forking_executioner/Makefile
+++ b/forking_executioner/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755
 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g
@@ -6,8 +6,8 @@
 
 LDFLAGS = -cclib -L./
 
-LIBEXEC  = "/opt/xensource/libexec"
-INIT_D   = "/etc/rc.d/init.d"
+LIBEXEC  = /opt/xensource/libexec
+INIT_D   = /etc/rc.d/init.d
 VERSION := $(shell hg parents --template "{rev}" 2>/dev/null || echo 0.0)
 OCAMLOPTFLAGS = -g -dtypes
 
diff -r 3be1829b46b7 -r 81da5ae856c0 mk/Makefile
--- a/mk/Makefile
+++ b/mk/Makefile
@@ -21,7 +21,7 @@
 srpm:
        mkdir -p $(RPM_SRPMSDIR) $(RPM_SPECSDIR) $(RPM_SOURCESDIR) 
$(RPM_RPMSDIR)
        hg archive -p xapi-libs-0 -t tbz2 $(RPM_SOURCESDIR)/xapi-libs-0.tar.bz2
-       install -o root -g root ../xapi-libs.spec $(RPM_SPECSDIR)
+       install ../xapi-libs.spec $(RPM_SPECSDIR)
        $(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) -bs 
$(RPM_SPECSDIR)/xapi-libs.spec
 
 $(MY_SOURCES)/MANIFEST: $(MY_SOURCES_DIRSTAMP)
diff -r 3be1829b46b7 -r 81da5ae856c0 pciutil/Makefile
--- a/pciutil/Makefile
+++ b/pciutil/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755
 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g
diff -r 3be1829b46b7 -r 81da5ae856c0 sexpr/Makefile
--- a/sexpr/Makefile
+++ b/sexpr/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755
 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g
diff -r 3be1829b46b7 -r 81da5ae856c0 stdext/Makefile
--- a/stdext/Makefile
+++ b/stdext/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755
 CC = gcc
 OCAMLLOC := $(shell ocamlc -where)
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml -I$(OCAMLLOC)
diff -r 3be1829b46b7 -r 81da5ae856c0 xapi-libs.spec
--- a/xapi-libs.spec
+++ b/xapi-libs.spec
@@ -11,6 +11,7 @@
 URL:  http://www.xen.org
 Source0: xapi-libs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: ocaml, ocaml-findlib, ocaml-camlp4, ocaml-type-conv, 
ocaml-getopt, ocaml-xmlm, ocaml-xmlm-devel, autoconf, automake, xen-devel, 
blktap-devel, e2fsprogs-devel
 
 %description
 The xapi toolstack development libraries and tools.
diff -r 3be1829b46b7 -r 81da5ae856c0 xml-light2/Makefile
--- a/xml-light2/Makefile
+++ b/xml-light2/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755
 OCAMLPACKS = xmlm
 
 CC = gcc
 close-and-exec/Makefile      |  2 +-
 forking_executioner/Makefile |  6 +++---
 mk/Makefile                  |  2 +-
 pciutil/Makefile             |  2 +-
 sexpr/Makefile               |  2 +-
 stdext/Makefile              |  2 +-
 xapi-libs.spec               |  1 +
 xml-light2/Makefile          |  2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)


Attachment: xen-api-libs.hg.patch
Description: Text Data

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-API] [PATCH] Build fixes for SRPM builds, Jon Ludlam <=