incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bm...@apache.org
Subject svn commit: r1307685 - in /incubator/bigtop/branches/hadoop-0.23: ./ bigtop-packages/src/common/flume-ng/ bigtop-packages/src/common/flume/ bigtop-packages/src/deb/flume-ng/ bigtop-packages/src/deb/flume/ bigtop-packages/src/rpm/flume-ng/RPMS/ bigtop-p...
Date Sat, 31 Mar 2012 01:40:04 GMT
Author: bmahe
Date: Sat Mar 31 01:40:02 2012
New Revision: 1307685

URL: http://svn.apache.org/viewvc?rev=1307685&view=rev
Log:
Rename flume-ng => flume

Added:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/do-component-build
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/do-component-build
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/flume-node.init
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/flume-ng-node.init
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/install_flume.sh
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/install_flume-ng.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/changelog
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/changelog
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/compat
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/compat
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/control
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/control
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/copyright
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/copyright
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume-node.postinst
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng-node.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.docs
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.docs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.postinst
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.preinst
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.preinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.prerm
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.prerm
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/rules
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/rules
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/RPMS/.gitignore
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/RPMS/.gitignore
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SPECS/flume.spec
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/SPECS/flume-ng.spec
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SRPMS/.gitignore
      - copied, changed from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/SRPMS/.gitignore
Removed:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/do-component-build
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/flume-ng-node.init
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/install_flume-ng.sh
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/changelog
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/compat
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/control
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/copyright
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng-node.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.docs
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.postinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.preinst
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.prerm
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/rules
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/RPMS/.gitignore
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/SPECS/flume-ng.spec
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/SRPMS/.gitignore
Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop.mk

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/do-component-build
(from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/do-component-build)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/do-component-build?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/do-component-build&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/do-component-build&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/flume-node.init
(from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/flume-ng-node.init)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/flume-node.init?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/flume-node.init&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/flume-ng-node.init&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/flume-ng-node.init
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/flume-node.init
Sat Mar 31 01:40:02 2012
@@ -47,12 +47,12 @@ STATUS_NOT_RUNNING=3
 
 ERROR_PROGRAM_NOT_INSTALLED=5
 
-FLUME_LOG_DIR=/var/log/flume-ng
-FLUME_CONF_DIR=/etc/flume-ng/conf
-FLUME_RUN=/var/run/flume-ng
-FLUME_HOME=/usr/lib/flume-ng
+FLUME_LOG_DIR=/var/log/flume
+FLUME_CONF_DIR=/etc/flume/conf
+FLUME_RUN=/var/run/flume
+FLUME_HOME=/usr/lib/flume
 
-LOCKFILE="/var/lock/subsys/flume-ng-node"
+LOCKFILE="/var/lock/subsys/flume-node"
 desc="Flume NG node daemon"
 
 FLUME_CONF_FILE=${FLUME_CONF_FILE:-${FLUME_CONF_DIR}/flume.conf}
