From: Loic Dachary Date: Tue, 8 Dec 2015 07:02:56 +0000 (+0100) Subject: build/ops: enable CR in CentOS 7 X-Git-Tag: v10.0.1~1^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6844%2Fhead;p=ceph.git build/ops: enable CR in CentOS 7 To get libunwind from the CR repositories until CentOS 7.2.1511 is released. http://tracker.ceph.com/issues/13997 Fixes: #13997 Signed-off-by: Loic Dachary --- diff --git a/install-deps.sh b/install-deps.sh index 1bebf09b08bd..8249ea345972 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -62,7 +62,7 @@ CentOS|Fedora|RedHatEnterpriseServer) CentOS|RedHatEnterpriseServer) $SUDO yum install -y yum-utils MAJOR_VERSION=$(lsb_release -rs | cut -f1 -d.) - if test $(lsb_release -si) == RedHatEnterpriseServer ; then + if test $(lsb_release -si) = RedHatEnterpriseServer ; then $SUDO yum install subscription-manager $SUDO subscription-manager repos --enable=rhel-$MAJOR_VERSION-server-optional-rpms fi @@ -70,6 +70,9 @@ CentOS|Fedora|RedHatEnterpriseServer) $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 ;; esac sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec