Author: bmahe
Date: Sat Feb 4 01:23:51 2012
New Revision: 1240430
URL: http://svn.apache.org/viewvc?rev=1240430&view=rev
Log:
BIGTOP-384. HBase bundle 2 different versions of hadoop as well as a zookeeper
version
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules?rev=1240430&r1=1240429&r2=1240430&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules Sat Feb 4
01:23:51 2012
@@ -58,6 +58,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.
+ rm -f debian/tmp/usr/lib/hadoop-*
+ rm -f debian/tmp/usr/lib/zookeeper-*
ln -f -s ${hbase_jar_deps} 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/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1240430&r1=1240429&r2=1240430&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Sat
Feb 4 01:23:51 2012
@@ -231,6 +231,8 @@ done
%__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
# Pull zookeeper and hadoop from their packages
+rm -f $RPM_BUILD_ROOT/%{lib_hbase}/hadoop-*
+rm -f $RPM_BUILD_ROOT/%{lib_hbase}/zookeeper-*
ln -f -s %{hbase_jar_deps} $RPM_BUILD_ROOT/%{lib_hbase}
%pre
