Author: bmahe
Date: Fri Nov 4 23:48:21 2011
New Revision: 1197821
URL: http://svn.apache.org/viewvc?rev=1197821&view=rev
Log:
Apply some needed patch being reviewed. Will remove them as they get commited
upstream
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7787.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7801.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7802.patch
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7787.patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7787.patch?rev=1197821&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7787.patch
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7787.patch
Fri Nov 4 23:48:21 2011
@@ -0,0 +1,38 @@
+diff --git hadoop-dist/pom.xml hadoop-dist/pom.xml
+index 2a5d7a9..cce1f56 100644
+--- hadoop-dist/pom.xml
++++ hadoop-dist/pom.xml
+@@ -152,9 +152,9 @@
+ fi
+ }
+
+- run tar czf hadoop-${project.version}.tar.gz
hadoop-${project.version}
++ run tar czf hadoop-${project.version}-bin.tar.gz
hadoop-${project.version}
+ echo
+- echo "Hadoop dist tar available at:
${project.build.directory}/hadoop-${project.version}.tar.gz"
++ echo "Hadoop dist tar available at:
${project.build.directory}/hadoop-${project.version}-bin.tar.gz"
+ echo
+ </echo>
+ <exec executable="sh" dir="${project.build.directory}"
failonerror="true">
+diff --git pom.xml pom.xml
+index 96c627b..16cc708 100644
+--- pom.xml
++++ pom.xml
+@@ -201,7 +201,7 @@
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+- <finalName>hadoop-dist-${project.version}-src</finalName>
++ <finalName>hadoop-${project.version}-src</finalName>
+ <outputDirectory>hadoop-dist/target</outputDirectory>
+ <!-- Not using descriptorRef and hadoop-assembly dependency
-->
+ <!-- to avoid making hadoop-main to depend on a module
-->
+@@ -225,7 +225,7 @@
+ <configuration>
+ <target>
+ <echo/>
+- <echo>Hadoop source tar available at:
${basedir}/hadoop-dist/target/hadoop-dist-${project.version}-src.tar.gz</echo>
++ <echo>Hadoop source tar available at:
${basedir}/hadoop-dist/target/hadoop-${project.version}-src.tar.gz</echo>
+ <echo/>
+ </target>
+ </configuration>
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7801.patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7801.patch?rev=1197821&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7801.patch
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7801.patch
Fri Nov 4 23:48:21 2011
@@ -0,0 +1,15 @@
+diff --git hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
+index 5f248fd..8bf9aec 100644
+--- hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
++++ hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
+@@ -27,7 +27,9 @@ this="$common_bin/$script"
+
+ # the root of the Hadoop installation
+ # See HADOOP-6255 for directory structure layout
+-export HADOOP_PREFIX=`dirname "$this"`/..
++HADOOP_DEFAULT_PREFIX=`dirname "$this"`/..
++HADOOP_PREFIX=${HADOOP_PREFIX:-$HADOOP_DEFAULT_PREFIX}
++export HADOOP_PREFIX
+
+ #check to see if the conf dir is given as an optional argument
+ if [ $# -gt 1 ]
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7802.patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7802.patch?rev=1197821&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7802.patch
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7802.patch
Fri Nov 4 23:48:21 2011
@@ -0,0 +1,15 @@
+diff --git hadoop-common-project/hadoop-common/src/main/bin/hadoop
hadoop-common-project/hadoop-common/src/main/bin/hadoop
+index a3bed69..c047952 100755
+--- hadoop-common-project/hadoop-common/src/main/bin/hadoop
++++ hadoop-common-project/hadoop-common/src/main/bin/hadoop
+@@ -21,7 +21,9 @@ bin=`which $0`
+ bin=`dirname ${bin}`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXED_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ function print_usage(){
+ echo "Usage: hadoop [--config confdir] COMMAND"
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build?rev=1197821&r1=1197820&r2=1197821&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
Fri Nov 4 23:48:21 2011
@@ -35,7 +35,7 @@ mvn -Pdist -Pnative -Psrc -Dtar ${MAVEN_
mvn install ${MAVEN_SKIP_TESTS} $@
mvn site site:stage ${MAVEN_SKIP_TESTS} $@
-(cd build ; tar --strip-components=1 -xzvf
../hadoop-dist/target/hadoop-0.23.0-SNAPSHOT.tar.gz)
-(cd build/src ; tar --strip-components=1 -xzvf
../../hadoop-dist/target/hadoop-dist-0.23.0-SNAPSHOT-src.tar.gz)
+(cd build ; tar --strip-components=1 -xzvf
../hadoop-dist/target/hadoop-0.23.0-SNAPSHOT-bin.tar.gz)
+(cd build/src ; tar --strip-components=1 -xzvf
../../hadoop-dist/target/hadoop-0.23.0-SNAPSHOT-src.tar.gz)
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1197821&r1=1197820&r2=1197821&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Fri Nov 4 23:48:21 2011
@@ -122,6 +122,9 @@ Source6: hadoop.1
Source7: hadoop-fuse-dfs.1
Source8: hadoop-fuse.default
Source9: hadoop.nofiles.conf
+Patch0: HADOOP-7787.patch
+Patch1: HADOOP-7801.patch
+Patch2: HADOOP-7802.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig,
/sbin/service, bigtop-utils
@@ -266,6 +269,9 @@ before continuing operation.
%prep
%setup -n apache-hadoop-common-c6c6fb0
+%patch0
+%patch1
+%patch2
%build
# This assumes that you installed Java JDK 6 and set JAVA_HOME
