You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by yw...@apache.org on 2015/03/17 11:55:37 UTC
bigtop git commit: BIGTOP-1738: Update HBase because javadoc broken
Repository: bigtop
Updated Branches:
refs/heads/master d07cf3369 -> a61c0312f
BIGTOP-1738: Update HBase because javadoc broken
Signed-off-by: YoungWoo Kim <yw...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/a61c0312
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/a61c0312
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/a61c0312
Branch: refs/heads/master
Commit: a61c0312f78e08753a5a940eacf3fe43b9b2a813
Parents: d07cf33
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sun Mar 8 17:36:35 2015 +0100
Committer: YoungWoo Kim <yw...@apache.org>
Committed: Tue Mar 17 19:54:18 2015 +0900
----------------------------------------------------------------------
bigtop-packages/src/deb/hbase/compat | 2 +-
bigtop-packages/src/deb/hbase/control | 2 +-
.../src/deb/hbase/install_init_scripts.sh | 10 +---
.../src/deb/hbase/service-postinst.tpl | 53 --------------------
.../src/deb/hbase/service-postrm.tpl | 53 --------------------
bigtop.mk | 2 +-
6 files changed, 5 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a61c0312/bigtop-packages/src/deb/hbase/compat
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hbase/compat b/bigtop-packages/src/deb/hbase/compat
index 7f8f011..ec63514 100644
--- a/bigtop-packages/src/deb/hbase/compat
+++ b/bigtop-packages/src/deb/hbase/compat
@@ -1 +1 @@
-7
+9
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a61c0312/bigtop-packages/src/deb/hbase/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hbase/control b/bigtop-packages/src/deb/hbase/control
index 850047f..bfa4218 100644
--- a/bigtop-packages/src/deb/hbase/control
+++ b/bigtop-packages/src/deb/hbase/control
@@ -17,7 +17,7 @@ Section: misc
Priority: extra
Maintainer: Bigtop <de...@bigtop.apache.org>
Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.8.0
+Standards-Version: 3.9.4
Homepage: http://hbase.apache.org/
Package: hbase
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a61c0312/bigtop-packages/src/deb/hbase/install_init_scripts.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hbase/install_init_scripts.sh b/bigtop-packages/src/deb/hbase/install_init_scripts.sh
index 9f0f52a..ad15193 100755
--- a/bigtop-packages/src/deb/hbase/install_init_scripts.sh
+++ b/bigtop-packages/src/deb/hbase/install_init_scripts.sh
@@ -18,23 +18,17 @@
SRC_PKG=hbase
for node in master regionserver rest thrift thrift2; do
service_pkgdir=debian/$SRC_PKG-$node
- debdir=$service_pkgdir/DEBIAN
- mkdir -p $service_pkgdir/etc/init.d/ $debdir
if [ "$node" == "regionserver" ] ; then
# Region servers start from a different template that allows
# them to run multiple concurrent instances of the daemon
template=debian/regionserver-init.d.tpl
sed -i -e "s|@INIT_DEFAULT_START@|2 3 4 5|" $template
sed -i -e "s|@INIT_DEFAULT_STOP@|0 1 6|" $template
- sed -e "s|@HBASE_DAEMON@|$node|" -e "s|@CHKCONFIG@|2345 87 13|" $template > $service_pkgdir/etc/init.d/$SRC_PKG-$node
+ sed -e "s|@HBASE_DAEMON@|$node|" -e "s|@CHKCONFIG@|2345 87 13|" $template > debian/hbase-$node.init
else
sed -e "s|@HBASE_DAEMON@|$node|" debian/hbase.svc > debian/hbase-$node.svc
- bash debian/init.d.tmpl debian/hbase-$node.svc deb $service_pkgdir/etc/init.d/$SRC_PKG-$node
+ bash debian/init.d.tmpl debian/hbase-$node.svc deb debian/hbase-$node.init
fi
- sed -e "s|@HBASE_DAEMON@|$node|" debian/service-postinst.tpl > $debdir/postinst
- sed -e "s|@HBASE_DAEMON@|$node|" debian/service-postrm.tpl > $debdir/postrm
- echo /etc/init.d/$SRC_PKG-$node > $debdir/conffiles
- chmod 755 $debdir/postinst $debdir/postrm $service_pkgdir/etc/init.d*
mkdir -p $service_pkgdir/usr/share/lintian/overrides
echo "$SRC_PKG-$node: new-package-should-close-itp-bug" > $service_pkgdir/usr/share/lintian/overrides/$SRC_PKG-$node
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a61c0312/bigtop-packages/src/deb/hbase/service-postinst.tpl
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hbase/service-postinst.tpl b/bigtop-packages/src/deb/hbase/service-postinst.tpl
deleted file mode 100644
index b15ef66..0000000
--- a/bigtop-packages/src/deb/hbase/service-postinst.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-# postinst script for hbase
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <postinst> `abort-remove'
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- configure)
- update-rc.d hbase-@HBASE_DAEMON@ defaults >/dev/null || exit 1
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-exit 0
-
-
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a61c0312/bigtop-packages/src/deb/hbase/service-postrm.tpl
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hbase/service-postrm.tpl b/bigtop-packages/src/deb/hbase/service-postrm.tpl
deleted file mode 100644
index 23217a7..0000000
--- a/bigtop-packages/src/deb/hbase/service-postrm.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-# postrm script for hbase
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postrm> `remove'
-# * <postrm> `purge'
-# * <old-postrm> `upgrade' <new-version>
-# * <new-postrm> `failed-upgrade' <old-version>
-# * <new-postrm> `abort-install'
-# * <new-postrm> `abort-install' <old-version>
-# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <overwriter>
-# <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- purge)
- update-rc.d -f hbase-@HBASE_DAEMON@ remove > /dev/null || exit 1
- ;;
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-exit 0
-
-
http://git-wip-us.apache.org/repos/asf/bigtop/blob/a61c0312/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index f88698d..faa4f17 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -69,7 +69,7 @@ $(eval $(call PACKAGE,gridgain-hadoop,GRIDGAIN_HADOOP))
HBASE_NAME=hbase
HBASE_RELNOTES_NAME=Apache HBase
HBASE_PKG_NAME=hbase
-HBASE_BASE_VERSION=0.98.5
+HBASE_BASE_VERSION=0.98.10.1
HBASE_PKG_VERSION=$(HBASE_BASE_VERSION)
HBASE_RELEASE_VERSION=1
HBASE_TARBALL_DST=hbase-$(HBASE_BASE_VERSION).tar.gz