Updated Branches: refs/heads/master 1bcc752d8 -> 07758fc0b
BIGTOP-1055. Spark package doesn't create PREFIX/bin directory and sets wrong permissions Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/07758fc0 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/07758fc0 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/07758fc0 Branch: refs/heads/master Commit: 07758fc0ba7683fa561b69a05c939f84bb9a511d Parents: 1bcc752 Author: Konstantin Boudnik <[email protected]> Authored: Sat Aug 24 23:03:59 2013 -0700 Committer: Konstantin Boudnik <[email protected]> Committed: Sat Aug 24 23:03:59 2013 -0700 ---------------------------------------------------------------------- .../src/common/spark/install_spark.sh | 5 +---- bigtop-packages/src/rpm/spark/SPECS/spark.spec | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/07758fc0/bigtop-packages/src/common/spark/install_spark.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/spark/install_spark.sh b/bigtop-packages/src/common/spark/install_spark.sh index ea7163e..870ec09 100644 --- a/bigtop-packages/src/common/spark/install_spark.sh +++ b/bigtop-packages/src/common/spark/install_spark.sh @@ -105,7 +105,7 @@ fi MAN_DIR=${MAN_DIR:-/usr/share/man/man1} DOC_DIR=${DOC_DIR:-/usr/share/doc/spark} LIB_DIR=${LIB_DIR:-/usr/lib/spark} -SPARK_BIN_DIR=${LIB_DIR:-/usr/lib/spark/bin} +SPARK_BIN_DIR=${BIN_DIR:-/usr/lib/spark/bin} INSTALLED_LIB_DIR=${INSTALLED_LIB_DIR:-/usr/lib/spark} EXAMPLES_DIR=${EXAMPLES_DIR:-$DOC_DIR/examples} BIN_DIR=${BIN_DIR:-/usr/bin} @@ -182,7 +182,4 @@ export STANDALONE_SPARK_MASTER_HOST=\`hostname\` EOF -install -d -m 1755 $PREFIX/log/spark -install -d -m 1755 $PREFIX/run/spark -install -d -m 1755 $PREFIX/run/spark/work ln -s /var/run/spark/work $PREFIX/$LIB_DIR/work http://git-wip-us.apache.org/repos/asf/bigtop/blob/07758fc0/bigtop-packages/src/rpm/spark/SPECS/spark.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/spark/SPECS/spark.spec b/bigtop-packages/src/rpm/spark/SPECS/spark.spec index b5949f4..b0889e4 100644 --- a/bigtop-packages/src/rpm/spark/SPECS/spark.spec +++ b/bigtop-packages/src/rpm/spark/SPECS/spark.spec @@ -16,6 +16,8 @@ %define spark_name spark %define lib_spark /usr/lib/%{spark_name} %define var_lib_spark /var/lib/%{spark_name} +%define var_run_spark /var/run/%{spark_name} +%define var_log_spark /var/log/%{spark_name} %define bin_spark /usr/lib/%{spark_name}/bin %define etc_spark /etc/%{spark_name} %define config_spark %{etc_spark}/conf @@ -83,16 +85,19 @@ bash $RPM_SOURCE_DIR/do-component-build %install %__rm -rf $RPM_BUILD_ROOT +%__install -d -m 0755 $RPM_BUILD_ROOT/%{bin_spark}/ +%__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}/ +%__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/log/%{name}/ +%__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name}/ +%__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name}/work/ +%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/ + sh $RPM_SOURCE_DIR/install_spark.sh \ --build-dir=`pwd` \ --source-dir=$RPM_SOURCE_DIR \ --prefix=$RPM_BUILD_ROOT \ --doc-dir=%{doc_spark} -%__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/log/%{name} -%__install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name} -%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/ - for service in %{spark_services} do # Install init script @@ -127,8 +132,12 @@ done %config(noreplace) %{config_spark}.dist %doc %{doc_spark} %{lib_spark} +%{etc_spark} +%attr(0755,spark,spark) %{var_lib_spark} +%attr(0755,spark,spark) %{var_run_spark} +%attr(0755,spark,spark) %{var_log_spark} %attr(0755,root,root) %{initd_dir}/spark-master %attr(0755,root,root) %{initd_dir}/spark-worker -#%attr(0755,root,root) %{bin_spark} +%attr(0755,root,root) %{bin_spark} %{bin}/spark-shell %{bin}/spark-executor
