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/23 02:29:46 UTC
svn commit: r1187830 - in /incubator/bigtop/trunk/bigtop-packages/src:
common/hadoop/install_hadoop.sh deb/hadoop/hadoop-sbin.install
deb/hadoop/rules rpm/hadoop/SPECS/hadoop.spec
Author: rvs
Date: Sun Oct 23 00:29:46 2011
New Revision: 1187830
URL: http://svn.apache.org/viewvc?rev=1187830&view=rev
Log:
BIGTOP-139. links to jsvc and task-controller need to be provided in order to make hard-coded values work
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
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=1187830&r1=1187829&r2=1187830&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 Sun Oct 23 00:29:46 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 bin/task-controller 'lib/lib*so*' 'lib/lib*a' ; do
+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
rm -rf $LIB_DIR/$x
done
@@ -257,8 +257,9 @@ EOF
# Security related binaries
mkdir -p $LIB_DIR/sbin/${NATIVE_BUILD_STRING}
- mv -f $LIB_DIR/sbin/task-controller $LIB_DIR/sbin/${NATIVE_BUILD_STRING}
- mv -f $LIB_DIR/libexec/jsvc* $LIB_DIR/sbin/${NATIVE_BUILD_STRING}/jsvc
+ # FIXME: workaround for BIGTOP-139
+ cp -f $LIB_DIR/bin/task-controller $LIB_DIR/sbin/${NATIVE_BUILD_STRING}
+ cp -f $LIB_DIR/libexec/jsvc* $LIB_DIR/sbin/${NATIVE_BUILD_STRING}/jsvc
# Native compression libs
mkdir -p $LIB_DIR/lib/native/
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.install?rev=1187830&r1=1187829&r2=1187830&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.install (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.install Sun Oct 23 00:29:46 2011
@@ -1 +1,3 @@
/usr/lib/hadoop/sbin
+/usr/lib/hadoop/bin/task-controller
+/usr/lib/hadoop/libexec/jsvc*
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules?rev=1187830&r1=1187829&r2=1187830&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules Sun Oct 23 00:29:46 2011
@@ -97,6 +97,10 @@ install-indep: namenode secondarynamenod
rm -Rf debian/hadoop/usr/bin/hadoop-fuse-dfs
rm -Rf debian/hadoop/usr/lib/hadoop/contrib/fuse-dfs
+ # FIXME: The following is a workaround for BIGTOP-139
+ rm -Rf debian/hadoop/usr/lib/hadoop/libexec/jsvc*
+ rm -Rf debian/hadoop/usr/lib/hadoop/bin/task-controller
+
install-arch:
mkdir -p debian/tmp/etc/default
cp debian/hadoop-fuse.default debian/tmp/etc/default/hadoop-fuse
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=1187830&r1=1187829&r2=1187830&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 Sun Oct 23 00:29:46 2011
@@ -426,6 +426,9 @@ fi
%attr(0775,root,hadoop) %{log_hadoop}
%exclude %{lib_hadoop}/lib/native
+# FIXME: The following is a workaround for BIGTOP-139
+%exclude %{lib_hadoop}/bin/task-controller
+%exclude %{lib_hadoop}/libexec/jsvc*
%files doc
%defattr(-,root,root)
@@ -516,5 +519,9 @@ fi
%defattr(-,root,root)
%dir %{lib_hadoop}/sbin
%dir %{lib_hadoop}/sbin/%{hadoop_arch}
-%attr(4754,root,mapred) %{lib_hadoop}/sbin/%{hadoop_arch}/task-controller
+%attr(4750,root,mapred) %{lib_hadoop}/sbin/%{hadoop_arch}/task-controller
%attr(0755,root,root) %{lib_hadoop}/sbin/%{hadoop_arch}/jsvc
+
+# FIXME: The following is a workaround for BIGTOP-139
+%attr(4750,root,mapred) %{lib_hadoop}/bin/task-controller
+%attr(0755,root,root) %{lib_hadoop}/libexec/jsvc*