Repository: bigtop Updated Branches: refs/heads/branch-0.8 c7d4b5b36 -> e8b737c8c
BIGTOP-1421 Phoenix build is missing some variables Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/1b7dbd8f Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/1b7dbd8f Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/1b7dbd8f Branch: refs/heads/branch-0.8 Commit: 1b7dbd8fc26c90b39ec52ea5371a0ef52d3b4129 Parents: ec62e97 Author: Andrew Purtell <[email protected]> Authored: Mon Sep 8 16:54:15 2014 -0700 Committer: Andrew Purtell <[email protected]> Committed: Mon Sep 8 16:54:15 2014 -0700 ---------------------------------------------------------------------- .../src/common/phoenix/install_phoenix.sh | 7 +++++++ .../src/common/phoenix/phoenix.default | 20 ++++++++++++++++++++ bigtop-packages/src/deb/phoenix/phoenix.dirs | 1 + bigtop-packages/src/deb/phoenix/rules | 1 + .../src/rpm/phoenix/SPECS/phoenix.spec | 6 ++++++ 5 files changed, 35 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/1b7dbd8f/bigtop-packages/src/common/phoenix/install_phoenix.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/phoenix/install_phoenix.sh b/bigtop-packages/src/common/phoenix/install_phoenix.sh index 98c6a69..34314da 100755 --- a/bigtop-packages/src/common/phoenix/install_phoenix.sh +++ b/bigtop-packages/src/common/phoenix/install_phoenix.sh @@ -126,4 +126,11 @@ rm $PREFIX/$LIB_DIR/lib/phoenix-*-sources.jar find $PREFIX/$LIB_DIR -name '*.jar' -exec chmod a-x {} \; # Create version independent symlinks + +# phoenix-client for clients like sqlline ln -s `cd $PREFIX/$LIB_DIR ; ls phoenix*-client.jar` $PREFIX/$LIB_DIR/phoenix-client.jar + +# phoenix-core for placing on the HBase regionserver classpath +cp -af $PREFIX/$LIB_DIR/lib/phoenix-core-*.jar $PREFIX/$LIB_DIR/ +rm $PREFIX/$LIB_DIR/phoenix*-tests.jar +ln -s `cd $PREFIX/$LIB_DIR ; ls phoenix-core-*.jar` $PREFIX/$LIB_DIR/phoenix-core.jar http://git-wip-us.apache.org/repos/asf/bigtop/blob/1b7dbd8f/bigtop-packages/src/common/phoenix/phoenix.default ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/phoenix/phoenix.default b/bigtop-packages/src/common/phoenix/phoenix.default new file mode 100644 index 0000000..edea51a --- /dev/null +++ b/bigtop-packages/src/common/phoenix/phoenix.default @@ -0,0 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +export PHOENIX_HOME="/usr/lib/phoenix" +export PHOENIX_LIB_DIR="$PHOENIX_HOME" + +# Add the Phoenix server side jar to the HBase classpath +export HBASE_CLASSPATH="$HBASE_CLASSPATH $PHOENIX_HOME/phoenix-core.jar" http://git-wip-us.apache.org/repos/asf/bigtop/blob/1b7dbd8f/bigtop-packages/src/deb/phoenix/phoenix.dirs ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/phoenix/phoenix.dirs b/bigtop-packages/src/deb/phoenix/phoenix.dirs new file mode 100644 index 0000000..efefb65 --- /dev/null +++ b/bigtop-packages/src/deb/phoenix/phoenix.dirs @@ -0,0 +1 @@ +/etc/default http://git-wip-us.apache.org/repos/asf/bigtop/blob/1b7dbd8f/bigtop-packages/src/deb/phoenix/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/phoenix/rules b/bigtop-packages/src/deb/phoenix/rules index a1a4f18..f4e5e9a 100755 --- a/bigtop-packages/src/deb/phoenix/rules +++ b/bigtop-packages/src/deb/phoenix/rules @@ -40,6 +40,7 @@ override_dh_auto_build: bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository override_dh_auto_install: + cp debian/phoenix.default debian/${phoenix_pkg_name}/etc/default/${phoenix_pkg_name} bash -x debian/install_phoenix.sh \ --build-dir=$${PWD}/build \ --prefix=debian/tmp http://git-wip-us.apache.org/repos/asf/bigtop/blob/1b7dbd8f/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec index 862959e..e133165 100644 --- a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec +++ b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec @@ -81,6 +81,7 @@ License: ASL 2.0 Source0: %{name}-%{phoenix_base_version}-src.tar.gz Source1: do-component-build Source2: install_phoenix.sh +Source3: phoenix.default BuildArch: noarch Requires: hadoop, hadoop-mapreduce, hadoop-yarn, hbase, zookeeper @@ -112,6 +113,10 @@ bash %{SOURCE2} \ --build-dir=build \ --doc-dir=%{doc_phoenix} \ --prefix=$RPM_BUILD_ROOT + +%__install -d -m 0755 $RPM_BUILD_ROOT/etc/default/ +%__install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/etc/default/%{name} + # Pull zookeeper, hadoop, hadoop-mapreduce, hadoop-yarn, and hbase deps from their packages rm -f $RPM_BUILD_ROOT/%{lib_phoenix}/zookeeper*.jar ln -f -s %{zookeeper_home}/zookeeper.jar $RPM_BUILD_ROOT/%{lib_phoenix} @@ -150,3 +155,4 @@ fi %{lib_phoenix} %{bin_phoenix} %config(noreplace) %{etc_phoenix_conf_dist} +%config(noreplace) %{_sysconfdir}/default/phoenix
