incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1213972 - in /incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src: common/hadoop/install_hadoop.sh deb/hadoop/control deb/hadoop/rules
Date Tue, 13 Dec 2011 23:01:07 GMT
Author: rvs
Date: Tue Dec 13 23:01:07 2011
New Revision: 1213972

URL: http://svn.apache.org/viewvc?rev=1213972&view=rev
Log:
BIGTOP-308. hadoop-0.23 branch doesn't provide .so links to hadoop native libraries

Modified:
    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/control
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules

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=1213972&r1=1213971&r2=1213972&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 Dec 13 23:01:07 2011
@@ -204,14 +204,16 @@ install -d -m 0755 ${HADOOP_NATIVE_LIB_D
 for library in libhdfs.so.0.0.0; do
   cp ${BUILD_DIR}/lib/${library} ${SYSTEM_LIB_DIR}/
   ldconfig -vlN ${SYSTEM_LIB_DIR}/${library}
+  ln -s ${library} ${SYSTEM_LIB_DIR}/${library/.so.*/}.so
 done
 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 `ls libsnappy.so.1.* 2>/dev/null` libhadoop.so.1.0.0; do
+for library in `cd ${BUILD_DIR}/lib ; 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}
+  ln -s ${library} ${HADOOP_NATIVE_LIB_DIR}/${library/.so.*/}.so
 done
 
 # conf

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control?rev=1213972&r1=1213971&r2=1213972&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control Tue Dec 13
23:01:07 2011
@@ -25,7 +25,6 @@ Package: hadoop
 Provides: hadoop
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils
-Recommends: hadoop-native
 Description: A software platform for processing vast amounts of data
  Hadoop is a software platform that lets one easily write and
  run applications that process vast amounts of data.

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=1213972&r1=1213971&r2=1213972&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 Tue Dec 13
23:01:07 2011
@@ -100,8 +100,6 @@ install-indep: namenode secondarynamenod
 
 	dh_install --sourcedir=debian/tmp -i
 
-	rm -Rf debian/hadoop/usr/lib/hadoop/lib/native
-
 	rm -Rf debian/hadoop/usr/lib/hadoop/bin/fuse_dfs 
 #	rm -Rf debian/hadoop/usr/bin/hadoop-fuse-dfs
 	rm -Rf debian/hadoop/usr/lib/hadoop/contrib/fuse-dfs



Mime
View raw message