Updated Branches: refs/heads/master b2d3ecaa2 -> 8a6d72d72
BIGTOP-1117: hive-hcatalog integration has a few issues Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8a6d72d7 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8a6d72d7 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8a6d72d7 Branch: refs/heads/master Commit: 8a6d72d72c33b86fe288624b5523cbeaf8d39ad3 Parents: b2d3eca Author: Mark Grover <[email protected]> Authored: Mon Oct 14 14:01:27 2013 -0700 Committer: Mark Grover <[email protected]> Committed: Mon Oct 14 14:01:27 2013 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/hive/install_hive.sh | 5 +++++ bigtop-packages/src/rpm/hive/SPECS/hive.spec | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/8a6d72d7/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 fbd4a7a..90aaa4c 100755 --- a/bigtop-packages/src/common/hive/install_hive.sh +++ b/bigtop-packages/src/common/hive/install_hive.sh @@ -193,6 +193,11 @@ rm -rf ${HIVE_DIR}/lib/php/ext install -d -m 0755 ${HCATALOG_DIR} mv ${HIVE_DIR}/hcatalog/* ${HCATALOG_DIR} +rm -rf ${HIVE_DIR}/hcatalog + +# Workaround for HIVE-5534 +find ${HCATALOG_DIR} -name *.sh | xargs chmod 755 + install -d -m 0755 ${PREFIX}/etc/default for conf in `cd ${HCATALOG_DIR}/etc ; ls -d *` ; do install -d -m 0755 ${PREFIX}/etc/hive-$conf http://git-wip-us.apache.org/repos/asf/bigtop/blob/8a6d72d7/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 19e9dfc..dac5264 100644 --- a/bigtop-packages/src/rpm/hive/SPECS/hive.spec +++ b/bigtop-packages/src/rpm/hive/SPECS/hive.spec @@ -146,7 +146,7 @@ This optional package hosts a metadata server for Hive clients across a network %package hbase Summary: Provides integration between Apache HBase and Apache Hive Group: Development/Libraries -Requires: hbase +Requires: hive = %{version}-%{release}, hbase %description hbase @@ -374,13 +374,13 @@ fi %config(noreplace) %attr(755,root,root) %{conf_hcatalog}.dist %attr(0775,hive,hive) %{var_lib_hcatalog} %attr(0775,hive,hive) %{var_log_hcatalog} -%{usr_lib_hcatalog} +%dir %{usr_lib_hcatalog} %{usr_lib_hcatalog}/bin %{usr_lib_hcatalog}/etc/hcatalog %{usr_lib_hcatalog}/libexec %{usr_lib_hcatalog}/share/hcatalog -%{usr_lib_hcatalog}/sbin/hcat_server.sh %{usr_lib_hcatalog}/sbin/update-hcatalog-env.sh +%{usr_lib_hcatalog}/sbin/hcat* %{usr_bin}/hcat %{man_dir}/man1/hive-hcatalog.1.* @@ -389,8 +389,7 @@ fi %config(noreplace) %attr(755,root,root) %{conf_webhcat}.dist %{usr_lib_hcatalog}/share/webhcat %{usr_lib_hcatalog}/etc/webhcat -%{usr_lib_hcatalog}/sbin/webhcat_config.sh -%{usr_lib_hcatalog}/sbin/webhcat_server.sh +%{usr_lib_hcatalog}/sbin/webhcat* %define service_macro() \ %files %1 \
