You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2015/02/10 22:56:24 UTC
[2/3] bigtop git commit: BIGTOP-1659. gridgain-hadoop packages need
to provide unversioned softlinks for accelerator jar files
BIGTOP-1659. gridgain-hadoop packages need to provide unversioned softlinks for accelerator jar files
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/098f67f5
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/098f67f5
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/098f67f5
Branch: refs/heads/master
Commit: 098f67f5ad07377ac44b92ac3fed270b6239cb5a
Parents: 258c97c
Author: Konstantin Boudnik <co...@apache.org>
Authored: Mon Feb 9 21:32:53 2015 -0800
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Tue Feb 10 13:56:05 2015 -0800
----------------------------------------------------------------------
.../src/common/gridgain-hadoop/install_gridgain.sh | 10 ++++++++++
bigtop-packages/src/deb/gridgain-hadoop/rules | 1 +
.../src/rpm/gridgain-hadoop/SPECS/gridgain-hadoop.spec | 4 ++--
3 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/098f67f5/bigtop-packages/src/common/gridgain-hadoop/install_gridgain.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/gridgain-hadoop/install_gridgain.sh b/bigtop-packages/src/common/gridgain-hadoop/install_gridgain.sh
index 213f227..18b7fc1 100644
--- a/bigtop-packages/src/common/gridgain-hadoop/install_gridgain.sh
+++ b/bigtop-packages/src/common/gridgain-hadoop/install_gridgain.sh
@@ -122,6 +122,16 @@ cp -a $UNZIP_DIR/config/* $PREFIX/$CONF_DIR
cp -ra $UNZIP_DIR/bin/* $PREFIX/$BIN_DIR
ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/config
+# Create unversion softlinks to the main libraries
+for dir in $PREFIX/$LIB_DIR/libs $PREFIX/$LIB_DIR/libs/gridgain-hadoop ; do
+ (cd $dir &&
+ for j in gridgain-*.jar; do
+ if [[ $j =~ gridgain-(.*)-${GRIDGAIN_HADOOP_VERSION}.jar ]]; then
+ name=${BASH_REMATCH[1]}
+ ln -s $j gridgain-$name.jar
+ fi
+ done)
+done
wrapper=$PREFIX/usr/bin/gridgain-hadoop
mkdir -p `dirname $wrapper`
http://git-wip-us.apache.org/repos/asf/bigtop/blob/098f67f5/bigtop-packages/src/deb/gridgain-hadoop/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/gridgain-hadoop/rules b/bigtop-packages/src/deb/gridgain-hadoop/rules
index 979c5d7..0d1f52e 100644
--- a/bigtop-packages/src/deb/gridgain-hadoop/rules
+++ b/bigtop-packages/src/deb/gridgain-hadoop/rules
@@ -35,6 +35,7 @@ override_dh_auto_build:
override_dh_auto_install:
cp debian/gridgain-hadoop.default debian/${gridgain-hadoop_pkg_name}/etc/default/${gridgain-hadoop_pkg_name}
+ env HADOOP_VERSION=${GRIDGAIN_HADOOP_BASE_VERSION} \
bash -x debian/install_gridgain.sh \
--build-dir=target \
--conf-dir=/etc/${gridgain-hadoop_pkg_name}/conf.dist \
http://git-wip-us.apache.org/repos/asf/bigtop/blob/098f67f5/bigtop-packages/src/rpm/gridgain-hadoop/SPECS/gridgain-hadoop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/gridgain-hadoop/SPECS/gridgain-hadoop.spec b/bigtop-packages/src/rpm/gridgain-hadoop/SPECS/gridgain-hadoop.spec
index a70457e..86c1200 100644
--- a/bigtop-packages/src/rpm/gridgain-hadoop/SPECS/gridgain-hadoop.spec
+++ b/bigtop-packages/src/rpm/gridgain-hadoop/SPECS/gridgain-hadoop.spec
@@ -139,11 +139,11 @@ Documentation for GridGain platform
%setup -n gridgain-%{vcs_tag}
%build
-env gridgain_hadoop_VERSION=%{version} bash %{SOURCE1}
+bash %{SOURCE1}
%install
%__rm -rf $RPM_BUILD_ROOT
-bash %{SOURCE2} \
+env GRIDGAIN_HADOOP_VERSION=%{version} bash %{SOURCE2} \
--build-dir=target \
--doc-dir=%{doc_gridgain} \
--conf-dir=%{etc_gridgain_conf_dist} \