hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdoug...@apache.org
Subject svn commit: r727225 - in /hadoop/core/branches/branch-0.20: ./ src/contrib/chukwa/ src/contrib/chukwa/tools/init.d/
Date Wed, 17 Dec 2008 00:01:25 GMT
Author: cdouglas
Date: Tue Dec 16 16:01:25 2008
New Revision: 727225

URL: http://svn.apache.org/viewvc?rev=727225&view=rev
Log:
HADOOP-4791. Fix rpm build process for Chukwa. Contributed by Eric Yang

Added:
    hadoop/core/branches/branch-0.20/src/contrib/chukwa/default.properties
Modified:
    hadoop/core/branches/branch-0.20/CHANGES.txt
    hadoop/core/branches/branch-0.20/src/contrib/chukwa/build.xml
    hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-agent
    hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-collector
    hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-data-processors
    hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-system-metrics

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=727225&r1=727224&r2=727225&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Tue Dec 16 16:01:25 2008
@@ -445,6 +445,8 @@
     Object.equals rather than depend on contentEquals api. (omalley via 
     acmurthy)
 
+    HADOOP-4791. Fix rpm build process for Chukwa. (Eric Yang via cdouglas)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/core/branches/branch-0.20/src/contrib/chukwa/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/chukwa/build.xml?rev=727225&r1=727224&r2=727225&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/chukwa/build.xml (original)
+++ hadoop/core/branches/branch-0.20/src/contrib/chukwa/build.xml Tue Dec 16 16:01:25 2008
@@ -22,13 +22,14 @@
 
 	<property name="name" value="chukwa"/>
         <property name="chukwaVersion" value="0.1.1"/>
-	<property name="rpm.prefix" value="/usr/local"/>
-	<property name="hadoop.conf" value="/usr/local/hadoop/conf"/>
 	<property name="final.name" value="${name}-${chukwaVersion}"/>
 
         <import file="../build-contrib.xml" optional="true"/>
         <available file="../build-contrib.xml" property="present"/>
 
+        <property file="build.properties"/>
+        <property file="default.properties"/>
+
         <condition property="standaloneMode">
                 <and><not><available file="../build-contrib.xml" property="present"/></not></and>
         </condition>
@@ -749,7 +750,6 @@
 
 %define _topdir         ${build.dir}
 %define _prefix         ${rpm.prefix}
-%define _conf           ${hadoop.conf}
 %define name            chukwa
 %define summary         Distributed Computing Monitoring Framework.
 %define version         ${chukwaVersion}
@@ -787,10 +787,10 @@
 mv %{buildroot}/%{name}-%{version} %{buildroot}%{_prefix}/%{name}
 cd %{buildroot}%{_prefix}
 mkdir -p %{buildroot}/etc/init.d
-cp %{name}/tools/init.d/chukwa-data-processors %{buildroot}/etc/init.d
-cp %{name}/tools/init.d/chukwa-collector %{buildroot}/etc/init.d
-cp %{name}/tools/init.d/chukwa-agent %{buildroot}/etc/init.d
-cp %{name}/tools/init.d/chukwa-system-metrics %{buildroot}/etc/init.d
+cat %{name}/tools/init.d/chukwa-data-processors | sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:'
> %{buildroot}/etc/init.d
+cat %{name}/tools/init.d/chukwa-collector | sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:'
> %{buildroot}/etc/init.d
+cat %{name}/tools/init.d/chukwa-agent | sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:'
> %{buildroot}/etc/init.d
+cat %{name}/tools/init.d/chukwa-system-metrics | sed 's:CHUKWA_HOME=/usr/local:CHUKWA_HOME=%{_prefix}:'
> %{buildroot}/etc/init.d
 chmod a+x %{buildroot}/etc/init.d/chukwa-*
 rm -rf %{buildroot}%{_prefix}/%{name}/src
 rm -rf %{buildroot}%{_prefix}/%{name}/build.xml

Added: hadoop/core/branches/branch-0.20/src/contrib/chukwa/default.properties
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/chukwa/default.properties?rev=727225&view=auto
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/chukwa/default.properties (added)
+++ hadoop/core/branches/branch-0.20/src/contrib/chukwa/default.properties Tue Dec 16 16:01:25
2008
@@ -0,0 +1,15 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+rpm.prefix=/usr/local

Modified: hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-agent
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-agent?rev=727225&r1=727224&r2=727225&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-agent (original)
+++ hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-agent Tue Dec
16 16:01:25 2008
@@ -30,11 +30,7 @@
 prog=chukwa-agent
 
 config () {
-        if [ -f /grid/0/chukwa/bin/chukwa-daemon.sh ]; then
-                CHUKWA_HOME=/grid/0/chukwa
-        else
-                CHUKWA_HOME=/usr/local/chukwa
-        fi
+        CHUKWA_HOME=/usr/local/chukwa
 }
 
 start () {

Modified: hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-collector
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-collector?rev=727225&r1=727224&r2=727225&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-collector (original)
+++ hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-collector Tue
Dec 16 16:01:25 2008
@@ -30,11 +30,7 @@
 prog=chukwa-collector
 
 config () {
-        if [ -f /grid/0/chukwa/bin/chukwa-daemon.sh ]; then
-                CHUKWA_HOME=/grid/0/chukwa
-        else
-                CHUKWA_HOME=/usr/local/chukwa
-        fi
+        CHUKWA_HOME=/usr/local/chukwa
 }
 
 start () {

Modified: hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-data-processors
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-data-processors?rev=727225&r1=727224&r2=727225&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-data-processors
(original)
+++ hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-data-processors
Tue Dec 16 16:01:25 2008
@@ -28,11 +28,7 @@
 prog=chukwa-data-processors
 
 config () {
-        if [ -f /grid/0/chukwa/bin/chukwa-daemon.sh ]; then
-                CHUKWA_HOME=/grid/0/chukwa
-        else
-                CHUKWA_HOME=/usr/local/chukwa
-        fi
+        CHUKWA_HOME=/usr/local/chukwa
 }
 
 start () {

Modified: hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-system-metrics
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-system-metrics?rev=727225&r1=727224&r2=727225&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-system-metrics
(original)
+++ hadoop/core/branches/branch-0.20/src/contrib/chukwa/tools/init.d/chukwa-system-metrics
Tue Dec 16 16:01:25 2008
@@ -30,11 +30,7 @@
 prog=chukwa-system-metrics
 
 config () {
-        if [ -f /grid/0/chukwa/bin/chukwa-daemon.sh ]; then
-                CHUKWA_HOME=/grid/0/chukwa
-        else
-                CHUKWA_HOME=/usr/local/chukwa
-        fi
+        CHUKWA_HOME=/usr/local/chukwa
 }
 
 start () {



Mime
View raw message