Author: cdouglas
Date: Fri Jan 16 19:25:46 2009
New Revision: 735220
URL: http://svn.apache.org/viewvc?rev=735220&view=rev
Log:
HADOOP-5030. Build Chukwa RPM to install into configured directory. Contributed
by Eric Yang
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/chukwa/build.xml
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=735220&r1=735219&r2=735220&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri Jan 16 19:25:46 2009
@@ -361,6 +361,9 @@
HADOOP-4843. Collect job history and configuration in Chukwa. (Eric Yang
via cdouglas)
+ HADOOP-5030. Build Chukwa RPM to install into configured directory. (Eric
+ Yang via cdouglas)
+
OPTIMIZATIONS
HADOOP-3293. Fixes FileInputFormat to do provide locations for splits
Modified: hadoop/core/trunk/src/contrib/chukwa/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/build.xml?rev=735220&r1=735219&r2=735220&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/chukwa/build.xml (original)
+++ hadoop/core/trunk/src/contrib/chukwa/build.xml Fri Jan 16 19:25:46 2009
@@ -785,33 +785,33 @@
%setup -q
%build
mkdir -p %{buildroot}%{_prefix}
-if [ -d %{buildroot}%{_prefix}/%{name} ]; then
- rm -rf %{buildroot}%{_prefix}/%{name}
-fi
-mv %{buildroot}/%{name}-%{version} %{buildroot}%{_prefix}/%{name}
+if [ -d %{buildroot}%{_prefix} ]; then
+ rm -rf %{buildroot}%{_prefix}
+fi
+mv %{buildroot}/%{name}-%{version} %{buildroot}%{_prefix}
cd %{buildroot}%{_prefix}
mkdir -p %{buildroot}/etc/init.d
-cat %{name}/tools/init.d/chukwa-data-processors | \
+cat %{buildroot}%{_prefix}/tools/init.d/chukwa-data-processors | \
sed 's:- chukwa -c:- %{uid} -c:' | \
sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:' | \
sed 's:CHUKWA_CONF_DIR=/usr/local/chukwa/conf:CHUKWA_CONF_DIR=%{_conf_dir}:' >
%{buildroot}/etc/init.d/chukwa-data-processors
-cat %{name}/tools/init.d/chukwa-collector | \
+cat %{buildroot}%{_prefix}/tools/init.d/chukwa-collector | \
sed 's:- chukwa -c:- %{uid} -c:' | \
sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:' | \
sed 's:CHUKWA_CONF_DIR=/usr/local/chukwa/conf:CHUKWA_CONF_DIR=%{_conf_dir}:' >
%{buildroot}/etc/init.d/chukwa-collector
-cat %{name}/tools/init.d/chukwa-agent | \
+cat %{buildroot}%{_prefix}/tools/init.d/chukwa-agent | \
sed 's:- chukwa -c:- %{uid} -c:' | \
sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:' | \
sed 's:CHUKWA_CONF_DIR=/usr/local/chukwa/conf:CHUKWA_CONF_DIR=%{_conf_dir}:' >
%{buildroot}/etc/init.d/chukwa-agent
-cat %{name}/tools/init.d/chukwa-system-metrics | \
+cat %{buildroot}%{_prefix}/tools/init.d/chukwa-system-metrics | \
sed 's:- chukwa -c:- %{uid} -c:' | \
sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:' | \
sed 's:CHUKWA_CONF_DIR=/usr/local/chukwa/conf:CHUKWA_CONF_DIR=%{_conf_dir}:' >
%{buildroot}/etc/init.d/chukwa-system-metrics
chmod a+x %{buildroot}/etc/init.d/chukwa-*
-rm -rf %{buildroot}%{_prefix}/%{name}/src
-rm -rf %{buildroot}%{_prefix}/%{name}/build.xml
+rm -rf %{buildroot}%{_prefix}/src
+rm -rf %{buildroot}%{_prefix}/build.xml
%post
-mkdir -p %{_prefix}/%{name}
+mkdir -p %{_prefix}
echo "Congratulation! You have successfully installed Chukwa."
echo ""
echo "To collect Data : /etc/init.d/chukwa-system-metrics start"
@@ -827,7 +827,8 @@
%postun
%files
%defattr(-,%{uid},%{gid})
-%{_prefix}/%{name}/*
+%{_prefix}
+%{_prefix}/*
%defattr(-,root,root)
/etc/init.d/chukwa-data-processors
/etc/init.d/chukwa-collector
