You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2017/08/02 23:24:06 UTC
[10/14] bigtop git commit: BIGTOP-2859: Add hive-version when build
hive rpms
BIGTOP-2859: Add hive-version when build hive rpms
Signed-off-by: Konstantin Boudnik <ko...@epam.com>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c29e841d
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c29e841d
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c29e841d
Branch: refs/heads/BIGTOP-2839
Commit: c29e841d733ed1d8fb9c332ea772259136607b85
Parents: 81a37a7
Author: dengkai02 <de...@baidu.com>
Authored: Thu Jul 27 12:06:42 2017 +0800
Committer: Konstantin Boudnik <ko...@epam.com>
Committed: Wed Aug 2 12:51:20 2017 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/hive/install_hive.sh | 6 +++++-
bigtop-packages/src/rpm/hive/SPECS/hive.spec | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c29e841d/bigtop-packages/src/common/hive/install_hive.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hive/install_hive.sh b/bigtop-packages/src/common/hive/install_hive.sh
index cb2009d..a3b84a6 100755
--- a/bigtop-packages/src/common/hive/install_hive.sh
+++ b/bigtop-packages/src/common/hive/install_hive.sh
@@ -47,7 +47,8 @@ OPTS=$(getopt \
-l 'python-dir:' \
-l 'hcatalog-dir:' \
-l 'installed-hcatalog-dir:' \
- -l 'build-dir:' -- "$@")
+ -l 'build-dir:' \
+ -l 'hive-version:' -- "$@")
if [ $? != 0 ] ; then
usage
@@ -86,6 +87,9 @@ while true ; do
--installed-hcatalog-dir)
INSTALLED_HCATALOG_DIR=$2 ; shift 2
;;
+ --hive-version)
+ HIVE_VERSION=$2 ; shift 2
+ ;;
--)
shift ; break
;;
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c29e841d/bigtop-packages/src/rpm/hive/SPECS/hive.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hive/SPECS/hive.spec b/bigtop-packages/src/rpm/hive/SPECS/hive.spec
index 1bf63cb..3766eab 100644
--- a/bigtop-packages/src/rpm/hive/SPECS/hive.spec
+++ b/bigtop-packages/src/rpm/hive/SPECS/hive.spec
@@ -247,7 +247,8 @@ cp $RPM_SOURCE_DIR/hive-site.xml .
/bin/bash %{SOURCE2} \
--prefix=$RPM_BUILD_ROOT \
--build-dir=%{hive_dist} \
- --doc-dir=$RPM_BUILD_ROOT/%{doc_hive}
+ --doc-dir=$RPM_BUILD_ROOT/%{doc_hive} \
+ --hive-version=%{hive_base_version}
%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
%__install -d -m 0755 $RPM_BUILD_ROOT/etc/default/