From: Kefu Chai <kchai@redhat.com>
Date: Fri, 10 Nov 2017 03:04:58 +0000 (+0800)
Subject: ceph{-,dev-,dev-new-}build: install centos-release-scl repo
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=86174e128b52941d73a226ce36d8900eb3ec1ade;p=ceph-build.git

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 31255f53..1e45661d 100644
--- 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 45384248..0365f21f 100644
--- 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 45384248..0365f21f 100644
--- 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
         ;;