switch from centos-release-scl to centos-release-scl-rh in 123.09beta01

centminmod · Oct 1, 2016 · ecb3335 · ecb3335
1 parent eaafd58
commit ecb3335
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/addons/devtoolset-3.sh b/addons/devtoolset-3.sh
@@ -81,15 +81,15 @@ install() {
       # wget https://www.softwarecollections.org/en/scls/rhscl/rh-java-common/epel-6-x86_64/download/rhscl-rh-java-common-epel-6-x86_64.noarch.rpm
       # rpm -ivh rhscl-devtoolset-3-epel-6-x86_64.noarch.rpm
       # rpm -ivh rhscl-rh-java-common-epel-6-x86_64.noarch.rpm
-      yum install centos-release-scl
+      yum install centos-release-scl-rh
       yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils
       echo
       /opt/rh/devtoolset-3/root/usr/bin/gcc --version
       /opt/rh/devtoolset-3/root/usr/bin/g++ --version
 		elif [[ "$CENTOS_SIX" = '6' && -f /etc/yum.repos.d/slc6-scl.repo ]]; then
       yum -y remove $(yum -q list installed --disableplugin=priorities | awk '/slc6-scl/ {print $1}')
       rm -rf /etc/yum.repos.d/slc6-scl.repo
-      yum install centos-release-scl
+      yum install centos-release-scl-rh
       yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils
       echo
       /opt/rh/devtoolset-3/root/usr/bin/gcc --version
@@ -100,7 +100,7 @@ install() {
       # wget https://www.softwarecollections.org/en/scls/rhscl/rh-java-common/epel-7-x86_64/download/rhscl-rh-java-common-epel-7-x86_64.noarch.rpm
       # rpm -ivh rhscl-devtoolset-3-epel-7-x86_64.noarch.rpm
       # rpm -ivh rhscl-rh-java-common-epel-7-x86_64.noarch.rpm
-      yum install centos-release-scl
+      yum install centos-release-scl-rh
       yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils
       echo
       /opt/rh/devtoolset-3/root/usr/bin/gcc --version

diff --git a/inc/brotli.inc b/inc/brotli.inc
@@ -10,7 +10,7 @@ scl_install() {
       # rpm --import http://linuxsoft.cern.ch/cern/scl/RPM-GPG-KEY-cern
       # # yum -y install devtoolset-3 -q
       # yum -y install devtoolset-3-gcc-c++ devtoolset-3-binutils -q
-      yum install centos-release-scl
+      yum install centos-release-scl-rh
       yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++ devtoolset-3-binutils -q
     fi
   fi # centos 6 only needed