Sandro Bonazzola has uploaded a new change for review. Change subject: 3.5 - gluster: add userspace-rcu from EPEL ......................................................................
3.5 - gluster: add userspace-rcu from EPEL Gluster 3.7.0 has been released and is hitting 3.5 existing deployments requiring userspace-rcu from EPEL. Change-Id: I5edb767b1d7521d1babcd59e7169629db8995802 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> Reported-By: Stefano Danzi <s.da...@hawai.it> --- M ovirt-release-3.5/configure.ac M ovirt-release-3.5/ovirt-el6-deps.repo.in M ovirt-release-3.5/ovirt-el7-deps.repo.in M ovirt-release-3.5/ovirt-release35.spec.in 4 files changed, 17 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/14/41114/1 diff --git a/ovirt-release-3.5/configure.ac b/ovirt-release-3.5/configure.ac index c6a98fa..4352a8b 100644 --- a/ovirt-release-3.5/configure.ac +++ b/ovirt-release-3.5/configure.ac @@ -18,7 +18,7 @@ dnl -define([VERSION_NUMBER], [003]) +define([VERSION_NUMBER], [004]) define([VERSION_SUFFIX], []) define([OVIRT_VERSION_MAJOR], [3]) define([OVIRT_VERSION_MINOR], [5]) diff --git a/ovirt-release-3.5/ovirt-el6-deps.repo.in b/ovirt-release-3.5/ovirt-el6-deps.repo.in index 1cc6652..ae3ce7d 100644 --- a/ovirt-release-3.5/ovirt-el6-deps.repo.in +++ b/ovirt-release-3.5/ovirt-el6-deps.repo.in @@ -21,14 +21,16 @@ baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/$basearch/ enabled=1 skip_if_unavailable=1 -gpgcheck=0 +gpgcheck=1 +gpgkey=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/pub.key [ovirt-@OVIRT_SLOT@-glusterfs-noarch-epel] name=GlusterFS is a clustered file-system capable of scaling to several petabytes. baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/noarch enabled=1 skip_if_unavailable=1 -gpgcheck=0 +gpgcheck=1 +gpgkey=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/pub.key [ovirt-@OVIRT_SLOT@-patternfly1-noarch-epel] name=Copr repo for patternfly1 owned by patternfly diff --git a/ovirt-release-3.5/ovirt-el7-deps.repo.in b/ovirt-release-3.5/ovirt-el7-deps.repo.in index 0c54322..9a4959d 100644 --- a/ovirt-release-3.5/ovirt-el7-deps.repo.in +++ b/ovirt-release-3.5/ovirt-el7-deps.repo.in @@ -4,7 +4,7 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch failovermethod=priority enabled=1 -includepkgs=epel-release,python-uinput,puppet,python-lockfile,python-cpopen,python-ordereddict,python-pthreading,python-inotify,python-argparse,novnc,python-ply,python-kitchen,python-daemon,python-websockify,livecd-tools,spice-html5,mom,python-IPy,python-ioprocess,ioprocess,python-paramiko,python-crypto,python-cheetah,python-ecdsa,python-markdown,rubygem-rgen,ovirt-guest-agent +includepkgs=epel-release,python-uinput,puppet,python-lockfile,python-cpopen,python-ordereddict,python-pthreading,python-inotify,python-argparse,novnc,python-ply,python-kitchen,python-daemon,python-websockify,livecd-tools,spice-html5,mom,python-IPy,python-ioprocess,ioprocess,python-paramiko,python-crypto,python-cheetah,python-ecdsa,python-markdown,rubygem-rgen,ovirt-guest-agent,userspace-rcu, protobuf-java gpgcheck=1 gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 @@ -13,14 +13,16 @@ baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/$basearch/ enabled=1 skip_if_unavailable=1 -gpgcheck=0 +gpgcheck=1 +gpgkey=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/pub.key [ovirt-@OVIRT_SLOT@-glusterfs-noarch-epel] name=GlusterFS is a clustered file-system capable of scaling to several petabytes. baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/noarch enabled=1 skip_if_unavailable=1 -gpgcheck=0 +gpgcheck=1 +gpgkey=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/pub.key [ovirt-@OVIRT_SLOT@-patternfly1-noarch-epel] name=Copr repo for patternfly1 owned by patternfly diff --git a/ovirt-release-3.5/ovirt-release35.spec.in b/ovirt-release-3.5/ovirt-release35.spec.in index efec2b4..39bade4 100644 --- a/ovirt-release-3.5/ovirt-release35.spec.in +++ b/ovirt-release-3.5/ovirt-release35.spec.in @@ -37,8 +37,8 @@ BuildRequires: automake BuildRequires: autoconf -Requires: system-release -Requires: tar +Requires: system-release +Requires: tar %description This package contains the yum configuration for oVirt repositories @@ -89,8 +89,8 @@ if [ "${DISTVER}" == "el6" ] ; then install -m 644 "%{_datadir}/%{package_name}/ovirt-el6-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" -elif [ "${DISTVER/.*/}" == "el7" ] ; then - # On CentOS 7 ${DISTVER} is "el7.centos" +elif [[ "${DISTVER::3}" == "el7" ]] ; then + # On some systems [el7_1], take only 3 1st chars: ${var::3} install -m 644 "%{_datadir}/%{package_name}/ovirt-el7-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" elif [ "${DISTVER}" == "fc19" ]; then install -m 644 "%{_datadir}/%{package_name}/ovirt-f19-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" @@ -132,6 +132,9 @@ %changelog +* Tue May 19 2015 Sandro Bonazzola <sbona...@redhat.com> - 004-1 +- Add userspace-rcu from EPEL, needed by Gluster 3.7 + * Tue Apr 14 2015 Sandro Bonazzola <sbona...@redhat.com> - 003-1 - Added fedora-virt-preview libvirt to fedora 20 -- To view, visit https://gerrit.ovirt.org/41114 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5edb767b1d7521d1babcd59e7169629db8995802 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-release Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
