Author: rvs
Date: Tue Jan 17 21:54:50 2012
New Revision: 1232601
URL: http://svn.apache.org/viewvc?rev=1232601&view=rev
Log:
BIGTOP-349. jsvc from hadoop build fails on some of the Linux systems that
Bigtop has to support
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build?rev=1232601&r1=1232600&r2=1232601&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
Tue Jan 17 21:54:50 2012
@@ -36,3 +36,11 @@ mvn site site:stage ${MAVEN_SKIP_TESTS}
mkdir -p build/share/doc/
cp -r target/site/* build/share/doc/
+# FIXME: this a workaround for HDFS-2303 (see BIGTOP-349 for details)
+rm -rf commons-daemon-1.0.8-src
+curl --retry 5 -s -L -k
http://mirrors.axint.net/apache/commons/daemon/source/commons-daemon-1.0.8-src.tar.gz
| tar xzf -
+pushd commons-daemon-1.0.8-src/src/native/unix
+ ./configure --prefix=/usr
+ make
+ cp -f jsvc ../../../../build/libexec/jsvc
+popd
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=1232601&r1=1232600&r2=1232601&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
Tue Jan 17 21:54:50 2012
@@ -165,8 +165,7 @@ done
#libexec
install -d -m 0755 ${SYSTEM_LIBEXEC_DIR}
-rm -fv ${BUILD_DIR}/libexec/jsvc
-mv ${BUILD_DIR}/libexec/* ${SYSTEM_LIBEXEC_DIR}/
+cp ${BUILD_DIR}/libexec/* ${SYSTEM_LIBEXEC_DIR}/
# bin
install -d -m 0755 ${HADOOP_BIN_DIR}
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install?rev=1232601&r1=1232600&r2=1232601&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
Tue Jan 17 21:54:50 2012
@@ -2,6 +2,7 @@
/etc/hadoop/conf.empty/httpfs-*
/usr/lib/hadoop/hadoop-hdfs*.jar
/usr/lib/hadoop/hadoop-archives*.jar
+/usr/lib/hadoop/libexec/jsvc
/usr/lib/hadoop/libexec/hdfs-config.sh
/usr/lib/hadoop/libexec/httpfs-config.sh
/usr/lib/hadoop/webapps
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=1232601&r1=1232600&r2=1232601&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
Tue Jan 17 21:54:50 2012
@@ -476,6 +476,7 @@ fi
%{lib_hadoop}/hadoop-archives*.jar
%{lib_hadoop}/libexec/hdfs-config.sh
%{lib_hadoop}/libexec/httpfs-config.sh
+%{lib_hadoop}/libexec/jsvc
%{lib_hadoop}/webapps
%{lib_hadoop}/sbin/update-hdfs-env.sh
%{lib_hadoop}/sbin/start-secure-dns.sh
