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 2017/07/01 13:37:27 UTC

[43/50] [abbrv] bigtop git commit: BIGTOP-2743: hbase shell does not work on ppc64le

BIGTOP-2743: hbase shell does not work on ppc64le

Signed-off-by: Kevin W Monroe <ke...@canonical.com>


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8ccc75e8
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8ccc75e8
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8ccc75e8

Branch: refs/heads/branch-1.2
Commit: 8ccc75e85eb8535368c6dcbce6beb6832a7c4cce
Parents: dbc6fb1
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sat Apr 22 12:46:12 2017 +0000
Committer: Evans Ye <ev...@apache.org>
Committed: Sat Jul 1 12:53:00 2017 +0000

----------------------------------------------------------------------
 .../src/common/hbase/patch0-jline-jrub.diff          | 15 +++++++++++++++
 bigtop-packages/src/rpm/hbase/SPECS/hbase.spec       |  3 +++
 2 files changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/8ccc75e8/bigtop-packages/src/common/hbase/patch0-jline-jrub.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/patch0-jline-jrub.diff b/bigtop-packages/src/common/hbase/patch0-jline-jrub.diff
new file mode 100644
index 0000000..d6aa4e7
--- /dev/null
+++ b/bigtop-packages/src/common/hbase/patch0-jline-jrub.diff
@@ -0,0 +1,15 @@
+--- ./hbase-shell/src/main/ruby/shell/formatter.rb.orig	2017-04-22 12:39:16.617041337 +0000
++++ ./hbase-shell/src/main/ruby/shell/formatter.rb	2017-04-22 12:40:46.642890485 +0000
+@@ -30,7 +30,11 @@
+
+       def refresh_width()
+         if $stdout.tty?
+-          @max_width = Java::jline.Terminal.getTerminal().getTerminalWidth()
++          if Java::jline.Terminal.respond_to?(:getTerminal)
++            @max_width = Java::jline.Terminal.getTerminal.getTerminalWidth
++          else
++            @max_width = Java::jline.TerminalFactory.get.getWidth
++          end
+         else
+           @max_width = 0
+         end

http://git-wip-us.apache.org/repos/asf/bigtop/blob/8ccc75e8/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
index d59a404..a224b3b 100644
--- a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
+++ b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
@@ -91,6 +91,7 @@ Source4: init.d.tmpl
 Source5: hbase.default
 Source6: hbase.nofiles.conf
 Source7: regionserver-init.d.tpl
+#BIGTOP_PATCH_FILES
 BuildArch: noarch
 Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service
 Requires: hadoop-client, zookeeper >= 3.3.1, bigtop-utils >= 0.7
@@ -262,6 +263,8 @@ The Apache HBase REST gateway
 %prep
 %setup -n %{name}-%{hbase_base_version}
 
+#BIGTOP_PATCH_COMMANDS
+
 %build
 env HBASE_VERSION=%{version} bash %{SOURCE1}