ceph{-,dev-,dev-new-}build: install centos-release-scl repo

enable/install centos-release-scl on rhel7/centos7, so we can use
newer gcc/toolchain offered by Software Collections (scl)'s devtoolset
see https://www.softwarecollections.org/en/scls/rhscl/devtoolset-7/

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm
index 31255f53dc0c5ee3196f592e28436a431fb46c7a..1e45661d73638730e3a6042bc06c508d9ffb5dc1 100644 (file)
--- a/ceph-build/build/setup_rpm
+++ b/ceph-build/build/setup_rpm
@@ -39,6 +39,7 @@ CentOS|Fedora|SUSE*|RedHatEnterpriseServer)
                 $SUDO yum install -y yum-utils
                 ;;
         esac
+        $SUDO yum install -y centos-release-scl
         sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
         $SUDO yum-builddep -y $DIR/ceph.spec
         ;;

diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm
index 4538424820b0bf16df11e8d2d7764a5a26e5b303..0365f21f14b3888e8e64479abdb106a6d4037284 100644 (file)
--- a/ceph-dev-build/build/setup_rpm
+++ b/ceph-dev-build/build/setup_rpm
@@ -39,6 +39,7 @@ CentOS|Fedora|SUSE*|RedHatEnterpriseServer)
                 $SUDO yum install -y yum-utils
                 ;;
         esac
+        $SUDO yum install -y centos-release-scl
         sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
         $SUDO yum-builddep -y $DIR/ceph.spec
         ;;

diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm
index 4538424820b0bf16df11e8d2d7764a5a26e5b303..0365f21f14b3888e8e64479abdb106a6d4037284 100644 (file)
--- a/ceph-dev-new-build/build/setup_rpm
+++ b/ceph-dev-new-build/build/setup_rpm
@@ -39,6 +39,7 @@ CentOS|Fedora|SUSE*|RedHatEnterpriseServer)
                 $SUDO yum install -y yum-utils
                 ;;
         esac
+        $SUDO yum install -y centos-release-scl
         sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
         $SUDO yum-builddep -y $DIR/ceph.spec
         ;;