From: Brad Hubbard Date: Thu, 22 Nov 2018 00:07:22 +0000 (+1000) Subject: install-deps.sh: Remove CR repo X-Git-Tag: v12.2.13~109^2~13 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6f20378ecbaa9726f40eef0e3d6a242d94bca29;p=ceph.git install-deps.sh: Remove CR repo Remove the continuous release repos for CentOS and Virtuozzo 7 as they should no longer be needed since http://tracker.ceph.com/issues/13997 is no longer relevant and the newer versions of selinux packages pulled in by the build system are causing problems for systems without CR repos enabled. Fixes: https://tracker.ceph.com/issues/37335 Signed-off-by: Alfredo Deza Signed-off-by: Brad Hubbard (cherry picked from commit f39d9b7d1f4f2b63233802211a9ed0e641446ca1) --- diff --git a/install-deps.sh b/install-deps.sh index 98e8a6c30e0..03cecc7c790 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -209,7 +209,6 @@ else $SUDO rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$VERSION_ID $SUDO rm -f /etc/yum.repos.d/dl.fedoraproject.org* if test $ID = centos -a $VERSION_ID = 7 ; then - $SUDO yum-config-manager --enable cr case $(uname -m) in x86_64) $SUDO yum -y install centos-release-scl @@ -225,8 +224,6 @@ else elif test $ID = rhel -a $MAJOR_VERSION = 7 ; then $SUDO yum-config-manager --enable rhel-server-rhscl-7-rpms dts_ver=7 - elif test $ID = virtuozzo -a $MAJOR_VERSION = 7 ; then - $SUDO yum-config-manager --enable cr fi ;; esac