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] fix occasional failure building omake

To: xen-api@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-API] [PATCH] fix occasional failure building omake
From: David Scott <dave.scott@xxxxxxxxxxxxx>
Date: Tue, 8 Jun 2010 13:42:37 +0100
Delivery-date: Tue, 08 Jun 2010 05:44:32 -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
# HG changeset patch
# User David Scott <david.scott@xxxxxxxxxxxxx>
# Date 1275996954 -3600
# Node ID 5227f497aaa239ff7ce8b7d20c61aa6a3fc1b23b
# Parent  b3462209199855bd5d312cccbbe40829369d75a5
Add omake fix from Debian bug 439568

This adds this patch from:

http://patches.ubuntu.com/by-release/extracted/debian/o/omake/0.9.8.5-3-2/10_stdin_stdout_fix.dpatch
  by Mike Furr <mfurr@xxxxxxxxxx>

diff -r b34622091998 -r 5227f497aaa2 Makefile
--- a/Makefile  Tue Jun 01 16:39:21 2010 +0100
+++ b/Makefile  Tue Jun 08 12:35:54 2010 +0100
@@ -54,6 +54,7 @@
        cp $(DIST)/findlib-${FINDLIB_VERSION}.tar.gz $(RPM_SOURCESDIR)/
        cp $(DIST)/omake-${OMAKE_VERSION}.tar.gz $(RPM_SOURCESDIR)/
        cp patches/omake-no-sync $(RPM_SOURCESDIR)/
+       cp patches/omake-stdin-stdout $(RPM_SOURCESDIR)/
        cp $(DIST)/xmlm-${XMLM_VERSION}.tbz $(RPM_SOURCESDIR)/
        cp $(DIST)/getopt-${GETOPT_VERSION}.tar.gz $(RPM_SOURCESDIR)/
        cp $(DIST)/type-conv-${TYPECONV_VERSION}.tar.bz2 $(RPM_SOURCESDIR)/
diff -r b34622091998 -r 5227f497aaa2 omake.spec
--- a/omake.spec        Tue Jun 01 16:39:21 2010 +0100
+++ b/omake.spec        Tue Jun 08 12:35:54 2010 +0100
@@ -8,6 +8,7 @@
 URL: http://omake.metaprl.org/
 Source0: %{name}-%{version}-%{index}.tar.gz
 Patch0: omake-no-sync
+Patch1: omake-stdin-stdout
 License: GPL
 Group: Development/Tools
 BuildRoot: %{_tmppath}/%{name}-root
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b ~omake-no-sync
+%patch1 -p1 -b ~omake-stdin-stdout
 
 %build
 INSTALL_ROOT=$RPM_BUILD_ROOT\
diff -r b34622091998 -r 5227f497aaa2 patches/omake-stdin-stdout
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/omake-stdin-stdout        Tue Jun 08 12:35:54 2010 +0100
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_stdin_stdout_fix.dpatch by Mike Furr <mfurr@xxxxxxxxxx>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: stdin <-> stdout fix (upstream r12115)
+
+@DPATCH@
+diff -urNad omake-0.9.8.5~/src/build/omake_rule.ml 
omake-0.9.8.5/src/build/omake_rule.ml
+--- omake-0.9.8.5~/src/build/omake_rule.ml     2007-07-02 14:20:23.000000000 
-0400
++++ omake-0.9.8.5/src/build/omake_rule.ml      2007-09-06 12:52:23.752616976 
-0400
+@@ -1040,12 +1040,12 @@
+  * Evaluate the commands NOW.
+  *)
+ and exec_commands venv pos loc commands =
+-   let stdin  = channel_of_var venv pos loc stdin_var in
+    let stdout = channel_of_var venv pos loc stdout_var in
+-   let stdin  = Lm_channel.descr stdin in
++   let stderr = channel_of_var venv pos loc stderr_var in
+    let stdout = Lm_channel.descr stdout in
++   let stderr = Lm_channel.descr stderr in
+       List.iter (fun command ->
+-            let pid = eval_shell_internal stdin stdout command in
++            let pid = eval_shell_internal stdout stderr command in
+             let status, _ = eval_shell_wait venv pos pid in
+             let code =
+                match status with
3 files changed, 29 insertions(+)
Makefile                   |    1 +
omake.spec                 |    2 ++
patches/omake-stdin-stdout |   26 ++++++++++++++++++++++++++


Attachment: xen-dist-ocaml.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] fix occasional failure building omake, David Scott <=