Author: rvs
Date: Wed Feb 8 20:06:43 2012
New Revision: 1242066
URL: http://svn.apache.org/viewvc?rev=1242066&view=rev
Log:
Hooking up Hadoop 0.23.1 RC0
Removed:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3436_rev2.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3791.patch
Modified:
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/deb/hadoop/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules?rev=1242066&r1=1242065&r2=1242066&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
Wed Feb 8 20:06:43 2012
@@ -38,8 +38,6 @@ endif
build: build-stamp
build-stamp:
dh_testdir
- patch -p0 < debian/MAPREDUCE-3436_rev2.patch
- patch -p0 < debian/MAPREDUCE-3791.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=1242066&r1=1242065&r2=1242066&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
Wed Feb 8 20:06:43 2012
@@ -149,7 +149,6 @@ Source12: service-hadoop-httpfs
Source13: yarn.conf
Source14: mapreduce.conf
Patch0: MAPREDUCE-3436_rev2.patch
-Patch1: MAPREDUCE-3791.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
@@ -341,9 +340,7 @@ AutoReq: no
Hadoop Filesystem Library
%prep
-%setup -n apache-hadoop-common-f1d8a9b
-%patch0 -p0
-%patch1 -p0
+%setup -n %{name}-%{hadoop_base_version}-src
%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=1242066&r1=1242065&r2=1242066&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Wed Feb 8 20:06:43 2012
@@ -18,14 +18,13 @@ BIGTOP_VERSION=0.3.0-hadoop23-incubating
# Hadoop 0.20.0-based hadoop package
HADOOP_NAME=hadoop
HADOOP_RELNOTES_NAME=Apache Hadoop
-HADOOP_BASE_VERSION=0.23.1-SNAPSHOT
+HADOOP_BASE_VERSION=0.23.1
HADOOP_PKG_VERSION=0.23.1
HADOOP_RELEASE_VERSION=1
HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
-#HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
+HADOOP_TARBALL_SRC=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)-src.tar.gz
#HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
-HADOOP_TARBALL_SRC=f1d8a9b
-HADOOP_SITE=https://github.com/apache/hadoop-common/tarball
+HADOOP_SITE=http://people.apache.org/~acmurthy/hadoop-0.23.1-rc0/
$(eval $(call PACKAGE,hadoop,HADOOP))
# ZooKeeper
