[bigtop] 01/01: adapt to hadoop3

[of...@apache.org]

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

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

commit dcb51a10dd2849a362180b3f7b8d9c65048ca69a
Author: Olaf Flebbe <of...@oflebbe.de>
AuthorDate: Tue Jul 2 22:31:42 2019 +0200

    adapt to hadoop3
---
 bigtop-packages/src/deb/hadoop/control           | 2 +-
 bigtop-packages/src/deb/hadoop/hadoop.install    | 1 +
 bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bigtop-packages/src/deb/hadoop/control b/bigtop-packages/src/deb/hadoop/control
index fc3f3c9..c7e0fb2 100644
--- a/bigtop-packages/src/deb/hadoop/control
+++ b/bigtop-packages/src/deb/hadoop/control
@@ -47,7 +47,7 @@ Description: Hadoop is a software platform for processing vast amounts of data
 
 Package: hadoop-hdfs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils (>= 0.7), bigtop-groovy, hadoop (= ${binary:Version}), bigtop-jsvc
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils (>= 0.7), bigtop-groovy, hadoop (= ${binary:Version})
 Description: The Hadoop Distributed File System
  Hadoop Distributed File System (HDFS) is the primary storage system used by 
  Hadoop applications. HDFS creates multiple replicas of data blocks and distributes 
diff --git a/bigtop-packages/src/deb/hadoop/hadoop.install b/bigtop-packages/src/deb/hadoop/hadoop.install
index 7fd0f34..8bb771d 100644
--- a/bigtop-packages/src/deb/hadoop/hadoop.install
+++ b/bigtop-packages/src/deb/hadoop/hadoop.install
@@ -11,6 +11,7 @@
 /usr/lib/hadoop/etc
 /usr/lib/hadoop/libexec/hadoop-config.sh
 /usr/lib/hadoop/libexec/hadoop-layout.sh
+/usr/lib/hadoop/libexec/hadoop-functions.sh
 /usr/lib/hadoop/*.jar
 /usr/lib/hadoop/lib
 /usr/lib/hadoop/sbin
diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
index 262b2a6..2c72349 100644
--- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
+++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
@@ -223,7 +223,7 @@ located.
 %package hdfs
 Summary: The Hadoop Distributed File System
 Group: System/Daemons
-Requires: %{name} = %{version}-%{release}, bigtop-groovy, bigtop-jsvc
+Requires: %{name} = %{version}-%{release}, bigtop-groovy
 
 %description hdfs
 Hadoop Distributed File System (HDFS) is the primary storage system used by
@@ -666,6 +666,7 @@ fi
 %{lib_hadoop}/etc
 %{lib_hadoop}/libexec/hadoop-config.sh
 %{lib_hadoop}/libexec/hadoop-layout.sh
+%{lib_hadoop}/libexec/hadoop-functions.sh
 %{lib_hadoop}/libexec/kms-config.sh
 %{bin_hadoop}/hadoop
 %{man_hadoop}/man1/hadoop.1.*