From fc320ac49d6f780afbafb4e2005b2ef13eeb1c7b Mon Sep 17 00:00:00 2001
From: Takuya ASADA <syuu@scylladb.com>
Date: Fri, 3 Jul 2020 01:08:42 +0900
Subject: [PATCH] python3: simplified .rpm build process

We don't really need to have two build_rpm.sh, merge it to reloc.
---
 dist/redhat/python3/build_rpm.sh | 95 --------------------------------
 reloc/python3/build_rpm.sh       | 27 +++++++--
 2 files changed, 21 insertions(+), 101 deletions(-)
 delete mode 100755 dist/redhat/python3/build_rpm.sh

diff --git a/dist/redhat/python3/build_rpm.sh b/dist/redhat/python3/build_rpm.sh
deleted file mode 100755
index 39134e069d..0000000000
--- a/dist/redhat/python3/build_rpm.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/bash
-#
-# Copyright (C) 2019 ScyllaDB
-#
-
-#
-# This file is part of Scylla.
-#
-# Scylla is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Scylla is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-PRODUCT=$(cat SCYLLA-PRODUCT-FILE)
-
-print_usage() {
-    echo "${0} --reloc-pkg build/release/scylla-python3-package.tar.gz"
-    echo "  --reloc-pkg specify relocatable package path"
-    exit 1
-}
-
-RELOC_PKG=
-while [ $# -gt 0 ]; do
-    case "$1" in
-        "--reloc-pkg")
-            RELOC_PKG="$2"
-            shift 2
-            ;;
-        *)
-            print_usage
-            ;;
-    esac
-done
-
-is_redhat_variant() {
-    [ -f /etc/redhat-release ]
-}
-pkg_install() {
-    if is_redhat_variant; then
-        sudo yum install -y $1
-    else
-        echo "Requires to install following command: $1"
-        exit 1
-    fi
-}
-
-
-if [ ! -e SCYLLA-RELOCATABLE-FILE ]; then
-    echo "do not directly execute build_rpm.sh, use reloc/build_rpm.sh instead."
-    exit 1
-fi
-
-if [ -z "$RELOC_PKG" ]; then
-    print_usage
-    exit 1
-fi
-if [ ! -f "$RELOC_PKG" ]; then
-    echo "$RELOC_PKG is not found."
-    exit 1
-fi
-
-if [ ! -f /usr/bin/rpmbuild ]; then
-    pkg_install rpm-build
-fi
-if [ ! -f /usr/bin/git ]; then
-    pkg_install git
-fi
-
-RELOC_PKG_BASENAME=$(basename "$RELOC_PKG")
-SCYLLA_VERSION=$(cat SCYLLA-VERSION-FILE)
-SCYLLA_RELEASE=$(cat SCYLLA-RELEASE-FILE)
-
-RPMBUILD=$(readlink -f ../)
-mkdir -p "$RPMBUILD"/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
-
-parameters=(
-    -D"name $PRODUCT-python3"
-    -D"version $SCYLLA_VERSION"
-    -D"release $SCYLLA_RELEASE"
-    -D"target /opt/scylladb/python3"
-    -D"reloc_pkg $RELOC_PKG_BASENAME"
-)
-
-ln -fv "$RELOC_PKG" "$RPMBUILD"/SOURCES/
-cp dist/redhat/python3/python.spec "$RPMBUILD"/SPECS/
-rpmbuild "${parameters[@]}" --nodebuginfo -ba --define '_binary_payload w2.xzdio' --define "_build_id_links none" --define "_topdir ${RPMBUILD}" "$RPMBUILD"/SPECS/python.spec
diff --git a/reloc/python3/build_rpm.sh b/reloc/python3/build_rpm.sh
index 666ebb72ec..20948fdcc1 100755
--- a/reloc/python3/build_rpm.sh
+++ b/reloc/python3/build_rpm.sh
@@ -9,11 +9,9 @@ print_usage() {
 }
 RELOC_PKG=build/release/scylla-python3-package.tar.gz
 BUILDDIR=build/redhat
-OPTS=""
 while [ $# -gt 0 ]; do
     case "$1" in
         "--reloc-pkg")
-            OPTS="$OPTS $1 $(readlink -f $2)"
             RELOC_PKG=$2
             shift 2
             ;;
@@ -33,10 +31,27 @@ if [ ! -e $RELOC_PKG ]; then
     exit 1
 fi
 RELOC_PKG=$(readlink -f $RELOC_PKG)
-if [[ ! $OPTS =~ --reloc-pkg ]]; then
-    OPTS="$OPTS --reloc-pkg $RELOC_PKG"
-fi
+RPMBUILD=$(readlink -f $BUILDDIR)
 mkdir -p $BUILDDIR/scylla-python3
 tar -C $BUILDDIR -xpf $RELOC_PKG scylla-python3/SCYLLA-RELOCATABLE-FILE scylla-python3/SCYLLA-RELEASE-FILE scylla-python3/SCYLLA-VERSION-FILE scylla-python3/SCYLLA-PRODUCT-FILE scylla-python3/dist/redhat/python3
 cd $BUILDDIR/scylla-python3
-exec ./dist/redhat/python3/build_rpm.sh $OPTS
+
+RELOC_PKG_BASENAME=$(basename "$RELOC_PKG")
+SCYLLA_VERSION=$(cat SCYLLA-VERSION-FILE)
+SCYLLA_RELEASE=$(cat SCYLLA-RELEASE-FILE)
+PRODUCT=$(cat SCYLLA-PRODUCT-FILE)
+
+RPMBUILD=$(readlink -f ../)
+mkdir -p "$RPMBUILD"/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+
+parameters=(
+    -D"name $PRODUCT-python3"
+    -D"version $SCYLLA_VERSION"
+    -D"release $SCYLLA_RELEASE"
+    -D"target /opt/scylladb/python3"
+    -D"reloc_pkg $RELOC_PKG_BASENAME"
+)
+
+ln -fv "$RELOC_PKG" "$RPMBUILD"/SOURCES/
+cp dist/redhat/python3/python.spec "$RPMBUILD"/SPECS/
+rpmbuild "${parameters[@]}" --nodebuginfo -ba --define '_binary_payload w2.xzdio' --define "_build_id_links none" --define "_topdir ${RPMBUILD}" "$RPMBUILD"/SPECS/python.spec