Author: rvs
Date: Fri Mar 2 18:39:11 2012
New Revision: 1296375
URL: http://svn.apache.org/viewvc?rev=1296375&view=rev
Log:
BIGTOP-389. need to start packaging apache commons daemon jsvc
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
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/common/hadoop/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build?rev=1296375&r1=1296374&r2=1296375&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
Fri Mar 2 18:39:11 2012
@@ -35,12 +35,3 @@ mvn site site:stage ${MAVEN_SKIP_TESTS}
# Copy generated docs
mkdir -p build/share/doc/
cp -r target/site/* build/share/doc/
-
-# FIXME: this a workaround for HDFS-2303 (see BIGTOP-349 for details)
-rm -rf commons-daemon-1.0.9-src
-curl --retry 5 -s -L -k
http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.9-src.tar.gz
| tar xzf -
-pushd commons-daemon-1.0.9-src/src/native/unix
- ./configure --prefix=/usr
- make
- cp -f jsvc ../../../../build/libexec/jsvc
-popd
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=1296375&r1=1296374&r2=1296375&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
Fri Mar 2 18:39:11 2012
@@ -48,7 +48,7 @@ Description: A software platform for pro
Package: hadoop-hdfs
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils, hadoop (=
${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils, hadoop (=
${source:Version}), bigtop-jsvc
Description: The Hadoop Distributed File System
Hadoop Distributed File System (HDFS) is the primary storage system used by
Hadoop applications. HDFS creates multiple replicas of data blocks and
distributes
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=1296375&r1=1296374&r2=1296375&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
Fri Mar 2 18:39:11 2012
@@ -74,6 +74,8 @@ install: build
--native-build-string=${native_dir} \
--installed-lib-dir=/usr/lib/hadoop
+ ln -fs /usr/lib/bigtop-utils/jsvc debian/tmp/usr/lib/hadoop/libexec/jsvc
+
# 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=1296375&r1=1296374&r2=1296375&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
Fri Mar 2 18:39:11 2012
@@ -208,7 +208,7 @@ located.
%package hdfs
Summary: The Hadoop Distributed File System
Group: System/Daemons
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}, bigtop-jsvc
%description hdfs
Hadoop Distributed File System (HDFS) is the primary storage system used by
@@ -392,6 +392,9 @@ bash %{SOURCE2} \
--installed-lib-dir=%{lib_hadoop} \
--man-dir=$RPM_BUILD_ROOT%{man_hadoop} \
+# Replace the bundled jsvc with a link to a bigtop-jsvc one
+%__ln -fs /usr/lib/bigtop-utils/jsvc $RPM_BUILD_ROOT/%{lib_hadoop}/libexec/jsvc
+
# Init.d scripts
%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
