From nobody Mon Apr 29 14:16:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604321150; cv=none; d=zohomail.com; s=zohoarc; b=TPABLjHWHmMhMPsGv7ywLoAzER3hW5G03LCwe686x28+MuEjvKK3Hix1Gd8VoVTdHOk5CpJWA2TQRb4GUk5XD3K54GSb/ofCfUIIZjwDYdHEnjYI169e7vD4fJvqm+a/oRKI7fipwP3D6TZ+6rUYQjoMC06Bw4GEtgv9eJ5FDj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604321150; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=8q13de6A5NDRZtpX7MD2pTC09J6WMh4Fk4B184dj/Nc=; b=UZ27KI+o8yRiWQZGHTtZfDm2CdbuVg7NQjJKTIszJOWWmv85kA0G5m1f18KLiJ9MwSbp+9Snb2I22h5ch8LLpPKIxK/FTkIFORGThv1sZ611kqjJ4dsHc5XdYxHP+xGoyNBVaj1l812oDelnrjHoQiYQvHwuO3spKeHLCONnkro= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604321150033333.14087061967564; Mon, 2 Nov 2020 04:45:50 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-374-ijMiBpt_NCiIuHfDRx5qQw-1; Mon, 02 Nov 2020 07:45:45 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC2D51A2C453; Mon, 2 Nov 2020 12:45:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A073360CCC; Mon, 2 Nov 2020 12:45:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4FD7D86BE9; Mon, 2 Nov 2020 12:45:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A2CjVcs023623 for ; Mon, 2 Nov 2020 07:45:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id 85EB421E8C; Mon, 2 Nov 2020 12:45:31 +0000 (UTC) Received: from fedora.redhat.com (ovpn-114-136.ams2.redhat.com [10.36.114.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8501921E96; Mon, 2 Nov 2020 12:45:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604321148; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8q13de6A5NDRZtpX7MD2pTC09J6WMh4Fk4B184dj/Nc=; b=BlWp36T7HIfdP8c82Y6ynXmbQr5JL8/XQUuOTIYD/fXnvLSO8SmCOrvRADz7pdmbMcGoeK 17IQhpaqyWOJvZjpZE8vWlvTBZVQ/lzNDOLMuShTDH8PWYAGVI4ywlJcVSb/6FeCRcMVWo LFZhDNpN2+lzjlVu2guXr4MBxOo/E5M= X-MC-Unique: ijMiBpt_NCiIuHfDRx5qQw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH] rpm: more fixes for disabling features Date: Mon, 2 Nov 2020 12:45:21 +0000 Message-Id: <20201102124521.159433-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The %meson macro sets "--auto-features=3Denabled", so it is not enough to disable the driver options, we must also disable any library options which the drivers depend on. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- libvirt.spec.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 06afd0dab8..1b6a9596d8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1026,15 +1026,15 @@ exit 1 %endif =20 %if %{with_esx} - %define arg_esx -Ddriver_esx=3Denabled + %define arg_esx -Ddriver_esx=3Denabled -Dcurl=3Denabled %else - %define arg_esx -Ddriver_esx=3Ddisabled + %define arg_esx -Ddriver_esx=3Ddisabled -Dcurl=3Ddisabled %endif =20 %if %{with_hyperv} - %define arg_hyperv -Ddriver_hyperv=3Denabled + %define arg_hyperv -Ddriver_hyperv=3Denabled -Dopenwsman=3Denabled %else - %define arg_hyperv -Ddriver_hyperv=3Ddisabled + %define arg_hyperv -Ddriver_hyperv=3Ddisabled -Dopenwsman=3Ddisabled %endif =20 %if %{with_vmware} @@ -1056,9 +1056,9 @@ exit 1 %endif =20 %if %{with_storage_gluster} - %define arg_storage_gluster -Dstorage_gluster=3Denabled + %define arg_storage_gluster -Dstorage_gluster=3Denabled -Dglusterfs=3D= enabled %else - %define arg_storage_gluster -Dstorage_gluster=3Ddisabled + %define arg_storage_gluster -Dstorage_gluster=3Ddisabled -Dglusterfs= =3Ddisabled %endif =20 %if %{with_storage_zfs} @@ -1104,9 +1104,9 @@ exit 1 %endif =20 %if %{with_storage_iscsi_direct} - %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=3Denabled + %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=3Denabled -Dli= biscsi=3Denabled %else - %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=3Ddisabled + %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=3Ddisabled -Dl= ibiscsi=3Ddisabled %endif =20 %if %{with_libssh} --=20 2.28.0