Repository: bigtop Updated Branches: refs/heads/master b2d18d1df -> 8da309359
BIGTOP-1776: Resolve an warning on packaging Hadoop RPM Signed-off-by: Evans Ye <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8da30935 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8da30935 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8da30935 Branch: refs/heads/master Commit: 8da30935923a635f920bd0bb0f1bbae788778bb4 Parents: b2d18d1 Author: YoungWoo Kim <[email protected]> Authored: Thu Mar 26 13:07:28 2015 +0900 Committer: Evans Ye <[email protected]> Committed: Thu Mar 26 16:50:19 2015 +0000 ---------------------------------------------------------------------- bigtop-packages/src/common/hadoop/install_hadoop.sh | 1 + bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/8da30935/bigtop-packages/src/common/hadoop/install_hadoop.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/install_hadoop.sh b/bigtop-packages/src/common/hadoop/install_hadoop.sh index 38b578b..9736e5a 100755 --- a/bigtop-packages/src/common/hadoop/install_hadoop.sh +++ b/bigtop-packages/src/common/hadoop/install_hadoop.sh @@ -185,6 +185,7 @@ cp ${BUILD_DIR}/libexec/* ${SYSTEM_LIBEXEC_DIR}/ cp ${DISTRO_DIR}/hadoop-layout.sh ${SYSTEM_LIBEXEC_DIR}/ install -m 0755 ${DISTRO_DIR}/init-hdfs.sh ${SYSTEM_LIBEXEC_DIR}/ install -m 0755 ${DISTRO_DIR}/init-hcfs.json ${SYSTEM_LIBEXEC_DIR}/ +rm -rf ${SYSTEM_LIBEXEC_DIR}/*.cmd # hadoop jar install -d -m 0755 ${HADOOP_DIR} http://git-wip-us.apache.org/repos/asf/bigtop/blob/8da30935/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec index 786e009..4acac4c 100644 --- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec +++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec @@ -649,6 +649,10 @@ fi %config(noreplace) %{etc_hadoop}/conf.empty/configuration.xsl %config(noreplace) %{etc_hadoop}/conf.empty/hadoop-env.sh %config(noreplace) %{etc_hadoop}/conf.empty/hadoop-policy.xml +%config(noreplace) %{etc_hadoop}/conf.empty/kms-acls.xml +%config(noreplace) %{etc_hadoop}/conf.empty/kms-env.sh +%config(noreplace) %{etc_hadoop}/conf.empty/kms-log4j.properties +%config(noreplace) %{etc_hadoop}/conf.empty/kms-site.xml %config(noreplace) /etc/default/hadoop /etc/bash_completion.d/hadoop %{lib_hadoop}/*.jar @@ -658,6 +662,7 @@ fi %{lib_hadoop}/etc %{lib_hadoop}/libexec/hadoop-config.sh %{lib_hadoop}/libexec/hadoop-layout.sh +%{lib_hadoop}/libexec/kms-config.sh %{bin_hadoop}/hadoop %{man_hadoop}/man1/hadoop.1.* %{man_hadoop}/man1/yarn.1.*
