You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2020/03/10 02:58:11 UTC

[bigtop] branch branch-1.4 updated: BIGTOP-3317: fix broken symlink for hadoop-hdfs.jar

This is an automated email from the ASF dual-hosted git repository.

oflebbe pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/branch-1.4 by this push:
     new 5ca99bf  BIGTOP-3317: fix broken symlink for hadoop-hdfs.jar
5ca99bf is described below

commit 5ca99bfa717cec63f7adf7a4c3d471ba3d283299
Author: Luca Toscano <lt...@wikimedia.org>
AuthorDate: Sat Feb 29 10:54:17 2020 +0100

    BIGTOP-3317: fix broken symlink for hadoop-hdfs.jar
    
    On Debian 9 the hadoop-hdfs.jar is broken, and causes failures like
    oozie sharedlib creation on HDFS. This change replaces it with
    hadoop-hdfs-client.jar, that seems to work.
    
    Apply the same fix also for rpm packages.
    
    Signed-off-by: Olaf Flebbe <of...@oflebbe.de>
---
 bigtop-packages/src/deb/oozie/rules            | 2 +-
 bigtop-packages/src/rpm/oozie/SPECS/oozie.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigtop-packages/src/deb/oozie/rules b/bigtop-packages/src/deb/oozie/rules
index eb6038b..a16f4b9 100755
--- a/bigtop-packages/src/deb/oozie/rules
+++ b/bigtop-packages/src/deb/oozie/rules
@@ -46,7 +46,7 @@ override_dh_auto_install:
 	ln -sf /usr/lib/hadoop/client/hadoop-annotations.jar debian/oozie/usr/lib/oozie/lib/
 	ln -sf /usr/lib/hadoop/client/hadoop-auth.jar debian/oozie/usr/lib/oozie/lib/
 	ln -sf /usr/lib/hadoop/client/hadoop-common.jar debian/oozie/usr/lib/oozie/lib/
-	ln -sf /usr/lib/hadoop/client/hadoop-hdfs.jar debian/oozie/usr/lib/oozie/lib/
+	ln -sf /usr/lib/hadoop/client/hadoop-hdfs-client.jar debian/oozie/usr/lib/oozie/lib/
 	ln -sf /usr/lib/hadoop/client/hadoop-mapreduce-client-app.jar debian/oozie/usr/lib/oozie/lib/
 	ln -sf /usr/lib/hadoop/client/hadoop-mapreduce-client-common.jar debian/oozie/usr/lib/oozie/lib/
 	ln -sf /usr/lib/hadoop/client/hadoop-mapreduce-client-core.jar debian/oozie/usr/lib/oozie/lib/
diff --git a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
index 933481a..31d791a 100644
--- a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
+++ b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
@@ -156,7 +156,7 @@ Requires: bigtop-utils >= 0.7
 %__ln_s -f %{lib_hadoop}/client/hadoop-annotations.jar $RPM_BUILD_ROOT/%{lib_oozie}/lib/
 %__ln_s -f %{lib_hadoop}/client/hadoop-auth.jar $RPM_BUILD_ROOT/%{lib_oozie}/lib/
 %__ln_s -f %{lib_hadoop}/client/hadoop-common.jar $RPM_BUILD_ROOT/%{lib_oozie}/lib/
-%__ln_s -f %{lib_hadoop}/client/hadoop-hdfs.jar $RPM_BUILD_ROOT/%{lib_oozie}/lib/
+%__ln_s -f %{lib_hadoop}/client/hadoop-hdfs-client.jar $RPM_BUILD_ROOT/%{lib_oozie}/lib/
 %__ln_s -f %{lib_hadoop}/client/hadoop-mapreduce-client-app.jar $RPM_BUILD_ROOT/%{lib_oozie}/lib/
 %__ln_s -f %{lib_hadoop}/client/hadoop-mapreduce-client-common.jar $RPM_BUILD_ROOT/%{lib_oozie}/lib/
 %__ln_s -f %{lib_hadoop}/client/hadoop-mapreduce-client-core.jar $RPM_BUILD_ROOT/%{lib_oozie}/lib/