You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2012/03/10 00:48:32 UTC

svn commit: r1299108 - in /incubator/bigtop/branches/hadoop-0.23: bigtop-packages/src/common/hadoop/MAPREDUCE-3890.patch bigtop-packages/src/deb/hadoop/rules bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec bigtop.mk

Author: rvs
Date: Fri Mar  9 23:48:31 2012
New Revision: 1299108

URL: http://svn.apache.org/viewvc?rev=1299108&view=rev
Log:
BIGTOP-438. need to bump the version of hadoop .23 to hadoop-0.23.3-SNAPSHOT

Removed:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3890.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=1299108&r1=1299107&r2=1299108&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 Fri Mar  9 23:48:31 2012
@@ -35,7 +35,6 @@ endif
 
 patch: patch-stamp
 patch-stamp:	
-	patch -p0 < debian/MAPREDUCE-3890.patch
 	touch $@
 
 #Architecture

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=1299108&r1=1299107&r2=1299108&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 Mar  9 23:48:31 2012
@@ -160,7 +160,6 @@ Source19: mapreduce.default
 Source20: hdfs.default
 Source21: yarn.default
 Source22: hadoop-layout.sh
-Patch0: MAPREDUCE-3890.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
@@ -361,8 +360,8 @@ AutoReq: no
 Hadoop Filesystem Library
 
 %prep
-%setup -n %{name}-%{hadoop_base_version}-src 
-%patch0 -p0
+# %setup -n %{name}-%{hadoop_base_version}-src 
+%setup -n apache-hadoop-common-2cbb181
 
 %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=1299108&r1=1299107&r2=1299108&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Fri Mar  9 23:48:31 2012
@@ -18,12 +18,14 @@ 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
-HADOOP_PKG_VERSION=0.23.1
+HADOOP_BASE_VERSION=0.23.3-SNAPSHOT
+HADOOP_PKG_VERSION=0.23.3
 HADOOP_RELEASE_VERSION=1
 HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
-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=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)-src.tar.gz
+#HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
+HADOOP_TARBALL_SRC=2cbb181
+HADOOP_SITE=https://github.com/apache/hadoop-common/tarball
 $(eval $(call PACKAGE,hadoop,HADOOP))
 
 # ZooKeeper