incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1338475 - in /incubator/bigtop/trunk/bigtop-packages/src: common/hive/install_hive.sh deb/hive/control deb/hive/rules rpm/hive/SPECS/hive.spec
Date Mon, 14 May 2012 22:48:18 GMT
Author: rvs
Date: Mon May 14 22:48:17 2012
New Revision: 1338475

URL: http://svn.apache.org/viewvc?rev=1338475&view=rev
Log:
BIGTOP-587. Hive package needs to depend on Zookeper and HBase

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh
    incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control
    incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh?rev=1338475&r1=1338474&r2=1338475&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh Mon May 14 22:48:17
2012
@@ -166,8 +166,5 @@ chmod 755 ${PYTHON_DIR}/hive_metastore/*
 # Dir for Metastore DB
 install -d -m 1777 $PREFIX/var/lib/hive/metastore/
 
-# We need to get rid of jars that happen to be shipped in other packages
-rm -f ${LIB_DIR}/lib/hbase-*.jar ${LIB_DIR}/lib/zookeeper-*.jar
-
 # Remove some source which gets installed
 rm -rf ${LIB_DIR}/lib/php/ext

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control?rev=1338475&r1=1338474&r2=1338475&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control Mon May 14 22:48:17 2012
@@ -23,7 +23,7 @@ Homepage: http://hive.apache.org/
 
 Package: hive
 Architecture: all
-Depends: adduser, hadoop-client, bigtop-utils
+Depends: adduser, hadoop-client, bigtop-utils, hbase, zookeeper
 Description: Hive is a data warehouse infrastructure built on top of Hadoop
  Hive is a data warehouse infrastructure built on top of Hadoop that provides
  tools to enable easy data summarization, adhoc querying and analysis of large

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules?rev=1338475&r1=1338474&r2=1338475&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules Mon May 14 22:48:17 2012
@@ -54,6 +54,9 @@ install-indep: metastore server	
 	  --build-dir=src/build/dist \
 	  --doc-dir=debian/${hive_pkg_name}/usr/share/doc/${hive_pkg_name} \
 	  --python-dir=debian/python-${hive_pkg_name}/usr/share/python-support/python-${hive_pkg_name}/${hive_pkg_name}
+	# We need to get rid of jars that happen to be shipped in other CDH packages
+	rm -f debian/${hive_pkg_name}/usr/lib/hive/lib/hbase-*.jar debian/${hive_pkg_name}/usr/lib/hive/lib/zookeeper-*.jar
+	ln -s  /usr/lib/hbase/hbase.jar /usr/lib/zookeeper/zookeeper.jar debian/${hive_pkg_name}/usr/lib/hive/lib
 	# Workaround for BIGTOP-583
 	rm -f debian/${hive_pkg_name}/usr/lib/hive/lib/slf4j-log4j12-*.jar
 	dh_pysupport

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1338475&r1=1338474&r2=1338475&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec Mon May 14 22:48:17
2012
@@ -70,7 +70,7 @@ Source5: hive-server.default
 Source6: hive-metastore.default
 Source7: hive.1
 Source8: hive-site.xml
-Requires: hadoop-client, bigtop-utils
+Requires: hadoop-client, bigtop-utils, hbase, zookeeper
 Obsoletes: %{name}-webinterface
 
 %description 
@@ -145,6 +145,10 @@ cp $RPM_SOURCE_DIR/hive-site.xml .
 # Workaround for BIGTOP-583
 %__rm -f $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/slf4j-log4j12-*.jar
 
+# We need to get rid of jars that happen to be shipped in other CDH 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/
+
 for service in %{hive_services}
 do
         init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{name}-${service}



Mime
View raw message