Author: rvs
Date: Tue Mar 20 17:57:56 2012
New Revision: 1303051
URL: http://svn.apache.org/viewvc?rev=1303051&view=rev
Log:
BIGTOP-462. JSVC_HOME location can be both /usr/lib/bigtop-utils and
/usr/libexec/bigtop-utils
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
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/hadoop.default
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default?rev=1303051&r1=1303050&r2=1303051&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
Tue Mar 20 17:57:56 2012
@@ -23,4 +23,3 @@ export HADOOP_COMMON_HOME=/usr/lib/hadoo
export HADOOP_HDFS_HOME=/usr/lib/hadoop-hdfs
export HADOOP_MAPRED_HOME=/usr/lib/hadoop-mapreduce
export YARN_HOME=/usr/lib/hadoop-yarn
-export JSVC_HOME=/usr/lib/bigtop-jsvc
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=1303051&r1=1303050&r2=1303051&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
Tue Mar 20 17:57:56 2012
@@ -94,6 +94,8 @@ $(hadoop_svcs): debian/init.d.tmpl
install-indep: $(hadoop_svcs)
mkdir -p debian/tmp/etc/default
cp debian/hadoop.default debian/tmp/etc/default/hadoop
+ # FIXME: BIGTOP-463
+ echo 'export JSVC_HOME=/usr/lib/bigtop-utils' >>
debian/tmp/etc/default/hadoop
dh_install --sourcedir=debian/tmp -i
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=1303051&r1=1303050&r2=1303051&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
Tue Mar 20 17:57:56 2012
@@ -418,6 +418,8 @@ bash %{SOURCE2} \
# Install top level /etc/default files
%__install -d -m 0755 $RPM_BUILD_ROOT/etc/default
%__cp $RPM_SOURCE_DIR/hadoop.default $RPM_BUILD_ROOT/etc/default/hadoop
+# FIXME: BIGTOP-463
+echo 'export JSVC_HOME=%{libexecdir}/bigtop-utils' >>
$RPM_BUILD_ROOT/etc/default/hadoop
%__cp $RPM_SOURCE_DIR/%{name}-fuse.default
$RPM_BUILD_ROOT/etc/default/%{name}-fuse
# Generate the init.d scripts
