Author: rvs
Date: Thu Oct 20 22:04:54 2011
New Revision: 1187081
URL: http://svn.apache.org/viewvc?rev=1187081&view=rev
Log:
BIGTOP-122. enable hadoop-sbin package
Added:
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.dirs
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control
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=1187081&r1=1187080&r2=1187081&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
Thu Oct 20 22:04:54 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
'lib/lib*so*' ; do
+for x in docs lib/native c++ src conf usr/bin/fuse_dfs contrib/fuse share
bin/task-controller 'lib/lib*so*' ; do
rm -rf $LIB_DIR/$x
done
@@ -250,6 +250,11 @@ EOF
chmod 755 $fuse_wrapper
fi
+ # 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
+
# Native compression libs
mkdir -p $LIB_DIR/lib/native/
cp -r ${BUILD_DIR}/lib/native/${NATIVE_BUILD_STRING} $LIB_DIR/lib/native/
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control?rev=1187081&r1=1187080&r2=1187081&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control Thu Oct 20
22:04:54 2011
@@ -56,20 +56,20 @@ Description: Native libraries for Hadoop
This optional package contains native libraries that increase the performance
of Hadoop's compression.
-#Package: hadoop-sbin
-#Provides: hadoop-sbin
-#Architecture: i386 amd64
-#Depends: ${shlibs:Depends}, hadoop (= ${source:Version})
-#Enhances: hadoop
-#Description: Server-side binaries necessary for secured Hadoop clusters
-# This package contains a setuid program, 'task-controller', which is used for
-# launching MapReduce tasks in a secured MapReduce cluster. This program allows
-# the tasks to run as the Unix user who submitted the job, rather than the
-# Unix user running the MapReduce daemons.
-# .
-# This package also contains 'jsvc', a daemon wrapper necessary to allow
-# DataNodes to bind to a low (privileged) port and then drop root privileges
-# before continuing operation.
+Package: hadoop-sbin
+Provides: hadoop-sbin
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, hadoop (= ${source:Version})
+Enhances: hadoop
+Description: Server-side binaries necessary for secured Hadoop clusters
+ This package contains a setuid program, 'task-controller', which is used for
+ launching MapReduce tasks in a secured MapReduce cluster. This program allows
+ the tasks to run as the Unix user who submitted the job, rather than the
+ Unix user running the MapReduce daemons.
+ .
+ This package also contains 'jsvc', a daemon wrapper necessary to allow
+ DataNodes to bind to a low (privileged) port and then drop root privileges
+ before continuing operation.
#Package: hadoop-fuse
#Provides: hadoop-fuse
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.dirs
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.dirs?rev=1187081&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.dirs
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.dirs Thu
Oct 20 22:04:54 2011
@@ -0,0 +1 @@
+/usr/lib/hadoop/sbin
Added: 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=1187081&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
Thu Oct 20 22:04:54 2011
@@ -0,0 +1 @@
+/usr/lib/hadoop/sbin
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=1187081&r1=1187080&r2=1187081&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 Thu
Oct 20 22:04:54 2011
@@ -283,6 +283,19 @@ Requires: %{name} = %{version}-%{release
%description pipes
Hadoop Pipes Library
+%package sbin
+Summary: Binaries for secured Hadoop clusters
+Group: System/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description sbin
+This package contains a setuid program, 'task-controller', which is used for
+launching MapReduce tasks in a secured MapReduce cluster. This program allows
+the tasks to run as the Unix user who submitted the job, rather than the
+Unix user running the MapReduce daemons.
+This package also contains 'jsvc', a daemon wrapper necessary to allow
+DataNodes to bind to a low (privileged) port and then drop root privileges
+before continuing operation.
%prep
%setup -n %{name}-%{hadoop_base_version}
@@ -489,3 +502,10 @@ fi
%{_includedir}/hdfs.h
# -devel should be its own package
%doc %{_docdir}/libhdfs-%{hadoop_version}
+
+%files sbin
+%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(0755,root,root) %{lib_hadoop}/sbin/%{hadoop_arch}/jsvc
