From nobody Fri Dec 12 12:55:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1763995913; cv=none; d=zohomail.com; s=zohoarc; b=YBh0AITX6GSm4k+wNs3wq8btQsD01ppsitHdDQ2YAguY3vT3M0TZ3CGIHr7Uqx3j3ZQHwheO4ozintqxUyv8xPaU+FKdyzlEjG+86jWdQBvAXS99JMdlZHYV4d1Mt2mYMorthfaiGoH4Ij/+qz4V3z6s3LMiPQZ9wD8VsgDmd4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763995913; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id:Cc; bh=jV8XeUKjgUop7qip89quPwJU2PuSMdyapV/nu5u1fEs=; b=Dkqnqzg3jYPvPWC3OOLnJ7EWBEK5WonPI8eEcYgkkxhoMGKsEVUiCtBRtPVx02QlvM902l1a+rU1btlVMSPAMxrabxz9oqzS9PU3EjnzJZA+D3jdzH1DNlCoIk+kYC9o0Edz+R5V5FphEwGrsnta1xFQX6POwMSVtC4y6fsBLWU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1763995913300859.3906246094773; Mon, 24 Nov 2025 06:51:53 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 716033F9A4; Mon, 24 Nov 2025 09:51:52 -0500 (EST) Received: from [172.19.199.65] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0C16D446B4; Mon, 24 Nov 2025 09:50:43 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 2DBD941C62; Mon, 24 Nov 2025 09:50:30 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E944241C5E for ; Mon, 24 Nov 2025 09:50:28 -0500 (EST) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-324-IcR1xAhhMXShqlKUnROlRg-1; Mon, 24 Nov 2025 09:50:26 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0F6A31956048 for ; Mon, 24 Nov 2025 14:50:26 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.10]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 589551956056 for ; Mon, 24 Nov 2025 14:50:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763995828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jV8XeUKjgUop7qip89quPwJU2PuSMdyapV/nu5u1fEs=; b=c6LqumTysC2FYcS7yFznx2q8KIaB4Guvse531jzkfE67j0QzJ5M5Vi74ErX1l7N/ppCCI7 Jmk3N3ErRovCA3hjvv8NriGQLQuicYoRF4r36ceoPEFdYUeXCqBNDpWmv/rttABYPv/pkT ziYw/WqpOtxYLid+jKIzLsSUYevqrnU= X-MC-Unique: IcR1xAhhMXShqlKUnROlRg-1 X-Mimecast-MFC-AGG-ID: IcR1xAhhMXShqlKUnROlRg_1763995826 To: devel@lists.libvirt.org Subject: [PATCH v2] spec: Fix 'libvirt-daemon-driver-storage-zfs' on Fedora 43 and newer Date: Mon, 24 Nov 2025 15:50:23 +0100 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: H6F-cQHxg246xr8VbqH-_zbUKdTkCmUgAqvDJebPJ8E_1763995826 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EWO3TKNOZRXKRPNTHHIOT33QMBNY63SN X-Message-ID-Hash: EWO3TKNOZRXKRPNTHHIOT33QMBNY63SN X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1763995916797019200 Content-Type: text/plain; charset="utf-8" From: Peter Krempa On Fedora 43 and newer the 'fuse-zfs' package was removed. Commit bd30147e740 added an 'Obsoletes' directive so that the storage driver core package will update properly but hardcoded the obsoleted version as 11.4 (when the change was comitted) similarly to the old sheepdog/rbd packages and disabled the build. Now it is still possible to obtain ZFS support from other means and it may be useful for users to have libvirt's ZFS backend. This patch thus: - re-enables build of 'libvirt-daemon-driver-storage-zfs' on Fedora - removes 'libvirt-daemon-driver-storage-zfs' as 'Requires dependency from 'daemon-driver-storage' meta-package on Fedora 43 and newer With this the package still is built and installable but will require users to get their ZFS support installed somehow. Fixes: bd30147e740d49fdb5844160e480ca34611f75e5 Signed-off-by: Peter Krempa --- libvirt.spec.in | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) I originally thought that the 'Requires' dependancy requiring /sbin/zpool and /sbin/zfs would need to be dropped but even without 'zfs-fuse' on F43 it builds fine. diff --git a/libvirt.spec.in b/libvirt.spec.in index 8314fbeb34..1bfe7d715b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -76,8 +76,10 @@ %define with_storage_gluster 0 %endif -# Fedora had zfs-fuse until F43 -%if 0%{?fedora} && 0%{?fedora} < 43 +# On Fedora 43, the 'zfs-fuse' package was removed, but is obtainable via +# other means. Build the backend, but it's no longer considered to be part +# of 'daemon-driver-storage'. +%if 0%{?fedora} %define with_storage_zfs 0%{!?_without_storage_zfs:1} %else %define with_storage_zfs 0 @@ -667,9 +669,6 @@ Requires: /usr/bin/qemu-img Obsoletes: libvirt-daemon-driver-storage-rbd < 5.2.0 %endif Obsoletes: libvirt-daemon-driver-storage-sheepdog < 8.8.0 - %if !%{with_storage_zfs} -Obsoletes: libvirt-daemon-driver-storage-zfs < 11.4.0 - %endif %description daemon-driver-storage-core The storage driver plugin for the libvirtd daemon, providing @@ -796,7 +795,10 @@ Requires: libvirt-daemon-driver-storage-gluster =3D %{= version}-%{release} %if %{with_storage_rbd} Requires: libvirt-daemon-driver-storage-rbd =3D %{version}-%{release} %endif - %if %{with_storage_zfs} +# Starting with Fedora 43 the 'zfs-fuse' is no longer shipped but obtainab= le +# externally. We do not want to install this as part of 'daemon-driver-sto= rage' +# any more. + %if %{with_storage_zfs} && 0%{?fedora} && 0%{?fedora} < 43 Requires: libvirt-daemon-driver-storage-zfs =3D %{version}-%{release} %endif --=20 2.51.1