[bigtop] branch master updated: BIGTOP-3416. Fix YCSB to work with CentOS 8 and Fedora 31. (#681)

[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 2604bd2  BIGTOP-3416. Fix YCSB to work with CentOS 8 and Fedora 31. (#681)
2604bd2 is described below

commit 2604bd2673428970b07d8678ad896ed59be9f8dd
Author: Kengo Seki <se...@apache.org>
AuthorDate: Tue Sep 29 22:16:07 2020 +0900

    BIGTOP-3416. Fix YCSB to work with CentOS 8 and Fedora 31. (#681)
---
 .../src/common/ycsb/patch0-python-executable-version.diff      | 10 ++++++++++
 bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec                   |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bigtop-packages/src/common/ycsb/patch0-python-executable-version.diff b/bigtop-packages/src/common/ycsb/patch0-python-executable-version.diff
new file mode 100644
index 0000000..30d14ae
--- /dev/null
+++ b/bigtop-packages/src/common/ycsb/patch0-python-executable-version.diff
@@ -0,0 +1,10 @@
+diff --git a/bin/ycsb b/bin/ycsb
+index 72e218a5..7421e981 100755
+--- a/bin/ycsb
++++ b/bin/ycsb
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #
+ # Copyright (c) 2012 - 2015 YCSB contributors. All rights reserved.
+ #
diff --git a/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec b/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec
index 25bc157..1b5832a 100644
--- a/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec
+++ b/bigtop-packages/src/rpm/ycsb/SPECS/ycsb.spec
@@ -33,9 +33,10 @@ Source0: %{ycsb_name}-%{ycsb_base_version}.tar.gz
 Source1: do-component-build 
 Source2: install_%{ycsb_name}.sh
 Source3: bigtop.bom
+#BIGTOP_PATCH_FILES
 ## This package _explicitly_ turns off the auto-discovery of required dependencies
 ## to work around OSGI corner case, added to RPM lately. See BIGTOP-2421 for more info.
-Requires: coreutils, bigtop-utils >= 0.7, python
+Requires: coreutils, bigtop-utils >= 0.7, python2
 AutoReq: no
 
 %description 
@@ -47,6 +48,8 @@ performance of NoSQL database management systems.
 %prep
 %setup -n YCSB-%{ycsb_base_version}
 
+#BIGTOP_PATCH_COMMANDS
+
 %build
 bash $RPM_SOURCE_DIR/do-component-build