]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
install-deps.sh: install devtoolset-7 for centos/rhel
authorKefu Chai <kchai@redhat.com>
Fri, 10 Nov 2017 01:32:13 +0000 (09:32 +0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 4 Oct 2019 15:06:42 +0000 (17:06 +0200)
ready them for gcc7 and libstdc++-7 for better performance.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f9aa49cee15cd571a8dc2efcd46a54b0a1f68f89)

Conflicts:
install-deps.sh
- leave shebang untouched: 3aae5ca6fda8b07ef875ae47c1b620aa3e2cdcd9 is not being
  backported

install-deps.sh

index 4f1ef9172e4abc40715c911ca13db70173fd8e82..31bc47f1dab46164a724b8ea01132ab6c7e8ecaf 100755 (executable)
@@ -178,8 +178,10 @@ else
                 $SUDO rm -f /etc/yum.repos.d/dl.fedoraproject.org*
                 if test $(lsb_release -si) = CentOS -a $MAJOR_VERSION = 7 ; then
                     $SUDO yum-config-manager --enable cr
-                fi
-                if test $(lsb_release -si) = VirtuozzoLinux -a $MAJOR_VERSION = 7 ; then
+                    $SUDO yum install centos-release-scl
+                elif test $(lsb_release -si) = RedHatEnterpriseServer -a $MAJOR_VERSION = 7 ; then
+                    $SUDO yum-config-manager --enable rhel-server-rhscl-7-rpms
+                elif test $(lsb_release -si) = VirtuozzoLinux -a $MAJOR_VERSION = 7 ; then
                     $SUDO yum-config-manager --enable cr
                 fi
                 ;;