You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by bm...@apache.org on 2015/02/26 09:09:41 UTC
bigtop git commit: BIGTOP-1649: Upgrade Apache Flume to 1.5.2
Repository: bigtop
Updated Branches:
refs/heads/master 6c4319578 -> 79a753434
BIGTOP-1649: Upgrade Apache Flume to 1.5.2
Signed-off-by: Bruno Mahé <bm...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/79a75343
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/79a75343
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/79a75343
Branch: refs/heads/master
Commit: 79a7534346e6a984ba48fa096f728a98dfc87731
Parents: 6c43195
Author: Youngwoo Kim <wa...@gmail.com>
Authored: Mon Feb 16 15:16:22 2015 +0900
Committer: Bruno Mahé <bm...@apache.org>
Committed: Wed Feb 25 23:28:18 2015 -0800
----------------------------------------------------------------------
bigtop-packages/src/common/flume/install_flume.sh | 7 +++++++
bigtop-packages/src/deb/flume/control | 2 +-
bigtop-packages/src/deb/flume/rules | 5 +----
bigtop-packages/src/rpm/flume/SPECS/flume.spec | 7 +------
bigtop.mk | 4 ++--
5 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/79a75343/bigtop-packages/src/common/flume/install_flume.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/flume/install_flume.sh b/bigtop-packages/src/common/flume/install_flume.sh
index b9b689c..65eeabd 100755
--- a/bigtop-packages/src/common/flume/install_flume.sh
+++ b/bigtop-packages/src/common/flume/install_flume.sh
@@ -141,6 +141,13 @@ install -d -m 0755 $PREFIX/$ETC_DIR/conf.empty
sed -i -e "s|flume\.log\.dir=.*|flume.log.dir=/var/log/flume|" $PREFIX/$ETC_DIR/conf.empty/log4j.properties
touch $PREFIX/$ETC_DIR/conf.empty/flume.conf
+(cd $PREFIX/$ETC_DIR/conf.empty/; cp flume-env.sh.template flume-env.sh)
+cat >> $PREFIX/$ETC_DIR/conf.empty/flume-env.sh <<EOF
+
+HADOOP_HOME=\${HADOOP_HOME:-/usr/lib/hadoop}
+
+EOF
+
unlink $PREFIX/$LIB_DIR/conf || /bin/true
ln -s /etc/flume/conf $PREFIX/$LIB_DIR/conf
http://git-wip-us.apache.org/repos/asf/bigtop/blob/79a75343/bigtop-packages/src/deb/flume/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/flume/control b/bigtop-packages/src/deb/flume/control
index 81689b9..1f481f8 100644
--- a/bigtop-packages/src/deb/flume/control
+++ b/bigtop-packages/src/deb/flume/control
@@ -23,7 +23,7 @@ Homepage: http://incubator.apache.org/projects/flume.html
Package: flume
Architecture: all
-Depends: adduser, hadoop-hdfs, bigtop-utils (>= 0.7)
+Depends: adduser, hadoop, hadoop-hdfs, bigtop-utils (>= 0.7)
Description: 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.
Flume is a reliable, scalable, and manageable distributed data
collection application for collecting data such as logs and delivering it
http://git-wip-us.apache.org/repos/asf/bigtop/blob/79a75343/bigtop-packages/src/deb/flume/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/flume/rules b/bigtop-packages/src/deb/flume/rules
index 026d0f0..394c8f5 100755
--- a/bigtop-packages/src/deb/flume/rules
+++ b/bigtop-packages/src/deb/flume/rules
@@ -44,7 +44,4 @@ override_dh_auto_install:
--prefix=debian/flume
install -d -m 0755 debian/flume-agent/etc/default
cp debian/flume-agent.default debian/flume-agent/etc/default/flume-agent
- # Remove hadoop dependency and instead symlink in the hadoop 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
+
http://git-wip-us.apache.org/repos/asf/bigtop/blob/79a75343/bigtop-packages/src/rpm/flume/SPECS/flume.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/flume/SPECS/flume.spec b/bigtop-packages/src/rpm/flume/SPECS/flume.spec
index a76132d..520a2f2 100644
--- a/bigtop-packages/src/rpm/flume/SPECS/flume.spec
+++ b/bigtop-packages/src/rpm/flume/SPECS/flume.spec
@@ -69,7 +69,7 @@ Source3: %{name}-agent.init
Source4: flume-agent.default
Requires: /usr/sbin/useradd
Requires: coreutils
-Requires: hadoop-hdfs
+Requires: hadoop, hadoop-hdfs
Requires: bigtop-utils >= 0.7
%if 0%{?mgaversion}
@@ -137,11 +137,6 @@ chmod 755 $init_file
%__install -d -m 0755 $RPM_BUILD_ROOT/etc/default
%__cp %{SOURCE4} $RPM_BUILD_ROOT/etc/default/%{name}-agent
-# Get rid of hadoop jar, and instead link to installed hadoop
-rm $RPM_BUILD_ROOT/usr/lib/flume/lib/hadoop-* || true
-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 %{vlb_flume} flume 2> /dev/null || :
http://git-wip-us.apache.org/repos/asf/bigtop/blob/79a75343/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 8cb758b..5789e4c 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -163,8 +163,8 @@ $(eval $(call PACKAGE,mahout,MAHOUT))
FLUME_NAME=flume
FLUME_RELNOTES_NAME=Flume
FLUME_PKG_NAME=flume
-FLUME_BASE_VERSION=1.5.0.1
-FLUME_PKG_VERSION=1.5.0.1
+FLUME_BASE_VERSION=1.5.2
+FLUME_PKG_VERSION=1.5.2
FLUME_RELEASE_VERSION=1
FLUME_TARBALL_DST=apache-$(FLUME_NAME)-$(FLUME_BASE_VERSION)-src.tar.gz
FLUME_TARBALL_SRC=$(FLUME_TARBALL_DST)