Author: rvs
Date: Wed Mar 14 21:47:17 2012
New Revision: 1300741
URL: http://svn.apache.org/viewvc?rev=1300741&view=rev
Log:
BIGTOP-453. hadoop needs to depend on Zookeeper
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control?rev=1300741&r1=1300740&r2=1300741&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
Wed Mar 14 21:47:17 2012
@@ -24,7 +24,7 @@ Homepage: http://hadoop.apache.org/core/
Package: hadoop
Provides: hadoop
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils, zookeeper
(>= 3.4.0)
Description: A software platform for processing vast amounts of data
Hadoop is a software platform that lets one easily write and
run applications that process vast amounts of data.
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules?rev=1300741&r1=1300740&r2=1300741&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
Wed Mar 14 21:47:17 2012
@@ -73,6 +73,9 @@ install: build
--native-build-string=${native_dir} \
--installed-lib-dir=/usr/lib/hadoop
+ # Forcing Zookeeper dependency to be on the packaged jar
+ ln -sf /usr/lib/zookeeper/zookeeper.jar
debian/tmp/usr/lib/hadoop/lib/zookeeper*.jar
+
# Run dh_lintian if we've got it - this doesn't exist on debhelper 6 (eg
Ubuntu Hardy)
(dh_lintian) || /bin/true
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1300741&r1=1300740&r2=1300741&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Wed Mar 14 21:47:17 2012
@@ -162,7 +162,7 @@ Source21: yarn.default
Source22: hadoop-layout.sh
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
-Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig,
/sbin/service, bigtop-utils
+Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig,
/sbin/service, bigtop-utils, zookeeper >= 3.4.0
# Sadly, Sun/Oracle JDK in RPM form doesn't provide libjvm.so, which means we
have
# to set AutoReq to no in order to minimize confusion. Not ideal, but seems to
work.
# I wish there was a way to disable just one auto dependency (libjvm.so)
@@ -397,6 +397,9 @@ bash %{SOURCE2} \
--installed-lib-dir=%{lib_hadoop} \
--man-dir=$RPM_BUILD_ROOT%{man_hadoop} \
+# Forcing Zookeeper dependency to be on the packaged jar
+%__ln_s -f /usr/lib/zookeeper/zookeeper.jar %{lib_hadoop}/lib/zookeeper*.jar
+
# Init.d scripts
%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
