From nobody Fri Dec 12 12:54:57 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=1763997490; cv=none; d=zohomail.com; s=zohoarc; b=UVO7JLyWM4zRc79Xe2rea8btcAcmTkk7+gyQPqRadvshz0yozrHMjdW/tTIm/JxRB5oDBuo9n5uOvXTjMjz3oR72rAX6YV2SPiBh/lzoQwKnt93sZqWS9+Mt4AioqxlCU8inYMyvKTNW+RCOqyvcgvBe+HvLxEAl1ZEsmfBOz2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763997490; 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=RlQKy0U/NKEp4PzfGoHLCbbx3O9dD2K0/lNk0y4qgLM=; b=XuqYbclEoHJ+Yz28mDxYydXQoEW6t8hyDEnvgOyypJdkfQ6djXqOkQikoCpN60/4Mp9LmFIj/2j15A1/jbMUZiADPbEv++ehRea5D4+2XfCVpC4pD1IV5txlethxWFgA4NBbuR3g+uILAu7diVK1rShyrBTZvRLAsF0bbbUbox8= 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 176399749040263.98704745610212; Mon, 24 Nov 2025 07:18:10 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id AC65A44485; Mon, 24 Nov 2025 10:18:09 -0500 (EST) Received: from [172.19.199.65] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 2F36C44473; Mon, 24 Nov 2025 10:17:28 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 56AE84440A; Mon, 24 Nov 2025 10:17:19 -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 59F9D443F3 for ; Mon, 24 Nov 2025 10:17:18 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-358-MGBgfPfmOYKjir8SsFFErA-1; Mon, 24 Nov 2025 10:17:16 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 61F2D1800447 for ; Mon, 24 Nov 2025 15:17:15 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.10]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AC96719560B2 for ; Mon, 24 Nov 2025 15:17:14 +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=1763997438; 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=RlQKy0U/NKEp4PzfGoHLCbbx3O9dD2K0/lNk0y4qgLM=; b=BXRWSsK2ZMnwosB/fO/tAbQltO7Y0iE2chbTtCs4OMTLiobpWnsOijvPObROeWc4j2VoNk LhVIyXAzS+St6zgIfDk7MbzmxnBW9np7qkdDyGeCE2O+JNavwomocaSB705YiNTruuTDtk Zqkc13ZzuYyKXGxupaNkUz7yhBfAekY= X-MC-Unique: MGBgfPfmOYKjir8SsFFErA-1 X-Mimecast-MFC-AGG-ID: MGBgfPfmOYKjir8SsFFErA_1763997435 To: devel@lists.libvirt.org Subject: [PATCH v3] spec: Fix 'libvirt-daemon-driver-storage-zfs' on Fedora 43 and newer Date: Mon, 24 Nov 2025 16:17:13 +0100 Message-ID: <060088b5b548ed63bca6bbb045a157acc0ca90d5.1763997408.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: vBJrf9k3JVmpNNFWcBOaYmoincVf0F04jcqhnvFA3Zk_1763997435 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 5WHNLB2DJ62QVVCTLWW7Y4YCSGASTPHK X-Message-ID-Hash: 5WHNLB2DJ62QVVCTLWW7Y4YCSGASTPHK 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: 1763997490777019200 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 - removes dependancy on '/sbin/zpool' and '/sbin/zfs' 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) Remove the dependency on the programs too. diff --git a/libvirt.spec.in b/libvirt.spec.in index 8314fbeb34..62af7fb517 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 @@ -770,9 +769,13 @@ volumes using the ceph protocol. Summary: Storage driver plugin for ZFS Requires: libvirt-daemon-driver-storage-core =3D %{version}-%{release} Requires: libvirt-libs =3D %{version}-%{release} -# Support any conforming implementation of zfs +# Starting with Fedora 43 the 'zfs-fuse' is no longer shipped but obtainab= le +# externally. The package builds fine without these. Users will have to pr= ovide +# their own implementation. + %if 0%{?fedora} && 0%{?fedora} < 43 Requires: /sbin/zfs Requires: /sbin/zpool + %endif %description daemon-driver-storage-zfs The storage driver backend adding implementation of the storage APIs for @@ -796,7 +799,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