Author: rvs
Date: Thu Dec 1 00:47:55 2011
New Revision: 1208921
URL: http://svn.apache.org/viewvc?rev=1208921&view=rev
Log:
BIGTOP-283. in hadoop-0.23 the sha for Hadoop needs to be bumped to the
23.1-SNAPSHOT cut off point
Removed:
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
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2543.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2544.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3372.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3373.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/deb/hadoop/rules
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
incubator/bigtop/branches/hadoop-0.23/bigtop.mk
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=1208921&r1=1208920&r2=1208921&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
Thu Dec 1 00:47:55 2011
@@ -27,6 +27,10 @@ pushd hadoop-mapreduce-project
popd
# Build documentation
+# FIXME: the pushd/popd block is an ugly workaround for spurious Maven failures
+pushd hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site
+ mvn site site:stage ${MAVEN_SKIP_TESTS} $@ || :
+popd
mvn site site:stage ${MAVEN_SKIP_TESTS} $@
(cd build ; tar --strip-components=1 -xzvf
../hadoop-dist/target/hadoop-0.23.0-SNAPSHOT.tar.gz)
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules?rev=1208921&r1=1208920&r2=1208921&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
Thu Dec 1 00:47:55 2011
@@ -39,14 +39,6 @@ endif
build: build-stamp
build-stamp:
dh_testdir
- patch -p0 < ./debian/HADOOP-7787.patch
- patch -p0 < ./debian/HADOOP-7801.patch
- patch -p0 < ./debian/HDFS-2543.patch
- patch -p0 < ./debian/MAPREDUCE-3372.patch
- patch -p0 < ./debian/HADOOP-7802.patch
- patch -p0 < ./debian/HDFS-2544.patch
- patch -p0 < ./debian/MAPREDUCE-3373.patch
-
env HADOOP_VERSION=${hadoop_version} HADOOP_ARCH=${native_dir} \
bash debian/do-component-build -Divy.home=${HOME}/.ivy2
touch $@
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=1208921&r1=1208920&r2=1208921&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
Thu Dec 1 00:47:55 2011
@@ -125,13 +125,6 @@ Source7: hadoop-fuse-dfs.1
Source8: hadoop-fuse.default
Source9: hadoop.nofiles.conf
Source10: yarn-init.tmpl
-Patch0: HADOOP-7787.patch
-Patch1: HADOOP-7801.patch
-Patch2: HADOOP-7802.patch
-Patch3: MAPREDUCE-3372.patch
-Patch4: HDFS-2543.patch
-Patch5: MAPREDUCE-3373.patch
-Patch6: HDFS-2544.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
@@ -275,14 +268,7 @@ AutoReq: no
Hadoop Filesystem Library
%prep
-%setup -n apache-hadoop-common-a823266
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%patch6
+%setup -n apache-hadoop-common-61572bb
%build
# This assumes that you installed Java JDK 6 and set JAVA_HOME
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1208921&r1=1208920&r2=1208921&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Thu Dec 1 00:47:55 2011
@@ -24,7 +24,7 @@ HADOOP_RELEASE_VERSION=1
HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
#HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
#HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
-HADOOP_TARBALL_SRC=a823266
+HADOOP_TARBALL_SRC=61572bb
HADOOP_SITE=https://github.com/apache/hadoop-common/tarball
$(eval $(call PACKAGE,hadoop,HADOOP))
