svn commit: r1443240 - in /incubator/mesos/trunk/hadoop: hadoop-7698-1.patch hadoop-gridmix.patch

[vi...@apache.org]

Author: vinodkone
Date: Wed Feb  6 22:13:43 2013
New Revision: 1443240

URL: http://svn.apache.org/viewvc?rev=1443240&view=rev
Log:
Added missing hadoop-7698-1.patch and fixed hadoop-gridmix.patch
to contain the correct diff ranges.

Added:
    incubator/mesos/trunk/hadoop/hadoop-7698-1.patch
Modified:
    incubator/mesos/trunk/hadoop/hadoop-gridmix.patch

Added: incubator/mesos/trunk/hadoop/hadoop-7698-1.patch
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/hadoop/hadoop-7698-1.patch?rev=1443240&view=auto
==============================================================================
--- incubator/mesos/trunk/hadoop/hadoop-7698-1.patch (added)
+++ incubator/mesos/trunk/hadoop/hadoop-7698-1.patch Wed Feb  6 22:13:43 2013
@@ -0,0 +1,27 @@
+diff --git a/build.xml b/build.xml
+index a5ba0f5..cc8a606 100644
+--- a/build.xml        (revision 1177084)
++++ b/build.xml        (working copy)
+@@ -170,6 +170,13 @@
+ 
+   <property name="jsvc.build.dir" value="${build.dir}/jsvc.${os.arch}" />
+   <property name="jsvc.install.dir" value="${dist.dir}/libexec" /> 
++  <exec executable="sh" outputproperty="os-name">
++    <arg value="-c" />
++    <arg value="uname -s | tr '[:upper:]' '[:lower:]'" />
++  </exec>
++  <condition property="os-arch" value="universal">
++    <equals arg1="darwin" arg2="${os-name}" />
++  </condition>
+   <condition property="os-arch" value="x86_64">
+     <and>
+       <os arch="amd64" />
+@@ -183,7 +190,7 @@
+       <os arch="i686" />
+     </or>
+   </condition>
+-  <property name="jsvc.location" value="http://archive.apache.org/dist/commons/daemon/binaries/1.0.2/linux/commons-daemon-1.0.2-bin-linux-${os-arch}.tar.gz" />
++  <property name="jsvc.location" value="http://archive.apache.org/dist/commons/daemon/binaries/1.0.2/${os-name}/commons-daemon-1.0.2-bin-${os-name}-${os-arch}.tar.gz" />
+   <property name="jsvc.dest.name" value="jsvc.${os.arch}.tar.gz" />
+ 
+   <!-- task-controller properties set here -->

Modified: incubator/mesos/trunk/hadoop/hadoop-gridmix.patch
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/hadoop/hadoop-gridmix.patch?rev=1443240&r1=1443239&r2=1443240&view=diff
==============================================================================
--- incubator/mesos/trunk/hadoop/hadoop-gridmix.patch (original)
+++ incubator/mesos/trunk/hadoop/hadoop-gridmix.patch Wed Feb  6 22:13:43 2013
@@ -2,7 +2,7 @@ diff --git a/src/contrib/gridmix/src/jav
 index a5ba0f5..cc8a606 100644
 --- a/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
 +++ b/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
-@@ -609,3 +609,2 @@
+@@ -609,10 +609,10 @@
      }
    }