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 2011/10/28 03:23:12 UTC

svn commit: r1190117 - in /incubator/bigtop/trunk/bigtop-packages/src: common/hadoop/install_hadoop.sh rpm/hadoop/SPECS/hadoop.spec

Author: rvs
Date: Fri Oct 28 01:23:12 2011
New Revision: 1190117

URL: http://svn.apache.org/viewvc?rev=1190117&view=rev
Log:
BIGTOP-201. bigtop package has an incorrect dependency on libhdfs.so

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec

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=1190117&r1=1190116&r2=1190117&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 Oct 28 01:23:12 2011
@@ -126,7 +126,7 @@ mkdir -p $LIB_DIR
 (cd $BUILD_DIR && tar -cf - .) | (cd $LIB_DIR && tar xf - )
 
 # Take out things we've installed elsewhere
-for x in docs lib/native c++ src conf usr/bin/fuse_dfs contrib/fuse share sbin/task-controller 'lib/lib*so*' 'lib/lib*a' ; do
+for x in docs lib/native c++ src conf contrib/fuse-dfs/fuse_dfs usr/bin/fuse_dfs contrib/fuse share sbin/task-controller 'lib/lib*so*' 'lib/lib*a' ; do
   rm -rf $LIB_DIR/$x 
 done
 

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=1190117&r1=1190116&r2=1190117&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 Oct 28 01:23:12 2011
@@ -426,6 +426,8 @@ fi
 %attr(0775,root,hadoop) %{log_hadoop}
 
 %exclude %{lib_hadoop}/lib/native
+%exclude %{lib_hadoop}/sbin/%{hadoop_arch}
+%exclude %{lib_hadoop}/bin/fuse_dfs
 # FIXME: The following is a workaround for BIGTOP-139
 %exclude %{lib_hadoop}/bin/task-controller
 %exclude %{lib_hadoop}/libexec/jsvc*