From da724cc5295d483c39cf4311e1a8600fc5522a50 Mon Sep 17 00:00:00 2001 From: Dingli Zhang Date: Tue, 9 Dec 2025 06:19:02 +0000 Subject: [PATCH] Fix hbase shell error on riscv64 --- hbase.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/hbase.spec b/hbase.spec index 1dc6d0a..3391938 100644 --- a/hbase.spec +++ b/hbase.spec @@ -8,7 +8,7 @@ Name: hbase Version: 2.5.0 -Release: 3 +Release: 4 Summary: A database for Apache Hadoop License: Apache-2.0 and BSD and CPL-1.0 and EPL-1.0 and MIT URL: http://hbase.apache.org/ @@ -26,6 +26,7 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gradle-local xmvn xmvn-install BuildRequires: systemd +BuildRequires: jffi-native BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local protobuf2-devel protobuf2-compiler protobuf2 Requires: java-1.8.0-openjdk @@ -66,6 +67,7 @@ This package contains the API documentation for %{name}. %patch1 -p1 mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=2.5.0 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=/usr/bin/protoc mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=3.21.1 -Dclassifier=linux-riscv64 -Dpackaging=exe -Dfile=%{SOURCE5} +sed -i 's#9.2.13.0#9.3.15.0#g' pom.xml %endif mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc -Dversion=2.5.0 -Dclassifier=linux-aarch_64 -Dpackaging=exe -Dfile=/usr/bin/protoc cp %{SOURCE4} ./.xmvn-reactor @@ -156,6 +158,12 @@ pushd %{name}-assembly/target/%{name}-%{version} cp -arf lib/client-facing-thirdparty %{buildroot}/%{_datadir}/%{name}/lib cp -arf lib/shaded-clients %{buildroot}/%{_datadir}/%{name}/lib + %if "%{_arch}" == "riscv64" + jar xf /usr/lib/java/jffi-native.jar jni/riscv64-Linux + jar uf %{buildroot}/%{_datadir}/%{name}/lib/ruby/jruby-complete-9.3.15.0.jar jni/riscv64-Linux + rm -rf jni + %endif + %if 0 # Native libraries cp -arf lib/native/* %{buildroot}/%{_libdir}/%{name} @@ -273,6 +281,9 @@ fi %endif %changelog +* Tue Dec 9 2025 Dingli Zhang - 2.5.0-4 +- Fix hbase shell error on riscv64 + * Wed May 29 2024 Dingli Zhang - 2.5.0-3 - Fix riscv64 support - Upgrade os-maven-plugin to 1.7.1 -- Gitee