Return-Path: 
 <bigtop-commits-return-674-apmail-incubator-bigtop-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E52629842
	for <apmail-incubator-bigtop-commits-archive@minotaur.apache.org>;
 Thu, 23 Feb 2012 02:19:04 +0000 (UTC)
Received: (qmail 63187 invoked by uid 500); 23 Feb 2012 02:19:04 -0000
Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org
Received: (qmail 63151 invoked by uid 500); 23 Feb 2012 02:19:04 -0000
Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:bigtop-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:bigtop-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:bigtop-commits@incubator.apache.org>
List-Id: <bigtop-commits.incubator.apache.org>
Reply-To: bigtop-dev@incubator.apache.org
Delivered-To: mailing list bigtop-commits@incubator.apache.org
Received: (qmail 63141 invoked by uid 99); 23 Feb 2012 02:19:04 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Feb 2012 02:19:04 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Feb 2012 02:19:03 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9AD8B238889B;
	Thu, 23 Feb 2012 02:18:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1292621 - in
 /incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src:
 common/hadoop/MAPREDUCE-3890.patch deb/hadoop/rules
 rpm/hadoop/SPECS/hadoop.spec
Date: Thu, 23 Feb 2012 02:18:43 -0000
To: bigtop-commits@incubator.apache.org
From: rvs@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120223021843.9AD8B238889B@eris.apache.org>

Author: rvs
Date: Thu Feb 23 02:18:42 2012
New Revision: 1292621

URL: http://svn.apache.org/viewvc?rev=1292621&view=rev
Log:
BIGTOP-415. need to workaround MAPREDUCE-3890

Added:
    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

Added: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3890.patch
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3890.patch?rev=1292621&view=auto
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3890.patch (added)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3890.patch Thu Feb 23 02:18:42 2012
@@ -0,0 +1,13 @@
+diff --git hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+index dea4758..840a5db 100644
+--- hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
++++ hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+@@ -74,7 +74,7 @@
+               <configureEnvironment>
+                 <property>
+                   <name>CFLAGS</name>
+-                  <value>-DHADOOP_CONF_DIR=${container-executor.conf.dir} -m32</value>
++                  <value>-DHADOOP_CONF_DIR=${container-executor.conf.dir}</value>
+                 </property>
+               </configureEnvironment>
+               <configureWorkDir>${project.build.directory}/native/container-executor</configureWorkDir>

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=1292621&r1=1292620&r2=1292621&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 Feb 23 02:18:42 2012
@@ -33,10 +33,14 @@ ifeq (${DEB_BUILD_ARCH},i386)
   native_dir=Linux-i386-32
 endif
 
+patch: patch-stamp
+patch-stamp:	
+	patch -p0 < debian/MAPREDUCE-3890.patch
+	touch $@
 
 #Architecture
 build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
 	dh_testdir
 	env HADOOP_VERSION=${hadoop_version} HADOOP_ARCH=${native_dir} \
 		bash debian/do-component-build -Divy.home=${HOME}/.ivy2

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=1292621&r1=1292620&r2=1292621&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 Feb 23 02:18:42 2012
@@ -154,6 +154,7 @@ Source16: hadoop-yarn-resourcemanager.sv
 Source17: hadoop-yarn-nodemanager.svc
 Source18: hadoop-httpfs.svc
 Source19: hadoop-mapreduce-historyserver.default
+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
@@ -346,6 +347,7 @@ Hadoop Filesystem Library
 
 %prep
 %setup -n %{name}-%{hadoop_base_version}-src 
+%patch0 -p0
 
 %build
 # This assumes that you installed Java JDK 6 and set JAVA_HOME