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/05/04 18:44:44 UTC
svn commit: r1334056 - in /incubator/bigtop/trunk:
bigtop-packages/src/common/hadoop/do-component-build
bigtop-packages/src/common/hadoop/install_hadoop.sh
bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec bigtop.mk
Author: rvs
Date: Fri May 4 16:44:44 2012
New Revision: 1334056
URL: http://svn.apache.org/viewvc?rev=1334056&view=rev
Log:
BIGTOP-573. we no longer have to override container-executor.conf.dir
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
incubator/bigtop/trunk/bigtop.mk
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build?rev=1334056&r1=1334055&r2=1334056&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build Fri May 4 16:44:44 2012
@@ -26,7 +26,7 @@ mkdir build/src
# Build artifacts
MAVEN_SKIP_TESTS="-DskipTests -DskipTest -DskipITs"
-mvn $ANT_OPTS $BUNDLE_SNAPPY -Dcontainer-executor.conf.dir=/etc/hadoop/conf -Pdist -Pnative -Pfuse -Psrc -Dtar ${MAVEN_SKIP_TESTS} install "$@"
+mvn $ANT_OPTS $BUNDLE_SNAPPY -Pdist -Pnative -Pfuse -Psrc -Dtar ${MAVEN_SKIP_TESTS} install "$@"
mvn site site:stage ${MAVEN_SKIP_TESTS} $@
(cd build ; tar --strip-components=1 -xzvf ../hadoop-dist/target/hadoop-${HADOOP_VERSION}.tar.gz)
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1334056&r1=1334055&r2=1334056&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh Fri May 4 16:44:44 2012
@@ -342,6 +342,8 @@ cp ${BUILD_DIR}/etc/hadoop/log4j.propert
# FIXME: Provide a convenience link for configuration (HADOOP-7939)
install -d -m 0755 ${HADOOP_DIR}/etc
ln -s ${HADOOP_ETC_DIR##${PREFIX}}/conf ${HADOOP_DIR}/etc/hadoop
+install -d -m 0755 ${MAPREDUCE_DIR}/etc
+ln -s ${HADOOP_ETC_DIR##${PREFIX}}/conf ${MAPREDUCE_DIR}/etc/hadoop
# Create log, var and lib
install -d -m 0755 $PREFIX/var/{log,run,lib}/hadoop-hdfs
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1334056&r1=1334055&r2=1334056&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Fri May 4 16:44:44 2012
@@ -413,7 +413,7 @@ These projects (enumerated below) allow
%prep
# %setup -n %{name}-%{hadoop_base_version}-src
-%setup -n apache-hadoop-common-7ed45d0
+%setup -n apache-hadoop-common-3748687
%build
Modified: incubator/bigtop/trunk/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1334056&r1=1334055&r2=1334056&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Fri May 4 16:44:44 2012
@@ -25,7 +25,7 @@ HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADO
#HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)
#HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH)
#HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH)
-HADOOP_TARBALL_SRC=7ed45d0
+HADOOP_TARBALL_SRC=3748687
HADOOP_SITE=https://github.com/apache/hadoop-common/tarball
HADOOP_ARCHIVE=$(HADOOP_SITE)
$(eval $(call PACKAGE,hadoop,HADOOP))