[bigtop] branch master updated: BIGTOP-3387: Building QFS fails on CentOS 8 (#658)

[se...@apache.org]

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

sekikn 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 380041a  BIGTOP-3387: Building QFS fails on CentOS 8 (#658)
380041a is described below

commit 380041a0ec381b7567896be69d2f37392d9f3f21
Author: Kengo Seki <se...@apache.org>
AuthorDate: Tue Aug 25 12:28:20 2020 +0900

    BIGTOP-3387: Building QFS fails on CentOS 8 (#658)
---
 .../common/qfs/patch2-specify-python-version.diff    | 20 ++++++++++++++++++++
 bigtop-packages/src/rpm/qfs/SPECS/qfs.spec           |  5 +++--
 bigtop_toolchain/manifests/packages.pp               |  4 +++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/bigtop-packages/src/common/qfs/patch2-specify-python-version.diff b/bigtop-packages/src/common/qfs/patch2-specify-python-version.diff
new file mode 100644
index 0000000..7b33b7f
--- /dev/null
+++ b/bigtop-packages/src/common/qfs/patch2-specify-python-version.diff
@@ -0,0 +1,20 @@
+diff --git a/scripts/qfs_backup b/scripts/qfs_backup
+index d3743611..96be5fe7 100755
+--- a/scripts/qfs_backup
++++ b/scripts/qfs_backup
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #
+ # Author: Christopher Zimmerman
+ #
+diff --git a/webui/qfsstatus.py b/webui/qfsstatus.py
+index c2178b23..c4525985 100755
+--- a/webui/qfsstatus.py
++++ b/webui/qfsstatus.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #
+ # $Id$
+ #
diff --git a/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec b/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec
index 6723e4e..15ae9d4 100644
--- a/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec
+++ b/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec
@@ -22,6 +22,7 @@
 %define data_dir /usr/share/qfs
 %define var_dir /var
 %define qfs_services chunkserver metaserver webui
+%define __python /usr/bin/python2
 
 %if %{?!HADOOP_HOME:1}0
 %global HADOOP_HOME /usr/lib/hadoop
@@ -151,7 +152,7 @@ System libraries via Python.
 
 %package webui
 Group: System Environment/Daemons
-Requires: python
+Requires: python2
 Summary: Quantcast File System metaserver/chunkserver web frontend
 
 %description webui
@@ -167,7 +168,7 @@ echo $RPM_BUILD_ROOT
 #BIGTOP_PATCH_COMMANDS
 %build
 %if 0%{?with_python3}
-PTYHON3_PATH=%{__python3}
+PYTHON3_PATH=%{__python3}
 %endif # with_python3
 
 bash $RPM_SOURCE_DIR/do-component-build \
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 6e0825d..2ac2b7a 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -61,7 +61,9 @@ class bigtop_toolchain::packages {
         "libevent-devel",
         "apr-devel",
         "bison",
-        "libffi-devel"
+        "libffi-devel",
+        "krb5-devel",
+        "net-tools",
       ]
       if ($operatingsystem == 'Fedora' or $operatingsystemmajrelease !~ /^[0-7]$/) {
         $pkgs = concat($_pkgs, ["python2-devel", "libtirpc-devel"])