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~145^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2ef1dbb4b9fabb6d43ff08fbf2ae73dc823a4e7;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) Conflicts: install-deps.sh --- diff --git a/install-deps.sh b/install-deps.sh index 4f1ef9172e4..61cc21d5477 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -176,12 +176,6 @@ else $SUDO yum install --nogpgcheck -y epel-release $SUDO rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$MAJOR_VERSION $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-config-manager --enable cr - fi ;; esac munge_ceph_spec_in $DIR/ceph.spec