Author: rvs
Date: Sat Mar 3 03:59:16 2012
New Revision: 1296573
URL: http://svn.apache.org/viewvc?rev=1296573&view=rev
Log:
BIGTOP-426. build failures in hadoop-0.23 branch
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop.mk
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1296573&r1=1296572&r2=1296573&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Sat Mar 3 03:59:16 2012
@@ -141,7 +141,7 @@ HADOOP_SBIN_DIR=${HADOOP_DIR}/sbin
HADOOP_LIB_DIR=${HADOOP_DIR}/lib
HADOOP_NATIVE_LIB_DIR=${HADOOP_LIB_DIR}/native
-HADOOP_VERSION=0.23.1-SNAPSHOT
+HADOOP_VERSION=0.23.1
##Needed for some distros to find ldconfig
export PATH="/sbin/:$PATH"
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/do-component-build?rev=1296573&r1=1296572&r2=1296573&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/do-component-build
Sat Mar 3 03:59:16 2012
@@ -16,5 +16,5 @@
set -ex
-mvn clean -DskipTests -Dhadoop.profile=23 -Dhadoop.version=0.23.1-SNAPSHOT
install site assembly:assembly "$@"
+mvn clean -DskipTests -Dhadoop.profile=23 -Dhadoop.version=0.23.1 install site
assembly:assembly "$@"
tar --strip-components=2 -xzf target/hbase*.tar.gz
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/do-component-build?rev=1296573&r1=1296572&r2=1296573&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/do-component-build
Sat Mar 3 03:59:16 2012
@@ -16,7 +16,7 @@
set -ex
-mvn clean install -Dmahout.skip.distribution=false -DskipTests
-Dhadoop.version=0.23.1-SNAPSHOT "$@"
+mvn clean install -Dmahout.skip.distribution=false -DskipTests
-Dhadoop.version=0.23.1 "$@"
mkdir build
for i in distribution/target/mahout*.tar.gz ; do
tar -C build --strip-components=1 -xzf $i
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh?rev=1296573&r1=1296572&r2=1296573&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/oozie/install_oozie.sh
Sat Mar 3 03:59:16 2012
@@ -220,9 +220,9 @@ cp -R ${OOZIE_BUILD_DIR}/oozie-sharelib*
failIfNotOK
install -d -m 0755 ${OOZIE_DATA}/oozie-server
failIfNotOK
-mv ${OOZIE_SERVER_DIR}/oozie-server/conf ${OOZIE_DATA}/oozie-server/
+cp -R ${OOZIE_BUILD_DIR}/oozie-server/conf ${OOZIE_DATA}/oozie-server/conf
failIfNotOK
-mv ${OOZIE_SERVER_DIR}/oozie-server/webapps ${OOZIE_DATA}/oozie-server/
+cp -R ${OOZIE_BUILD_DIR}/oozie-server/webapps ${OOZIE_SERVER_DIR}/webapps
failIfNotOK
cp -R ${EXTRADIR}/oozie-env.sh ${OOZIE_SERVER_DIR}/bin
failIfNotOK
@@ -230,12 +230,10 @@ chmod 755 ${OOZIE_SERVER_DIR}/bin/oozie-
failIfNotOK
# Unpack oozie.war some place reasonable
-OOZIE_WEBAPP=${OOZIE_SERVER_DIR}/webapps
-OOZIE_WEBAPP_TMPL=${OOZIE_DATA}/oozie-server/webapps
-mv ${OOZIE_WEBAPP_TMPL} ${OOZIE_WEBAPP}
-cp ${OOZIE_BUILD_DIR}/oozie.war ${OOZIE_WEBAPP}
-mkdir ${OOZIE_WEBAPP}/oozie
-unzip -d ${OOZIE_WEBAPP}/oozie ${OOZIE_BUILD_DIR}/oozie.war
+OOZIE_WEBAPP=${OOZIE_SERVER_DIR}/webapps/oozie
+mkdir ${OOZIE_WEBAPP}
+unzip -d ${OOZIE_WEBAPP} ${OOZIE_BUILD_DIR}/oozie.war
+touch ${OOZIE_SERVER_DIR}/webapps/oozie.war
# Create an exploded-war oozie deployment in /var/lib/oozie
sed -i -e 's#<Context#<Context allowLinking="true"#g'
${OOZIE_DATA}/oozie-server/conf/context.xml
@@ -243,8 +241,8 @@ mkdir ${OOZIE_DAT
ln -s /usr/lib/oozie/webapps ${OOZIE_DATA}/oozie-server/webapps
# Finally do a trick where all the libs go to a writable place
-mv -f ${OOZIE_WEBAPP}/oozie/WEB-INF/lib ${OOZIE_DATA}/oozie-libs
-ln -s /var/lib/oozie/oozie-libs ${OOZIE_WEBAPP}/oozie/WEB-INF/lib
+mv -f ${OOZIE_WEBAPP}/WEB-INF/lib ${OOZIE_DATA}/oozie-libs
+ln -s /var/lib/oozie/oozie-libs ${OOZIE_WEBAPP}/WEB-INF/lib
for i in `cd ${OOZIE_SERVER_DIR} ; echo lib/* libtools/*` ; do
ln -fs /usr/lib/oozie/$i ${OOZIE_DATA}/oozie-libs/${i#*/}
done
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/do-component-build?rev=1296573&r1=1296572&r2=1296573&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/do-component-build
Sat Mar 3 03:59:16 2012
@@ -16,4 +16,4 @@
set -ex
-ant -f build.xml -Dhadoopversion=23 package "$@"
+ant -f build.xml -Dhadoopversion=23 -Dhadoop.version=0.23.1 package "$@"
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1296573&r1=1296572&r2=1296573&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Sat Mar 3 03:59:16 2012
@@ -23,8 +23,7 @@ HADOOP_PKG_VERSION=0.23.1
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_SITE=http://people.apache.org/~acmurthy/hadoop-0.23.1-rc2/
+HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
$(eval $(call PACKAGE,hadoop,HADOOP))
# ZooKeeper
@@ -103,11 +102,11 @@ $(eval $(call PACKAGE,oozie,OOZIE))
WHIRR_NAME=whirr
WHIRR_RELNOTES_NAME=Apache Whirr
WHIRR_PKG_NAME=whirr
-WHIRR_BASE_VERSION=0.7.0
-WHIRR_PKG_VERSION=0.7.0
+WHIRR_BASE_VERSION=0.7.1
+WHIRR_PKG_VERSION=0.7.1
WHIRR_RELEASE_VERSION=1
WHIRR_TARBALL_DST=whirr-$(WHIRR_BASE_VERSION).tar.gz
-WHIRR_TARBALL_SRC=$(WHIRR_TARBALL_DST)
+WHIRR_TARBALL_SRC=whirr-$(WHIRR_BASE_VERSION)-src.tar.gz
WHIRR_SITE=$(APACHE_ARCHIVE)/whirr/whirr-$(WHIRR_BASE_VERSION)/
$(eval $(call PACKAGE,whirr,WHIRR))
