This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 04db30b BIGTOP-3610 - Use a stricter match for the zookeeper jar in
hadoop packaging (#839)
04db30b is described below
commit 04db30bd56844416e1d64c0247be4388b1929122
Author: Luca Toscano <[email protected]>
AuthorDate: Fri Dec 10 08:05:37 2021 +0100
BIGTOP-3610 - Use a stricter match for the zookeeper jar in hadoop
packaging (#839)
---
bigtop-packages/src/deb/hadoop/rules | 2 +-
bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bigtop-packages/src/deb/hadoop/rules
b/bigtop-packages/src/deb/hadoop/rules
index fe0f301..9a7009b 100755
--- a/bigtop-packages/src/deb/hadoop/rules
+++ b/bigtop-packages/src/deb/hadoop/rules
@@ -66,7 +66,7 @@ override_dh_auto_install:
--native-build-string=${native_dir} \
--installed-lib-dir=/usr/lib/hadoop
# Forcing Zookeeper dependency to be on the packaged jar
- ln -sf /usr/lib/zookeeper/zookeeper.jar
debian/tmp/usr/lib/hadoop/lib/zookeeper*.jar
+ ln -sf /usr/lib/zookeeper/zookeeper.jar
debian/tmp/usr/lib/hadoop/lib/zookeeper-[[:digit:]]*.jar
# Workaround for BIGTOP-583
rm -f debian/tmp/usr/lib/hadoop-*/lib/slf4j-log4j12-*.jar
# FIXME: BIGTOP-463
diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
index 877c3e0..c9bf160 100644
--- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
+++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
@@ -559,7 +559,7 @@ env HADOOP_VERSION=%{hadoop_base_version} bash %{SOURCE2} \
--man-dir=$RPM_BUILD_ROOT%{man_hadoop} \
# Forcing Zookeeper dependency to be on the packaged jar
-%__ln_s -f /usr/lib/zookeeper/zookeeper.jar
$RPM_BUILD_ROOT/%{lib_hadoop}/lib/zookeeper*.jar
+%__ln_s -f /usr/lib/zookeeper/zookeeper.jar
$RPM_BUILD_ROOT/%{lib_hadoop}/lib/zookeeper-[[:digit:]]*.jar
# Workaround for BIGTOP-583
%__rm -f $RPM_BUILD_ROOT/%{lib_hadoop}-*/lib/slf4j-log4j12-*.jar
