diff options
author | Olaf Flebbe <of@oflebbe.de> | 2017-04-22 12:46:12 +0000 |
---|---|---|
committer | Kevin W Monroe <kevin.monroe@canonical.com> | 2017-06-28 12:45:56 -0500 |
commit | 71842397a2a4cb034fed48bc9674bc6160bc64bf (patch) | |
tree | d6f29b19101df7a6aaae003aa754d3238555d18f | |
parent | b12aa51067b323fb0001aa7f57d9170b643fe073 (diff) |
BIGTOP-2743: hbase shell does not work on ppc64le
Signed-off-by: Kevin W Monroe <kevin.monroe@canonical.com>
-rw-r--r-- | bigtop-packages/src/common/hbase/patch0-jline-jrub.diff | 15 | ||||
-rw-r--r-- | bigtop-packages/src/rpm/hbase/SPECS/hbase.spec | 3 |
2 files changed, 18 insertions, 0 deletions
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 00000000..d6aa4e78 --- /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 diff --git a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec index d59a404b..a224b3ba 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} |