You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2016/07/29 17:03:24 UTC
[43/51] [abbrv] bigtop git commit: BIGTOP-2495. hive-hbase package is
broken
BIGTOP-2495. hive-hbase package is broken
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/3f3bc1a2
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/3f3bc1a2
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/3f3bc1a2
Branch: refs/heads/BIGTOP-2253
Commit: 3f3bc1a23375ed992b40b9a64c8bfcea27d8366f
Parents: 93f0cc0
Author: Youngwoo Kim <yw...@apache.org>
Authored: Mon Jul 18 11:03:46 2016 +0900
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Mon Jul 18 18:18:58 2016 -0700
----------------------------------------------------------------------
bigtop-packages/src/deb/hive/hive-hbase.install | 3 ++-
bigtop-packages/src/deb/hive/rules | 2 +-
bigtop-packages/src/rpm/hive/SPECS/hive.spec | 8 ++++++--
3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f3bc1a2/bigtop-packages/src/deb/hive/hive-hbase.install
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hive/hive-hbase.install b/bigtop-packages/src/deb/hive/hive-hbase.install
index c45df07..6a2485b 100644
--- a/bigtop-packages/src/deb/hive/hive-hbase.install
+++ b/bigtop-packages/src/deb/hive/hive-hbase.install
@@ -1 +1,2 @@
-/usr/lib/hive/lib/hbase.jar
+/usr/lib/hive/lib/hbase-*.jar
+/usr/lib/hive/lib/hive-hbase-handler*.jar
http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f3bc1a2/bigtop-packages/src/deb/hive/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hive/rules b/bigtop-packages/src/deb/hive/rules
index 5ed1799..dfb2537 100755
--- a/bigtop-packages/src/deb/hive/rules
+++ b/bigtop-packages/src/deb/hive/rules
@@ -50,7 +50,7 @@ override_dh_auto_install: server2 metastore hcatalog-server webhcat-server
--doc-dir=debian/tmp/usr/share/doc/${hive_pkg_name}
# We need to get rid of jars that happen to be shipped in other CDH packages
rm -f debian/tmp/usr/lib/hive/lib/hbase-*.jar debian/tmp/usr/lib/hive/lib/zookeeper-*.jar
- ln -s /usr/lib/hbase/hbase.jar debian/tmp/usr/lib/hive/lib
+ ln -s /usr/lib/hbase/hbase-common.jar /usr/lib/hbase/hbase-client.jar debian/tmp/usr/lib/hive/lib
ln -s /usr/lib/zookeeper/zookeeper.jar debian/tmp/usr/lib/hive/lib
# Workaround for BIGTOP-583
rm -f debian/tmp/usr/lib/hive/lib/slf4j-log4j12-*.jar
http://git-wip-us.apache.org/repos/asf/bigtop/blob/3f3bc1a2/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 80c547b..1bf63cb 100644
--- a/bigtop-packages/src/rpm/hive/SPECS/hive.spec
+++ b/bigtop-packages/src/rpm/hive/SPECS/hive.spec
@@ -261,7 +261,8 @@ cp $RPM_SOURCE_DIR/hive-site.xml .
# We need to get rid of jars that happen to be shipped in other Bigtop packages
%__rm -f $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/hbase-*.jar $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/zookeeper-*.jar
-%__ln_s /usr/lib/hbase/hbase.jar /usr/lib/zookeeper/zookeeper.jar $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/
+%__ln_s /usr/lib/zookeeper/zookeeper.jar $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/
+%__ln_s /usr/lib/hbase/hbase-common.jar /usr/lib/hbase/hbase-client.jar $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/
# Workaround for BIGTOP-583
%__rm -f $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/slf4j-log4j12-*.jar
@@ -342,10 +343,13 @@ fi
%exclude %{usr_lib_hive}/lib/libfb303-*.jar
%exclude %{usr_lib_hive}/lib/log4j-*.jar
%exclude %{usr_lib_hive}/lib/commons-logging-*.jar
+%exclude %{usr_lib_hive}/lib/hbase-*.jar
+%exclude %{usr_lib_hive}/lib/hive-hbase-handler*.jar
%files hbase
%defattr(-,root,root,755)
-%{usr_lib_hive}/lib/hbase.jar
+%{usr_lib_hive}/lib/hbase-*.jar
+%{usr_lib_hive}/lib/hive-hbase-handler*.jar
%files jdbc
%defattr(-,root,root,755)