The logic to disable Ceph on 32-bit was protected by a Fedora
conditional. This is redundant as RHEL doesn't build on 32-bit
platforms for years.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
libvirt.spec.in | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index e64cfdb561..5193a7cf89 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -117,11 +117,9 @@
%define with_storage_zfs 0
%endif
-# Ceph dropping support for 32-bit hosts
-%if 0%{?fedora} >= 30
- %ifarch %{arm} %{ix86}
- %define with_storage_rbd 0
- %endif
+# Ceph dropped support for 32-bit hosts
+%ifarch %{arm} %{ix86}
+ %define with_storage_rbd 0
%endif
# RHEL doesn't ship OpenVZ, VBox, PowerHypervisor,
--
2.26.2
On Fri, Aug 21, 2020 at 12:30:09 +0100, Daniel P. Berrangé wrote: > The logic to disable Ceph on 32-bit was protected by a Fedora > conditional. This is redundant as RHEL doesn't build on 32-bit > platforms for years. But libvirt is still built on i686 even on RHEL for 32b libraries. And this includes libvirt-daemon-driver-storage-rbd sub-package. Actually looking at the spec file, we even build libvirtd on i686 RHEL. I think we would need a bigger change to make sure we only build what's really needed on i686, i.e., no libvirtd, no drivers usable only in libvirtd, etc. Jirka
On Tue, Aug 25, 2020 at 12:11:30AM +0200, Jiri Denemark wrote: > On Fri, Aug 21, 2020 at 12:30:09 +0100, Daniel P. Berrangé wrote: > > The logic to disable Ceph on 32-bit was protected by a Fedora > > conditional. This is redundant as RHEL doesn't build on 32-bit > > platforms for years. > > But libvirt is still built on i686 even on RHEL for 32b libraries. And > this includes libvirt-daemon-driver-storage-rbd sub-package. Actually > looking at the spec file, we even build libvirtd on i686 RHEL. I should have clarified, that it isn't shipped on 32-bit for RHEL, just built to get multi-lib libraries. > I think we would need a bigger change to make sure we only build what's > really needed on i686, i.e., no libvirtd, no drivers usable only in > libvirtd, etc. I don't think we need todo that unless something breaks, as that just adds more complexity to the spec file. This change is simplifying by removing conditionals for ceph. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Tue, Aug 25, 2020 at 09:43:28 +0100, Daniel P. Berrangé wrote: > On Tue, Aug 25, 2020 at 12:11:30AM +0200, Jiri Denemark wrote: > > On Fri, Aug 21, 2020 at 12:30:09 +0100, Daniel P. Berrangé wrote: > > > The logic to disable Ceph on 32-bit was protected by a Fedora > > > conditional. This is redundant as RHEL doesn't build on 32-bit > > > platforms for years. > > > > But libvirt is still built on i686 even on RHEL for 32b libraries. And > > this includes libvirt-daemon-driver-storage-rbd sub-package. Actually > > looking at the spec file, we even build libvirtd on i686 RHEL. > > I should have clarified, that it isn't shipped on 32-bit for RHEL, > just built to get multi-lib libraries. Hmm, yes, I got confused and lost when looking at the huge list of libvirt packages. I saw the i686 packages there and didn't realize I was already looking at the "don't ship" part of the list. Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
© 2016 - 2024 Red Hat, Inc.