Author: rvs
Date: Thu Dec 8 16:27:42 2011
New Revision: 1211955
URL: http://svn.apache.org/viewvc?rev=1211955&view=rev
Log:
Fixing 2 trivial issues preventing the build from happening
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
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/install_hadoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1211955&r1=1211954&r2=1211955&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
Thu Dec 8 16:27:42 2011
@@ -209,7 +209,7 @@ install -d -m 0755 ${SYSTEM_INCLUDE_DIR}
cp ${BUILD_DIR}/../hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.h
${SYSTEM_INCLUDE_DIR}/
cp ${BUILD_DIR}/lib/*.a ${HADOOP_NATIVE_LIB_DIR}/
-for library in libsnappy.so.1.* libhadoop.so.1.0.0; do
+for library in `ls libsnappy.so.1.* 2>/dev/null` libhadoop.so.1.0.0; do
cp ${BUILD_DIR}/lib/${library} ${HADOOP_NATIVE_LIB_DIR}/
ldconfig -vlN ${HADOOP_NATIVE_LIB_DIR}/${library}
done
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=1211955&r1=1211954&r2=1211955&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 Dec 8 16:27:42 2011
@@ -285,7 +285,6 @@ bash %{SOURCE2} \
--system-lib-dir=$RPM_BUILD_ROOT%{_libdir} \
--system-libexec-dir=$RPM_BUILD_ROOT%{libexecdir} \
--hadoop-etc-dir=$RPM_BUILD_ROOT%{etc_hadoop} \
- --yarn-etc-dir=$RPM_BUILD_ROOT%{etc_yarn} \
--prefix=$RPM_BUILD_ROOT \
--doc-dir=$RPM_BUILD_ROOT%{doc_hadoop} \
--example-dir=$RPM_BUILD_ROOT%{doc_hadoop}/examples \