@@ -67,9 +67,9 @@ FLUME_NODE_NAME=${FLUME_NODE_NAME:-$HOST
 
 start() {
   [ -x $exec ] || exit $ERROR_PROGRAM_NOT_INSTALLED
-  log_success_msg "Starting $desc (flume-ng-node): "
+  log_success_msg "Starting $desc (flume-node): "
   export FLUME_PID_FILE
-  /bin/su -s /bin/bash -c "${EXEC_PATH} node --conf $FLUME_CONF_DIR --conf-file $FLUME_CONF_FILE
--name $FLUME_NODE_NAME &>>${FLUME_LOG_DIR}/flume-ng-node.log &" $USER
+  /bin/su -s /bin/bash -c "${EXEC_PATH} node --conf $FLUME_CONF_DIR --conf-file $FLUME_CONF_FILE
--name $FLUME_NODE_NAME &>>${FLUME_LOG_DIR}/flume-node.log &" $USER
   RETVAL=$?
   [ $RETVAL -eq 0 ] && touch $LOCKFILE
   return $RETVAL
@@ -81,7 +81,7 @@ stop() {
     exit $STATUS_NOT_RUNNING
   fi
 
-  log_success_msg "Stopping $desc (flume-ng-node): "
+  log_success_msg "Stopping $desc (flume-node): "
 
   # FLUME-919 will put an end to such extreme violence
   FLUME_PID=`cat $FLUME_PID_FILE`
@@ -129,7 +129,7 @@ checkstatus(){
 }
 
 condrestart(){
-  [ -e /var/lock/subsys/flume-ng-node ] && restart || :
+  [ -e ${LOCKFILE} ] && restart || :
 }
 
 case "$1" in

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/install_flume.sh
(from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/install_flume-ng.sh)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/install_flume.sh?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/install_flume.sh&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/install_flume-ng.sh&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume-ng/install_flume-ng.sh
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/flume/install_flume.sh
Sat Mar 31 01:40:02 2012
@@ -93,10 +93,10 @@ for var in PREFIX BUILD_DIR ; do
 done
 
 MAN_DIR=${MAN_DIR:-/usr/share/man/man1}
-DOC_DIR=${DOC_DIR:-/usr/share/doc/flume-ng}
-FLUME_DIR=${FLUME_DIR:-/usr/lib/flume-ng}
-BIN_DIR=${BIN_DIR:-/usr/lib/flume-ng/bin}
-CONF_DIR=/etc/flume-ng/
+DOC_DIR=${DOC_DIR:-/usr/share/doc/flume}
+FLUME_DIR=${FLUME_DIR:-/usr/lib/flume}
+BIN_DIR=${BIN_DIR:-/usr/lib/flume/bin}
+CONF_DIR=/etc/flume/
 CONF_DIST_DIR=/etc/flume-ng/conf.dist/
 ETC_DIR=${ETC_DIR:-/etc/flume-ng}
 
@@ -128,7 +128,7 @@ if [ -n "\$FLUME_PID_FILE" ]; then
 fi
 
 # See FLUME-920
-exec bash /usr/lib/flume-ng/bin/flume-ng "\$@"
+exec bash /usr/lib/flume/bin/flume-ng "\$@"
 EOF
 chmod 755 $wrapper
 
@@ -138,7 +138,7 @@ install -d -m 0755 $PREFIX/$ETC_DIR/conf
 touch $PREFIX/$ETC_DIR/conf.empty/flume.conf
 
 unlink $PREFIX/$FLUME_DIR/conf || /bin/true
-ln -s /etc/flume-ng/conf $PREFIX/$FLUME_DIR/conf
+ln -s /etc/flume/conf $PREFIX/$FLUME_DIR/conf
 
 # Docs
 install -d -m 0755 $PREFIX/${DOC_DIR}

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/changelog (from
r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/changelog)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/changelog?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/changelog&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/changelog&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/compat (from r1307684,
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/compat)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/compat?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/compat&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/compat&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/control (from
r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/control)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/control?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/control&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/control&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/control (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/control Sat Mar 31
01:40:02 2012
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-Source: flume-ng
+Source: flume
 Section: misc
 Priority: extra
 Maintainer: Bigtop <bigtop-dev@incubator.apache.org>
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 6), ant, an
 Standards-Version: 3.8.0
 Homepage: http://incubator.apache.org/projects/flume.html
 
-Package: flume-ng
+Package: flume
 Architecture: all
 Depends: adduser, hadoop-hdfs, bigtop-utils
 Description: reliable, scalable, and manageable distributed data collection application
@@ -34,9 +34,9 @@ Description: reliable, scalable, and man
  managed and allows for intelligent dynamic management.  It uses a simple
  extensible data model that allows for online analytic applications.
 
-Package: flume-ng-node
+Package: flume-node
 Architecture: all
-Depends: flume-ng (= ${source:Version})
+Depends: flume (= ${source:Version})
 Description: core element of Flume's data path that collects and delivers data
  The Flume node daemon is a core element of flume's data path and is
  responsible for generating, processing, and delivering data.

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/copyright (from
r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/copyright)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/copyright?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/copyright&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/copyright&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume-node.postinst
(from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng-node.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume-node.postinst?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume-node.postinst&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng-node.postinst&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.docs (from
r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.docs)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.docs?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.docs&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.docs&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.postinst
(from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.postinst?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.postinst&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.postinst&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.postinst
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.postinst Sat
Mar 31 01:40:02 2012
@@ -22,7 +22,7 @@ set -e
 case "$1" in
     configure)
         # Install config alternatives
-        update-alternatives  --install /etc/flume-ng/conf flume-ng-conf /etc/flume-ng/conf.empty
30
+        update-alternatives  --install /etc/flume/conf flume-conf /etc/flume/conf.empty 30
 
     ;;
 

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.preinst
(from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.preinst?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.preinst&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.preinst&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.prerm (from
r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.prerm)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.prerm?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.prerm&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.prerm&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/flume-ng.prerm
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/flume.prerm Sat Mar
31 01:40:02 2012
@@ -35,7 +35,7 @@ set -e
 
 case "$1" in
     remove|upgrade|deconfigure)
-      update-alternatives --remove flume-ng-conf /etc/flume-ng/conf.empty || :
+      update-alternatives --remove flume-conf /etc/flume/conf.empty || :
     ;;
 
     failed-upgrade)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/rules (from r1307684,
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/rules)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/rules?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/rules&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/rules&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume-ng/rules (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/flume/rules Sat Mar 31 01:40:02
2012
@@ -34,7 +34,7 @@ clean:	
 	dh_testroot
 	rm -f *-stamp
 	dh_clean
-	rm -Rf debian/tmp debian/flume-ng
+	rm -Rf debian/tmp debian/flume
 	find debian -name .\*swp -exec rm -f {} \;
 
 build-indep: build-indep-stamp
@@ -53,13 +53,13 @@ install: install-indep
 install-indep:
 	dh_testdir
 	dh_testroot
-	sh -x debian/install_flume-ng.sh \
+	sh -x debian/install_flume.sh \
 	  --build-dir=${PWD} \
-	  --prefix=debian/flume-ng
+	  --prefix=debian/flume
 	# Remove hadoop dependency and instead symlink in the hadoop jar
-	rm debian/flume-ng/usr/lib/flume-ng/lib/hadoop-*
-	ln -s /usr/lib/hadoop/hadoop-common.jar debian/flume-ng/usr/lib/flume-ng/lib/hadoop-common.jar
-	ln -s /usr/lib/hadoop/hadoop-auth.jar debian/flume-ng/usr/lib/flume-ng/lib/hadoop-auth.jar
+	rm debian/flume/usr/lib/flume/lib/hadoop-*
+	ln -s /usr/lib/hadoop/hadoop-common.jar debian/flume/usr/lib/flume/lib/hadoop-common.jar
+	ln -s /usr/lib/hadoop/hadoop-auth.jar debian/flume/usr/lib/flume/lib/hadoop-auth.jar
 	dh_install -i
 
 binary-common:	

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/RPMS/.gitignore
(from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/RPMS/.gitignore)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/RPMS/.gitignore?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/RPMS/.gitignore&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/RPMS/.gitignore&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
    (empty)

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SPECS/flume.spec
(from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/SPECS/flume-ng.spec)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SPECS/flume.spec?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SPECS/flume.spec&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/SPECS/flume-ng.spec&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/SPECS/flume-ng.spec
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SPECS/flume.spec Sat
Mar 31 01:40:02 2012
@@ -12,11 +12,11 @@
 # 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.
-%define etc_flume /etc/flume-ng/conf
+%define etc_flume /etc/flume/conf
 %define bin_flume %{_bindir}
 %define man_flume %{_mandir}
-%define lib_flume /usr/lib/flume-ng
-%define log_flume /var/log/flume-ng
+%define lib_flume /usr/lib/flume
+%define log_flume /var/log/flume
 
 %if  %{?suse_version:1}0
 
@@ -35,13 +35,13 @@
     /usr/lib/rpm/brp-compress ; \
     %{nil}
 
-%define doc_flume %{_docdir}/flume-ng
+%define doc_flume %{_docdir}/flume
 %define alternatives_cmd update-alternatives
 %global initd_dir %{_sysconfdir}/rc.d
 
 %else
 
-%define doc_flume %{_docdir}/flume-ng-%{flume_ng_version}
+%define doc_flume %{_docdir}/flume-%{flume_version}
 %define alternatives_cmd alternatives
 %global initd_dir %{_sysconfdir}/rc.d/init.d
 
@@ -49,16 +49,16 @@
 
 
 
-Name: flume-ng
-Version: %{flume_ng_version}
-Release: %{flume_ng_release}
+Name: flume
+Version: %{flume_version}
+Release: %{flume_release}
 Summary:  Flume is a reliable, scalable, and manageable distributed log collection application
for collecting data such as logs and delivering it to data stores such as Hadoop's HDFS.
 URL: http://incubator.apache.org/projects/flume.html
 Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 BuildArch: noarch
 License: APL2
-Source0: %{name}-%{flume_ng_base_version}.tar.gz
+Source0: %{name}-%{flume_base_version}.tar.gz
 Source1: do-component-build
 Source2: install_%{name}.sh
 Source3: %{name}-node.init
@@ -105,7 +105,7 @@ Requires: redhat-lsb
 Flume is a reliable, scalable, and manageable distributed data collection application for
collecting data such as logs and delivering it to data stores such as Hadoop's HDFS.  It can
efficiently collect, aggregate, and move large amounts of log data.  It has a simple, but
flexible, architecture based on streaming data flows.  It is robust and fault tolerant with
tunable reliability mechanisms and many failover and recovery mechanisms.  The system is centrally
managed and allows for intelligent dynamic management. It uses a simple extensible data model
that allows for online analytic applications.
 
 %prep
-%setup -n flume-%{flume_ng_base_version}
+%setup -n flume-%{flume_base_version}
 
 %build
 env FLUME_VERSION=%{version} sh %{SOURCE1}
@@ -128,15 +128,15 @@ chmod 755 $init_file
 %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
 
 # Get rid of hadoop jar, and instead link to installed hadoop
-rm $RPM_BUILD_ROOT/usr/lib/flume-ng/lib/hadoop-*
-ln -s /usr/lib/hadoop/hadoop-common.jar $RPM_BUILD_ROOT/usr/lib/flume-ng/lib/hadoop-common.jar
-ln -s /usr/lib/hadoop/hadoop-auth.jar $RPM_BUILD_ROOT/usr/lib/flume-ng/lib/hadoop-auth.jar
+rm $RPM_BUILD_ROOT/usr/lib/flume/lib/hadoop-*
+ln -s /usr/lib/hadoop/hadoop-common.jar $RPM_BUILD_ROOT/usr/lib/flume/lib/hadoop-common.jar
+ln -s /usr/lib/hadoop/hadoop-auth.jar $RPM_BUILD_ROOT/usr/lib/flume/lib/hadoop-auth.jar
 
 %pre
 getent group flume >/dev/null || groupadd -r flume
-getent passwd flume >/dev/null || useradd -c "Flume" -s /sbin/nologin -g flume -r -d /var/run/flume-ng
flume 2> /dev/null || :
-%__install -d -o flume -g flume -m 0755 /var/run/flume-ng
-%__install -d -o flume -g flume -m 0755 /var/log/flume-ng
+getent passwd flume >/dev/null || useradd -c "Flume" -s /sbin/nologin -g flume -r -d /var/run/flume
flume 2> /dev/null || :
+%__install -d -o flume -g flume -m 0755 /var/run/flume
+%__install -d -o flume -g flume -m 0755 /var/log/flume
 
 # Manage configuration symlink
 %post

Copied: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SRPMS/.gitignore
(from r1307684, incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/SRPMS/.gitignore)
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SRPMS/.gitignore?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume/SRPMS/.gitignore&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/flume-ng/SRPMS/.gitignore&r1=1307684&r2=1307685&rev=1307685&view=diff
==============================================================================
    (empty)

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop.mk?rev=1307685&r1=1307684&r2=1307685&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop.mk Sat Mar 31 01:40:02 2012
@@ -125,16 +125,16 @@ MAHOUT_SITE=$(APACHE_MIRROR)/mahout/$(MA
 $(eval $(call PACKAGE,mahout,MAHOUT))
 
 # Flume NG
-FLUME_NG_NAME=flume-ng
-FLUME_NG_RELNOTES_NAME=Flume NG
-FLUME_NG_PKG_NAME=flume-ng
-FLUME_NG_BASE_VERSION=1.0.0-incubating
-FLUME_NG_PKG_VERSION=1.0.0
-FLUME_NG_RELEASE_VERSION=1
-FLUME_NG_TARBALL_DST=$(FLUME_NG_NAME)-$(FLUME_NG_BASE_VERSION).tar.gz
-FLUME_NG_TARBALL_SRC=flume-$(FLUME_NG_BASE_VERSION).tar.gz
-FLUME_NG_SITE=$(APACHE_MIRROR)/incubator/flume/flume-$(FLUME_NG_BASE_VERSION)/
-$(eval $(call PACKAGE,flume-ng,FLUME_NG))
+FLUME_NAME=flume
+FLUME_RELNOTES_NAME=Flume NG
+FLUME_PKG_NAME=flume
+FLUME_BASE_VERSION=1.0.0-incubating
+FLUME_PKG_VERSION=1.0.0
+FLUME_RELEASE_VERSION=1
+FLUME_TARBALL_DST=$(FLUME_NAME)-ng-$(FLUME_BASE_VERSION).tar.gz
+FLUME_TARBALL_SRC=flume-ng-$(FLUME_BASE_VERSION).tar.gz
+FLUME_SITE=$(APACHE_MIRROR)/incubator/flume/flume-$(FLUME_BASE_VERSION)/
+$(eval $(call PACKAGE,flume,FLUME))
 
 # Bigtop-utils
 BIGTOP_UTILS_NAME=bigtop-utils



Mime
View raw message