]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
build/ops: enable CR in CentOS 7 6845/head
authorLoic Dachary <ldachary@redhat.com>
Tue, 8 Dec 2015 07:02:56 +0000 (08:02 +0100)
committerLoic Dachary <ldachary@redhat.com>
Tue, 8 Dec 2015 07:58:27 +0000 (08:58 +0100)
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 <loic@dachary.org>
(cherry picked from commit 247ee6084b58861da601d349bdba739b252d96de)

install-deps.sh

index 1bebf09b08bda04eec853f71c77b75b00be6f1f6..8249ea3459729df6bb55ca540e079844900ae695 100755 (executable)
@@ -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