Sandro Bonazzola has uploaded a new change for review. Change subject: master: add f22 and fix gluster 3.7 repo ......................................................................
master: add f22 and fix gluster 3.7 repo - Add Fedora 22 support for 3.6.0 - Move GlusterFS Nightly to GlusterFS 3.7 Nightly - Enable the whole virt-preview repo for Fedora 20 since also a newer qemu-kvm is now required. Change-Id: I8c35512d3363a417f19bf84ca101cd7bc9cd69c7 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt-release-master/Makefile.am M ovirt-release-master/configure.ac M ovirt-release-master/ovirt-el6-deps.repo.in M ovirt-release-master/ovirt-el7-deps.repo.in M ovirt-release-master/ovirt-f20-deps.repo.in M ovirt-release-master/ovirt-f21-deps.repo.in A ovirt-release-master/ovirt-f22-deps.repo.in M ovirt-release-master/ovirt-release-master.spec.in 8 files changed, 48 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-release refs/changes/75/40175/1 diff --git a/ovirt-release-master/Makefile.am b/ovirt-release-master/Makefile.am index aba6983..656d5ab 100644 --- a/ovirt-release-master/Makefile.am +++ b/ovirt-release-master/Makefile.am @@ -30,6 +30,7 @@ $(srcdir)/ovirt-el7-deps.repo \ $(srcdir)/ovirt-f20-deps.repo \ $(srcdir)/ovirt-f21-deps.repo \ + $(srcdir)/ovirt-f22-deps.repo \ $(srcdir)/ovirt-snapshot.repo \ $(NULL) diff --git a/ovirt-release-master/configure.ac b/ovirt-release-master/configure.ac index 1d89411..bae4690 100644 --- a/ovirt-release-master/configure.ac +++ b/ovirt-release-master/configure.ac @@ -24,7 +24,7 @@ AC_INIT([ovirt-release-master], VERSION_NUMBER[]VERSION_SUFFIX, [[email protected]]) PACKAGE_RPM_VERSION="VERSION_NUMBER" -PACKAGE_RPM_RELEASE="0.6.$(echo VERSION_SUFFIX | sed 's/^_//')" +PACKAGE_RPM_RELEASE="0.7.$(echo VERSION_SUFFIX | sed 's/^_//')" OVIRT_SLOT="master" AC_SUBST([PACKAGE_RPM_VERSION]) AC_SUBST([PACKAGE_RPM_RELEASE]) @@ -39,6 +39,7 @@ ovirt-el7-deps.repo ovirt-f20-deps.repo ovirt-f21-deps.repo + ovirt-f22-deps.repo ovirt-release-master.spec ovirt-snapshot.repo ]) diff --git a/ovirt-release-master/ovirt-el6-deps.repo.in b/ovirt-release-master/ovirt-el6-deps.repo.in index 4539694..6536343 100644 --- a/ovirt-release-master/ovirt-el6-deps.repo.in +++ b/ovirt-release-master/ovirt-el6-deps.repo.in @@ -16,9 +16,9 @@ includepkgs=dom4j,isorelax,jaxen,jdom,msv,msv-xsdlib,relaxngDatatype,servicemix-specs,tomcat5-servlet-2.4-api,ws-jaxme,xalan-j2,xml-commons,xml-commons-jaxp-1.2-apis,xml-commons-resolver11,xom,xpp2,xpp3,antlr3,stringtemplate gpgkey=http://www.jpackage.org/jpackage.asc -[ovirt-@OVIRT_SLOT@-glusterfs-epel-nightly] +[ovirt-@[email protected]] name=Nightly Gluster builds for EPEL 6 - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs/epel-6-$basearch/ +baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/epel-6-$basearch/ enabled=1 skip_if_unavailable=1 gpgcheck=0 diff --git a/ovirt-release-master/ovirt-el7-deps.repo.in b/ovirt-release-master/ovirt-el7-deps.repo.in index 88d3546..df73f31 100644 --- a/ovirt-release-master/ovirt-el7-deps.repo.in +++ b/ovirt-release-master/ovirt-el7-deps.repo.in @@ -8,9 +8,9 @@ gpgcheck=1 gpgkey=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 -[ovirt-@OVIRT_SLOT@-glusterfs-epel-nightly] +[ovirt-@[email protected]] name=Nightly Gluster builds for EPEL 7 - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs/epel-7-$basearch/ +baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/epel-7-$basearch/ enabled=1 skip_if_unavailable=1 gpgcheck=0 diff --git a/ovirt-release-master/ovirt-f20-deps.repo.in b/ovirt-release-master/ovirt-f20-deps.repo.in index 95a6bd2..d9e3245 100644 --- a/ovirt-release-master/ovirt-f20-deps.repo.in +++ b/ovirt-release-master/ovirt-f20-deps.repo.in @@ -1,6 +1,6 @@ -[ovirt-@OVIRT_SLOT@-glusterfs-fedora-nightly] +[ovirt-@[email protected]] name=Nightly Gluster builds for Fedora $releasever - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs/fedora-$releasever-$basearch/ +baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/fedora-$releasever-$basearch/ enabled=1 skip_if_unavailable=1 gpgcheck=0 @@ -34,4 +34,3 @@ enabled=1 skip_if_unavailable=1 gpgcheck=0 -includepkgs=libvirt* diff --git a/ovirt-release-master/ovirt-f21-deps.repo.in b/ovirt-release-master/ovirt-f21-deps.repo.in index 2072fd6..9f732b4 100644 --- a/ovirt-release-master/ovirt-f21-deps.repo.in +++ b/ovirt-release-master/ovirt-f21-deps.repo.in @@ -1,6 +1,6 @@ -[ovirt-@OVIRT_SLOT@-glusterfs-fedora-nightly] +[ovirt-@[email protected]] name=Nightly Gluster builds for Fedora $releasever - $basearch -baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs/fedora-$releasever-$basearch/ +baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/fedora-$releasever-$basearch/ enabled=1 skip_if_unavailable=1 gpgcheck=0 @@ -20,7 +20,6 @@ skip_if_unavailable=1 gpgcheck=1 gpgkey=http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/pub.key - [ovirt-@OVIRT_SLOT@-patternfly1] name=Copr repo for patternfly1 owned by patternfly diff --git a/ovirt-release-master/ovirt-f22-deps.repo.in b/ovirt-release-master/ovirt-f22-deps.repo.in new file mode 100644 index 0000000..9f732b4 --- /dev/null +++ b/ovirt-release-master/ovirt-f22-deps.repo.in @@ -0,0 +1,29 @@ +[ovirt-@[email protected]] +name=Nightly Gluster builds for Fedora $releasever - $basearch +baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs-3.7/fedora-$releasever-$basearch/ +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 + +[ovirt-@OVIRT_SLOT@-glusterfs-fedora] +name=GlusterFS is a clustered file-system capable of scaling to several petabytes. +baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-$releasever/$basearch/ +enabled=1 +skip_if_unavailable=1 +gpgcheck=1 +gpgkey=http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/pub.key + +[ovirt-@OVIRT_SLOT@-glusterfs-noarch-fedora] +name=GlusterFS is a clustered file-system capable of scaling to several petabytes. +baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-$releasever/noarch +enabled=1 +skip_if_unavailable=1 +gpgcheck=1 +gpgkey=http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/pub.key + +[ovirt-@OVIRT_SLOT@-patternfly1] +name=Copr repo for patternfly1 owned by patternfly +baseurl=http://copr-be.cloud.fedoraproject.org/results/patternfly/patternfly1/fedora-$releasever-$basearch/ +enabled=1 +skip_if_unavailable=1 +gpgcheck=0 diff --git a/ovirt-release-master/ovirt-release-master.spec.in b/ovirt-release-master/ovirt-release-master.spec.in index 96d66f5..0fad08a 100644 --- a/ovirt-release-master/ovirt-release-master.spec.in +++ b/ovirt-release-master/ovirt-release-master.spec.in @@ -79,6 +79,8 @@ install -m 644 "%{_datadir}/%{package_name}/ovirt-f20-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" elif [ "${DISTVER}" == "fc21" ]; then install -m 644 "%{_datadir}/%{package_name}/ovirt-f21-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" +elif [ "${DISTVER}" == "fc22" ]; then + install -m 644 "%{_datadir}/%{package_name}/ovirt-f22-deps.repo" "%{_sysconfdir}/yum.repos.d/ovirt-%{ovirt_version}-dependencies.repo" fi sed \ @@ -97,6 +99,12 @@ %changelog +* Thu Apr 23 2015 Sandro Bonazzola <[email protected]> - 001-0.7.master +- Add Fedora 22 support for 3.6.0 +- Move GlusterFS Nightly to GlusterFS 3.7 Nightly +- Enable the whole virt-preview repo for Fedora 20 since also a newer qemu-kvm + is now required. + * Fri Apr 3 2015 Sandro Bonazzola <[email protected]> - 001-0.6.master - Add userspace-rcu from EPEL, needed by Gluster 3.7 -- To view, visit https://gerrit.ovirt.org/40175 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c35512d3363a417f19bf84ca101cd7bc9cd69c7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-release Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
