You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2015/05/29 15:33:12 UTC
bigtop git commit: BIGTOP-1833. Bump Ignite to 1.1.0
Repository: bigtop
Updated Branches:
refs/heads/master e7154397b -> d1eef86fb
BIGTOP-1833. Bump Ignite to 1.1.0
Signed-off-by: Evans Ye <ev...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d1eef86f
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d1eef86f
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d1eef86f
Branch: refs/heads/master
Commit: d1eef86fb4dc4d4d165fa8e94e4a1f7d39b1b8dd
Parents: e715439
Author: Konstantin Boudnik <co...@apache.org>
Authored: Tue May 26 13:40:23 2015 +0300
Committer: Evans Ye <ev...@apache.org>
Committed: Fri May 29 13:27:33 2015 +0000
----------------------------------------------------------------------
bigtop-packages/src/deb/ignite-hadoop/rules | 2 +-
bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec | 2 +-
bigtop.mk | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d1eef86f/bigtop-packages/src/deb/ignite-hadoop/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/ignite-hadoop/rules b/bigtop-packages/src/deb/ignite-hadoop/rules
index b3bc5fe..817fd24 100644
--- a/bigtop-packages/src/deb/ignite-hadoop/rules
+++ b/bigtop-packages/src/deb/ignite-hadoop/rules
@@ -37,7 +37,7 @@ override_dh_auto_install:
cp debian/ignite-hadoop.default debian/${ignite-hadoop_pkg_name}/etc/default/${ignite-hadoop_pkg_name}
env HADOOP_VERSION=${IGNITE_HADOOP_BASE_VERSION} \
bash -x debian/install_ignite.sh \
- --build-dir=target \
+ --build-dir=target/bin \
--conf-dir=/etc/${ignite-hadoop_pkg_name}/conf.dist \
--doc-dir=usr/share/doc/${ignite-hadoop_pkg_name}-doc \
--prefix=debian/tmp
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d1eef86f/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec b/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec
index b68bac8..8251ae9 100644
--- a/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec
+++ b/bigtop-packages/src/rpm/ignite-hadoop/SPECS/ignite-hadoop.spec
@@ -144,7 +144,7 @@ bash %{SOURCE1}
%install
%__rm -rf $RPM_BUILD_ROOT
env IGNITE_HADOOP_VERSION=%{version} bash %{SOURCE2} \
- --build-dir=target \
+ --build-dir=target/bin \
--doc-dir=%{doc_ignite} \
--conf-dir=%{etc_ignite_conf_dist} \
--prefix=$RPM_BUILD_ROOT
http://git-wip-us.apache.org/repos/asf/bigtop/blob/d1eef86f/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 564109b..d6f9507 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -54,12 +54,12 @@ $(eval $(call PACKAGE,hadoop,HADOOP))
IGNITE_HADOOP_NAME=ignite-hadoop
IGNITE_HADOOP_RELNOTES_NAME=Ignite
IGNITE_HADOOP_PKG_NAME=$(IGNITE_HADOOP_NAME)
-IGNITE_HADOOP_BASE_VERSION=1.0.0
+IGNITE_HADOOP_BASE_VERSION=1.1.0
IGNITE_HADOOP_PKG_VERSION=$(IGNITE_HADOOP_BASE_VERSION)
IGNITE_HADOOP_RELEASE_VERSION=1
IGNITE_HADOOP_TARBALL_DST=$(IGNITE_HADOOP_NAME)-$(IGNITE_HADOOP_BASE_VERSION).tar.gz
-IGNITE_HADOOP_TARBALL_SRC=incubator-ignite-1.0.0-src.zip
-IGNITE_HADOOP_DOWNLOAD_PATH=/incubator/ignite/1.0.0/
+IGNITE_HADOOP_TARBALL_SRC=apache-ignite-1.1.0-incubating-src.zip
+IGNITE_HADOOP_DOWNLOAD_PATH=/incubator/ignite/1.1.0/
IGNITE_HADOOP_SITE=$(APACHE_MIRROR)$(IGNITE_HADOOP_DOWNLOAD_PATH)
IGNITE_HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(IGNITE_HADOOP_DOWNLOAD_PATH)
$(eval $(call PACKAGE,ignite-hadoop,IGNITE_HADOOP))