From 21e22d4e1a640c087bf365fb2b45b3f5d5166165 Mon Sep 17 00:00:00 2001
From: Takuya ASADA <syuu@scylladb.com>
Date: Thu, 25 Oct 2018 07:21:36 +0900
Subject: [PATCH] dist/redhat: minor fixes for relocatable .rpm

- we don't use mock anymore, so drop mock directory
- build_rpm.sh usage need to update
- build_rpm.sh should install rpmbuild

Signed-off-by: Takuya ASADA <syuu@scylladb.com>
Message-Id: <20181024222136.3332-2-syuu@scylladb.com>
---
 dist/redhat/build_rpm.sh                      |  5 +-
 dist/redhat/mock/scylla-jmx-epel-7-x86_64.cfg | 53 -------------------
 2 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 dist/redhat/mock/scylla-jmx-epel-7-x86_64.cfg

diff --git a/dist/redhat/build_rpm.sh b/dist/redhat/build_rpm.sh
index 6ee33f8..61ff4fc 100755
--- a/dist/redhat/build_rpm.sh
+++ b/dist/redhat/build_rpm.sh
@@ -5,7 +5,7 @@ PRODUCT=scylla
 . /etc/os-release
 print_usage() {
     echo "build_rpm.sh --reloc-pkg build/scylla-jmx-package.tar.gz"
-    echo "  --target target distribution in mock cfg name"
+    echo "  --reloc-pkg specify relocatable package path"
     exit 1
 }
 RELOC_PKG=
@@ -47,6 +47,9 @@ if [ ! -f "$RELOC_PKG" ]; then
     exit 1
 fi
 
+if [ ! -f /usr/bin/rpmbuild ]; then
+    pkg_install rpm-build
+fi
 if [ ! -f /usr/bin/git ]; then
     pkg_install git
 fi
diff --git a/dist/redhat/mock/scylla-jmx-epel-7-x86_64.cfg b/dist/redhat/mock/scylla-jmx-epel-7-x86_64.cfg
deleted file mode 100644
index 2167d37..0000000
--- a/dist/redhat/mock/scylla-jmx-epel-7-x86_64.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-config_opts['root'] = 'epel-7-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-config_opts['releasever'] = '7'
-config_opts['rpmbuild_networking'] = True
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-mdpolicy=group:primary
-best=1
-
-# repos
-[scylla-centos-base]
-name=BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
-failovermethod=priority
-gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7
-gpgcheck=1
-
-[scylla-centos-updates]
-name=updates
-enabled=1
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
-failovermethod=priority
-gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7
-gpgcheck=1
-
-[scylla-centos-extras]
-name=extras
-mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=extras
-failovermethod=priority
-gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7
-gpgcheck=1
-
-[scylla-epel]
-name=epel
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
-failovermethod=priority
-gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
-gpgcheck=1
-"""