You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/06/22 07:00:10 UTC
[2/2] git commit: BIGTOP-1004. Hadoop packages do not include version
independent symlinks (Andrew Purtell via rvs)
BIGTOP-1004. Hadoop packages do not include version independent symlinks (Andrew Purtell via rvs)
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/95abc29d
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/95abc29d
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/95abc29d
Branch: refs/heads/master
Commit: 95abc29d5e7113712c498e7761d54458fd58f9fe
Parents: 80e3710
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Fri Jun 21 18:28:56 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Fri Jun 21 18:29:04 2013 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/hadoop/install_hadoop.sh | 2 --
bigtop-packages/src/deb/hadoop/rules | 1 +
bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/95abc29d/bigtop-packages/src/common/hadoop/install_hadoop.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/install_hadoop.sh b/bigtop-packages/src/common/hadoop/install_hadoop.sh
index 5e66c2b..ed9cb5c 100755
--- a/bigtop-packages/src/common/hadoop/install_hadoop.sh
+++ b/bigtop-packages/src/common/hadoop/install_hadoop.sh
@@ -158,8 +158,6 @@ BASH_COMPLETION_DIR=${BASH_COMPLETION_DIR:-$PREFIX/etc/bash_completion.d}
INSTALLED_HADOOP_DIR=${INSTALLED_HADOOP_DIR:-/usr/lib/hadoop}
HADOOP_NATIVE_LIB_DIR=${HADOOP_DIR}/lib/native
-HADOOP_VERSION=0.23.1
-
##Needed for some distros to find ldconfig
export PATH="/sbin/:$PATH"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/95abc29d/bigtop-packages/src/deb/hadoop/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hadoop/rules b/bigtop-packages/src/deb/hadoop/rules
index 80d870e..8c2512c 100755
--- a/bigtop-packages/src/deb/hadoop/rules
+++ b/bigtop-packages/src/deb/hadoop/rules
@@ -52,6 +52,7 @@ $(hadoop_svcs): debian/init.d.tmpl
sed -i -e "s|@HADOOP_DAEMON@|$@|" debian/hadoop-$@.postinst
override_dh_auto_install:
+ env HADOOP_VERSION=${hadoop_version} \
bash debian/install_hadoop.sh \
--prefix=debian/tmp/ \
--distro-dir=debian \
http://git-wip-us.apache.org/repos/asf/bigtop/blob/95abc29d/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
index 2b87fe8..acfc2fa 100644
--- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
+++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
@@ -455,7 +455,7 @@ env HADOOP_VERSION=%{hadoop_base_version} HADOOP_ARCH=%{hadoop_arch} bash %{SOUR
%__install -d -m 0755 $RPM_BUILD_ROOT/%{lib_hadoop}
-bash %{SOURCE2} \
+env HADOOP_VERSION=%{hadoop_base_version} bash %{SOURCE2} \
--distro-dir=$RPM_SOURCE_DIR \
--build-dir=$PWD/build \
--httpfs-dir=$RPM_BUILD_ROOT%{lib_httpfs} \