This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 03d854996 BIGTOP-3915: soft link error about jar of hadoop in
{hbase_home}/lib (#1094)
03d854996 is described below
commit 03d85499697341963315bf23f9f3f43301724086
Author: guluo <[email protected]>
AuthorDate: Mon Mar 27 08:35:26 2023 +0800
BIGTOP-3915: soft link error about jar of hadoop in {hbase_home}/lib (#1094)
(cherry picked from commit 69c80636fbafc38cc92966c56bd885eb59d7be84)
---
bigtop-packages/src/deb/hbase/rules | 11 +++++++----
bigtop-packages/src/rpm/hbase/SPECS/hbase.spec | 11 +++++++----
bigtop.bom | 2 +-
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/bigtop-packages/src/deb/hbase/rules
b/bigtop-packages/src/deb/hbase/rules
index dbcf0f8ba..0e4554069 100755
--- a/bigtop-packages/src/deb/hbase/rules
+++ b/bigtop-packages/src/deb/hbase/rules
@@ -26,6 +26,9 @@ export DH_OPTIONS
zookeeper_home=/usr/lib/zookeeper
hadoop_home=/usr/lib/hadoop
+hadoop_hdfs_path=/usr/lib/hadoop-hdfs
+hadoop_yarn_path=/usr/lib/hadoop-yarn
+hadoop_mapreduce_path=/usr/lib/hadoop-mapreduce
hbase_pkg_name=hbase
%:
@@ -50,16 +53,16 @@ override_dh_auto_install:
ln -f -s ${hadoop_home}/client/hadoop-annotations.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
ln -f -s ${hadoop_home}/client/hadoop-auth.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
ln -f -s ${hadoop_home}/client/hadoop-common.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
- ln -f -s ${hadoop_home}/client/hadoop-hdfs.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
- ln -f -s ${hadoop_home}/client/hadoop-mapreduce-client-app.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
+ ln -f -s ${hadoop_hdfs_path}/hadoop-hdfs.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
+ ln -f -s ${hadoop_mapreduce_path}/hadoop-mapreduce-client-app.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
ln -f -s ${hadoop_home}/client/hadoop-mapreduce-client-common.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
ln -f -s ${hadoop_home}/client/hadoop-mapreduce-client-core.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
ln -f -s ${hadoop_home}/client/hadoop-mapreduce-client-jobclient.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
- ln -f -s ${hadoop_home}/client/hadoop-mapreduce-client-shuffle.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
+ ln -f -s ${hadoop_mapreduce_path}/hadoop-mapreduce-client-shuffle.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
ln -f -s ${hadoop_home}/client/hadoop-yarn-api.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
ln -f -s ${hadoop_home}/client/hadoop-yarn-client.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
ln -f -s ${hadoop_home}/client/hadoop-yarn-common.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
- ln -f -s ${hadoop_home}/client/hadoop-yarn-server-common.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
+ ln -f -s ${hadoop_yarn_path}/hadoop-yarn-server-common.jar
debian/tmp/usr/lib/${hbase_pkg_name}/lib/
ln -s /var/log/${hbase_pkg_name}
debian/tmp/usr/lib/${hbase_pkg_name}/logs
ln -s /var/run/${hbase_pkg_name}
debian/tmp/usr/lib/${hbase_pkg_name}/pids
diff --git a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
index 02a09ec11..fbfe62311 100644
--- a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
+++ b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
@@ -25,6 +25,9 @@
%define etc_hbase %{parent_dir}/etc/%{hbase_name}
%define usr_lib_hadoop %{parent_dir}/usr/lib/hadoop
+%define usr_lib_hadoop_hdfs %{parent_dir}/usr/lib/hadoop-hdfs
+%define usr_lib_hadoop_mapreduce %{parent_dir}/usr/lib/hadoop-mapreduce
+%define usr_lib_hadoop_yarn %{parent_dir}/usr/lib/hadoop-yarn
%define usr_lib_zookeeper %{parent_dir}/usr/lib/zookeeper
%define bin_dir %{parent_dir}/%{_bindir}
@@ -340,16 +343,16 @@ ln -f -s %{usr_lib_zookeeper}/zookeeper.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
ln -f -s %{usr_lib_hadoop}/client/hadoop-annotations.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
ln -f -s %{usr_lib_hadoop}/client/hadoop-auth.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
ln -f -s %{usr_lib_hadoop}/client/hadoop-common.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
-ln -f -s %{usr_lib_hadoop}/client/hadoop-hdfs.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
-ln -f -s %{usr_lib_hadoop}/client/hadoop-mapreduce-client-app.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
+ln -f -s %{usr_lib_hadoop_hdfs}/hadoop-hdfs.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
+ln -f -s %{usr_lib_hadoop_mapreduce}/hadoop-mapreduce-client-app.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
ln -f -s %{usr_lib_hadoop}/client/hadoop-mapreduce-client-common.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
ln -f -s %{usr_lib_hadoop}/client/hadoop-mapreduce-client-core.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
ln -f -s %{usr_lib_hadoop}/client/hadoop-mapreduce-client-jobclient.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
-ln -f -s %{usr_lib_hadoop}/client/hadoop-mapreduce-client-shuffle.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
+ln -f -s %{usr_lib_hadoop_mapreduce}/hadoop-mapreduce-client-shuffle.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
ln -f -s %{usr_lib_hadoop}/client/hadoop-yarn-api.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
ln -f -s %{usr_lib_hadoop}/client/hadoop-yarn-client.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
ln -f -s %{usr_lib_hadoop}/client/hadoop-yarn-common.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
-ln -f -s %{usr_lib_hadoop}/client/hadoop-yarn-server-common.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
+ln -f -s %{usr_lib_hadoop_yarn}/hadoop-yarn-server-common.jar
$RPM_BUILD_ROOT/%{usr_lib_hbase}/lib
%pre
getent group hbase 2>/dev/null >/dev/null || /usr/sbin/groupadd -r hbase
diff --git a/bigtop.bom b/bigtop.bom
index e00b9a7c8..878604f50 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -162,7 +162,7 @@ bigtop {
name = 'hbase'
rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_")
relNotes = 'Apache HBase'
- version { base = '2.4.13'; pkg = base; release = 1 }
+ version { base = '2.4.13'; pkg = base; release = 2 }
tarball { destination = "${name}-${version.base}.tar.gz"
source = "${name}-${version.base}-src.tar.gz" }
url { download_path = "/$name/${version.base}/"
