Author: rvs
Date: Mon Oct 22 19:37:53 2012
New Revision: 1401043
URL: http://svn.apache.org/viewvc?rev=1401043&view=rev
Log:
BIGTOP-762. Updates for building Flume versions >= 1.2 (Andrew Purtell via rvs)
Removed:
bigtop/trunk/bigtop-packages/src/deb/flume/flume.docs
Modified:
bigtop/trunk/bigtop-packages/src/common/flume/install_flume.sh
bigtop/trunk/bigtop-packages/src/deb/flume/rules
bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
Modified: bigtop/trunk/bigtop-packages/src/common/flume/install_flume.sh
URL:
http://svn.apache.org/viewvc/bigtop/trunk/bigtop-packages/src/common/flume/install_flume.sh?rev=1401043&r1=1401042&r2=1401043&view=diff
==============================================================================
--- bigtop/trunk/bigtop-packages/src/common/flume/install_flume.sh (original)
+++ bigtop/trunk/bigtop-packages/src/common/flume/install_flume.sh Mon Oct 22
19:37:53 2012
@@ -97,7 +97,7 @@ ETC_DIR=${ETC_DIR:-/etc/flume}
install -d -m 0755 ${PREFIX}/${LIB_DIR}
(cd ${PREFIX}/${LIB_DIR} &&
- tar --strip-components=1 -xvzf
${BUILD_DIR}/flume-ng-dist/target/flume-ng-dist-*-dist.tar.gz)
+ tar --strip-components=1 -xvzf
${BUILD_DIR}/flume-ng-dist/target/*flume-*-dist.tar.gz)
# Take out useless things or we've installed elsewhere
for x in flume-ng-* \
@@ -148,6 +148,15 @@ unlink $PREFIX/$LIB_DIR/conf || /bin/tru
ln -s /etc/flume/conf $PREFIX/$LIB_DIR/conf
# Docs
+rm -rf $PREFIX/$LIB_DIR/docs
install -d -m 0755 $PREFIX/${DOC_DIR}
-cp -r CHANGELOG DEVNOTES DISCLAIMER LICENSE NOTICE README RELEASE-NOTES
$PREFIX/${DOC_DIR}
-
+for x in CHANGELOG \
+ DEVNOTES \
+ LICENSE \
+ NOTICE \
+ README \
+ RELEASE-NOTES ; do
+ if [ -x $x ] ; then
+ cp -r $x $PREFIX/${DOC_DIR}
+ fi
+done
Modified: bigtop/trunk/bigtop-packages/src/deb/flume/rules
URL:
http://svn.apache.org/viewvc/bigtop/trunk/bigtop-packages/src/deb/flume/rules?rev=1401043&r1=1401042&r2=1401043&view=diff
==============================================================================
--- bigtop/trunk/bigtop-packages/src/deb/flume/rules (original)
+++ bigtop/trunk/bigtop-packages/src/deb/flume/rules Mon Oct 22 19:37:53 2012
@@ -45,7 +45,6 @@ override_dh_auto_install:
install -d -m 0755 debian/flume-node/etc/default
cp debian/flume-node.default debian/flume-node/etc/default/flume-node
# 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
-
+ # 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
Modified: bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
URL:
http://svn.apache.org/viewvc/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec?rev=1401043&r1=1401042&r2=1401043&view=diff
==============================================================================
--- bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec (original)
+++ bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec Mon Oct 22
19:37:53 2012
@@ -135,7 +135,7 @@ chmod 755 $init_file
%__cp %{SOURCE4} $RPM_BUILD_ROOT/etc/default/%{name}-node
# Get rid of hadoop jar, and instead link to installed hadoop
-rm $RPM_BUILD_ROOT/usr/lib/flume/lib/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
