BIGTOP-762. Updates for building Flume versions >= 1.2 (Andrew Purtell via rvs)
git-svn-id: https://svn.apache.org/repos/asf/bigtop/trunk@1401043 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/071455da Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/071455da Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/071455da Branch: refs/heads/master Commit: 071455da4879bab4906bc74660827bafb2471af5 Parents: 180d2ed Author: rvs <rvs@13f79535-47bb-0310-9956-ffa450edef68> Authored: Mon Oct 22 19:37:53 2012 +0000 Committer: Roman Shaposhnik <[email protected]> Committed: Fri Nov 2 08:39:24 2012 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/flume/install_flume.sh | 15 ++++++++++++--- bigtop-packages/src/deb/flume/flume.docs | 7 ------- bigtop-packages/src/deb/flume/rules | 7 +++---- bigtop-packages/src/rpm/flume/SPECS/flume.spec | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/071455da/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 23ea9cf..8cbfab7 100755 --- a/bigtop-packages/src/common/flume/install_flume.sh +++ b/bigtop-packages/src/common/flume/install_flume.sh @@ -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/true 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 http://git-wip-us.apache.org/repos/asf/bigtop/blob/071455da/bigtop-packages/src/deb/flume/flume.docs ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/flume/flume.docs b/bigtop-packages/src/deb/flume/flume.docs deleted file mode 100644 index 7f84579..0000000 --- a/bigtop-packages/src/deb/flume/flume.docs +++ /dev/null @@ -1,7 +0,0 @@ -CHANGELOG -DEVNOTES -DISCLAIMER -LICENSE -NOTICE -README -RELEASE-NOTES http://git-wip-us.apache.org/repos/asf/bigtop/blob/071455da/bigtop-packages/src/deb/flume/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/flume/rules b/bigtop-packages/src/deb/flume/rules index 43119be..afe68b0 100755 --- a/bigtop-packages/src/deb/flume/rules +++ b/bigtop-packages/src/deb/flume/rules @@ -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 http://git-wip-us.apache.org/repos/asf/bigtop/blob/071455da/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 cbf966f..d81dc54 100644 --- a/bigtop-packages/src/rpm/flume/SPECS/flume.spec +++ b/bigtop-packages/src/rpm/flume/SPECS/flume.spec @@ -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
