Author: rvs
Date: Wed Jan 18 20:33:20 2012
New Revision: 1233049
URL: http://svn.apache.org/viewvc?rev=1233049&view=rev
Log:
BIGTOP-356. hbase pacakge should not ship jar files provided by zookeeper and
hadoop
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules?rev=1233049&r1=1233048&r2=1233049&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules
Wed Jan 18 20:33:20 2012
@@ -16,6 +16,7 @@
# limitations under the License.
#
# -*- makefile -*-
+SHELL=/bin/bash
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
@@ -26,7 +27,7 @@ export DH_OPTIONS
hadoop_home=/usr/lib/hadoop
zookeeper_home=/usr/lib/zookeeper
hbase_pkg_name=hbase
-hbase_jar_deps=${hadoop_home}/hadoop-common.jar ${hadoop_home}/hadoop-hdfs.jar
${hadoop_home}/hadoop-mapreduce-client-core.jar ${hadoop_home}/hadoop-auth.jar
${zookeeper_home}/zookeeper.jar
+hbase_jar_deps_hadoop=hadoop-annotations,hadoop-auth,hadoop-common,hadoop-hdfs,hadoop-mapreduce-client-common,hadoop-mapreduce-client-core,hadoop-yarn-api,hadoop-yarn-common
patch: patch-stamp
patch-stamp:
@@ -58,7 +59,8 @@ install: build
cp debian/hbase.nofiles.conf
debian/tmp/etc/security/limits.d/${hbase_pkg_name}.nofiles.conf
# Symlink in the dependency jars from their packages. Both of these
packages
# provide an unversioned symlink foo.jar -> foo-0.1.2.jar.
- ln -f -s ${hbase_jar_deps} debian/tmp/usr/lib/${hbase_pkg_name}/lib/
+ rm -f
debian/tmp/usr/lib/${hbase_pkg_name}/lib/{${hbase_jar_deps_hadoop},zookeeper}*.jar
+ ln -f -s ${hadoop_home}/{${hbase_jar_deps_hadoop}}.jar
${zookeeper_home}/zookeeper.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/
ln -s /var/log/${hbase_pkg_name}
debian/tmp/usr/lib/${hbase_pkg_name}/logs
ln -s /var/run/${hbase_pkg_name}
debian/tmp/usr/lib/${hbase_pkg_name}/pids
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1233049&r1=1233048&r2=1233049&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
Wed Jan 18 20:33:20 2012
@@ -25,7 +25,7 @@
%define hbase_services master regionserver thrift
%define hadoop_home /usr/lib/hadoop
%define zookeeper_home /usr/lib/zookeeper
-%define hbase_jar_deps %{hadoop_home}/hadoop-common.jar
%{hadoop_home}/hadoop-hdfs.jar %{hadoop_home}/hadoop-mapreduce-client-core.jar
%{hadoop_home}/hadoop-auth.jar %{zookeeper_home}/zookeeper.jar
+%define hbase_jar_deps_hadoop
hadoop-annotations,hadoop-auth,hadoop-common,hadoop-hdfs,hadoop-mapreduce-client-common,hadoop-mapreduce-client-core,hadoop-yarn-api,hadoop-yarn-common
%if %{?suse_version:1}0
@@ -246,7 +246,8 @@ done
%__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
# Pull zookeeper and hadoop from their packages
-ln -f -s %{hbase_jar_deps} $RPM_BUILD_ROOT/%{lib_hbase}
+rm -f $RPM_BUILD_ROOT/%{lib_hbase}/{%{hbase_jar_deps_hadoop},zookeeper}*.jar
+ln -f -s %{hadoop_home}/{%{hbase_jar_deps_hadoop}}.jar
%{zookeeper_home}/zookeeper.jar $RPM_BUILD_ROOT/%{lib_hbase}
%pre
getent group hbase 2>/dev/null >/dev/null || /usr/sbin/groupadd -r hbase
