BIGTOP-3495. Optional tools of hadoop-tools should be optional. (#736)
diff --git a/bigtop-packages/src/common/hadoop/hadoop-layout.sh b/bigtop-packages/src/common/hadoop/hadoop-layout.sh
index 2720d68..d09fed8 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-layout.sh
+++ b/bigtop-packages/src/common/hadoop/hadoop-layout.sh
@@ -15,6 +15,7 @@
HADOOP_COMMON_DIR="./"
HADOOP_COMMON_LIB_JARS_DIR="lib"
HADOOP_COMMON_LIB_NATIVE_DIR="lib/native"
+HADOOP_TOOLS_DIR="tools"
HDFS_DIR="./"
HDFS_LIB_JARS_DIR="lib"
YARN_DIR="./"
diff --git a/bigtop-packages/src/common/hadoop/install_hadoop.sh b/bigtop-packages/src/common/hadoop/install_hadoop.sh
index 91730dd..7d0b902 100755
--- a/bigtop-packages/src/common/hadoop/install_hadoop.sh
+++ b/bigtop-packages/src/common/hadoop/install_hadoop.sh
@@ -193,9 +193,9 @@
cp ${BUILD_DIR}/share/hadoop/common/*.jar ${HADOOP_DIR}/
cp ${BUILD_DIR}/share/hadoop/common/lib/hadoop-auth*.jar ${HADOOP_DIR}/
cp ${BUILD_DIR}/share/hadoop/common/lib/hadoop-annotations*.jar ${HADOOP_DIR}/
+install -d -m 0755 ${HADOOP_DIR}/tools
install -d -m 0755 ${MAPREDUCE_DIR}
cp ${BUILD_DIR}/share/hadoop/mapreduce/hadoop-mapreduce*.jar ${MAPREDUCE_DIR}
-cp ${BUILD_DIR}/share/hadoop/tools/lib/*.jar ${MAPREDUCE_DIR}
install -d -m 0755 ${HDFS_DIR}
cp ${BUILD_DIR}/share/hadoop/hdfs/*.jar ${HDFS_DIR}/
install -d -m 0755 ${YARN_DIR}
@@ -207,6 +207,8 @@
# lib jars
install -d -m 0755 ${HADOOP_DIR}/lib
cp ${BUILD_DIR}/share/hadoop/common/lib/*.jar ${HADOOP_DIR}/lib
+install -d -m 0755 ${HADOOP_DIR}/tools/lib
+cp ${BUILD_DIR}/share/hadoop/tools/lib/*.jar ${HADOOP_DIR}/tools/lib
install -d -m 0755 ${MAPREDUCE_DIR}/lib
cp ${BUILD_DIR}/share/hadoop/mapreduce/lib/*.jar ${MAPREDUCE_DIR}/lib
install -d -m 0755 ${HDFS_DIR}/lib
diff --git a/bigtop-packages/src/deb/hadoop/hadoop.install b/bigtop-packages/src/deb/hadoop/hadoop.install
index 28601a3..f69b68b 100644
--- a/bigtop-packages/src/deb/hadoop/hadoop.install
+++ b/bigtop-packages/src/deb/hadoop/hadoop.install
@@ -14,10 +14,12 @@
/usr/lib/hadoop/libexec/hadoop-layout.sh
/usr/lib/hadoop/libexec/hadoop-functions.sh
/usr/lib/hadoop/libexec/shellprofile.d
+/usr/lib/hadoop/libexec/tools
/usr/lib/hadoop/*.jar
/usr/lib/hadoop/lib
/usr/lib/hadoop/sbin
/usr/lib/hadoop/bin
+/usr/lib/hadoop/tools
/usr/bin/hadoop
/usr/share/man/man1/hadoop.1.*
/usr/share/man/man1/hdfs.1.*
diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
index 4e49f3b..9c7e6f6 100644
--- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
+++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
@@ -699,10 +699,12 @@
%{lib_hadoop}/bin
%{lib_hadoop}/etc
%{lib_hadoop}/logs
+%{lib_hadoop}/tools
%{lib_hadoop}/libexec/hadoop-config.sh
%{lib_hadoop}/libexec/hadoop-layout.sh
%{lib_hadoop}/libexec/hadoop-functions.sh
%{lib_hadoop}/libexec/shellprofile.d
+%{lib_hadoop}/libexec/tools
%{bin_hadoop}/hadoop
%{man_hadoop}/man1/hadoop.1.*
%{man_hadoop}/man1/yarn.1.*
