Don't use ceph-devel on Fedora

[libvirt] [PATCH] Don't use ceph-devel on Fedora

Posted by Daniel P. Berrange 6 years, 11 months ago

A previous commit changed the spec to use librbd1-devel on
RHEL-7, since this replaces ceph-devel from RHEL-6:

  commit 6cfc8834c858849cc74c3082078dc91fb1cbae38
  Author: Peter Krempa <pkrempa@redhat.com>
  Date:   Thu Mar 5 11:40:54 2015 +0100

    spec: Enable RBD storage driver in RHEL-7

    Use correct package names too as they differ.

RHEL-7 inherited this split from Fedora though, so it should
have also made Fedora use the new names.

This was missed, because Fedora still provides a (deprecated)
back-compat RPM for ceph-devel that just pulls in librbd1-devel
(and others).

Fixing this stops libvirt pulling Java into the build root in
Fedora.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 libvirt.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index b249224..4c7b658 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -359,7 +359,7 @@ BuildRequires: parted-devel
 # For Multipath support
 BuildRequires: device-mapper-devel
 %if %{with_storage_rbd}
-    %if 0%{?rhel} >= 7
+    %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires: librados2-devel
 BuildRequires: librbd1-devel
     %else
-- 
2.9.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] Don't use ceph-devel on Fedora

Posted by Pavel Hrdina 6 years, 11 months ago

On Mon, May 08, 2017 at 10:56:47AM +0100, Daniel P. Berrange wrote:
> A previous commit changed the spec to use librbd1-devel on
> RHEL-7, since this replaces ceph-devel from RHEL-6:
> 
>   commit 6cfc8834c858849cc74c3082078dc91fb1cbae38
>   Author: Peter Krempa <pkrempa@redhat.com>
>   Date:   Thu Mar 5 11:40:54 2015 +0100
> 
>     spec: Enable RBD storage driver in RHEL-7
> 
>     Use correct package names too as they differ.
> 
> RHEL-7 inherited this split from Fedora though, so it should
> have also made Fedora use the new names.
> 
> This was missed, because Fedora still provides a (deprecated)
> back-compat RPM for ceph-devel that just pulls in librbd1-devel
> (and others).
> 
> Fixing this stops libvirt pulling Java into the build root in
> Fedora.
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  libvirt.spec.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list