From nobody Mon Apr 29 09:44:40 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=1603888594; cv=none; d=zohomail.com; s=zohoarc; b=WTwyn95xgeIx3Euo6PIewuv0uVZOSJPUOJVwCFJSI5AJKfXMUy5ipEptfESaaVie8MuowEIqk6ER7bFqA0JOYfVMKaSl915+s0Uupc/g4nWcCo5loS0+dDCZDWGmuBUv/u45vb6OqpnKcMcRoyeecxnKec7VPp8zyGCtZlT49Xg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603888594; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JHeprZIPM0wARuYadV9vrTOOzGULR6N272fW2Kup1Hw=; b=EjH4UO+5zF4YOanFAzjAKjAf9VLYSDH9oTB6L8wYOWWt+3PkVS8E6djW9HajgWiLK6MOPa2mlcRCEozY4II3dQiRHvSzXsdkPrkiyvP5+UsuPAUBQi79xTmMW3kOqWmYVLOHiZ1rxEQWqHTTNQF3VQoaTRUYlJNPedNHv58a9vI= 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 1603888594587982.9662576749115; Wed, 28 Oct 2020 05:36:34 -0700 (PDT) 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-38-E64OQ4rKNJiVe8mTKvDcVg-1; Wed, 28 Oct 2020 08:36:30 -0400 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 2B09364145; Wed, 28 Oct 2020 12:36:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E077960C11; Wed, 28 Oct 2020 12:36:23 +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 197A918408A1; Wed, 28 Oct 2020 12:36:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09SCUkUk015381 for ; Wed, 28 Oct 2020 08:30:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id F1D3F6EF62; Wed, 28 Oct 2020 12:30:46 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-216.ams2.redhat.com [10.36.113.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D62E6EF5F; Wed, 28 Oct 2020 12:30:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603888593; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JHeprZIPM0wARuYadV9vrTOOzGULR6N272fW2Kup1Hw=; b=i/MQGx6QAgb/QL/goDoLqrk01bl/ygddwopYaK/tMgeYPJ/EDAn02UZfnaxTj8GsVdaUK0 2su8qWGmnPg8WeUkM2AzQfNPBtcqr+iA8I47sMiHi4IzRoA7GNpEbr7HYrRQY/5Zhkfq0M WqbmQ5m95JeRTVhf57YrrCfDs2hHamA= X-MC-Unique: E64OQ4rKNJiVe8mTKvDcVg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] rpm: remove with_bash_completion condition Date: Wed, 28 Oct 2020 12:30:36 +0000 Message-Id: <20201028123037.666295-2-berrange@redhat.com> In-Reply-To: <20201028123037.666295-1-berrange@redhat.com> References: <20201028123037.666295-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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", thus any feature in the RPM which has a "with_XXX" condition, needs to explicitly pass a "-DXXX=3Dstate" arg to %meson to override the auto features setting. The with_bash_completion condition is always set to 1, so rather than adding an arg to %meson, just remove the condition. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Neal Gompa Reviewed-by: Pavel Hrdina --- libvirt.spec.in | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 84515cc7de..47fb53c681 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -94,7 +94,6 @@ %endif =20 # Other optional features -%define with_bash_completion 0%{!?_without_bash_completion:1} %define with_numactl 0%{!?_without_numactl:1} =20 # A few optional bits off by default, we enable later @@ -279,9 +278,7 @@ BuildRequires: glib2-devel >=3D 2.48 BuildRequires: libxml2-devel BuildRequires: libxslt BuildRequires: readline-devel -%if %{with_bash_completion} BuildRequires: bash-completion >=3D 2.0 -%endif BuildRequires: gettext BuildRequires: libtasn1-devel BuildRequires: gnutls-devel @@ -897,9 +894,7 @@ Requires: %{name}-libs =3D %{version}-%{release} Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils -%if %{with_bash_completion} Requires: %{name}-bash-completion =3D %{version}-%{release} -%endif =20 %description client The client binaries needed to access the virtualization @@ -919,20 +914,16 @@ Shared libraries for accessing the libvirt daemon. %package admin Summary: Set of tools to control libvirt daemon Requires: %{name}-libs =3D %{version}-%{release} -%if %{with_bash_completion} Requires: %{name}-bash-completion =3D %{version}-%{release} -%endif =20 %description admin The client side utilities to control the libvirt daemon. =20 -%if %{with_bash_completion} %package bash-completion Summary: Bash completion script =20 %description bash-completion Bash completion script stub. -%endif =20 %if %{with_wireshark} %package wireshark @@ -1855,9 +1846,7 @@ exit 0 %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %endif =20 -%if %{with_bash_completion} %{_datadir}/bash-completion/completions/virsh -%endif =20 =20 %{_unitdir}/libvirt-guests.service @@ -1885,14 +1874,10 @@ exit 0 %files admin %{_mandir}/man1/virt-admin.1* %{_bindir}/virt-admin -%if %{with_bash_completion} %{_datadir}/bash-completion/completions/virt-admin -%endif =20 -%if %{with_bash_completion} %files bash-completion %{_datadir}/bash-completion/completions/vsh -%endif =20 %if %{with_wireshark} %files wireshark --=20 2.26.2 From nobody Mon Apr 29 09:44:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1603888521; cv=none; d=zohomail.com; s=zohoarc; b=IMdhPUXYOjVs7UeusMzFdBbDVHo1W+fQA78HRt/c05KpuhVSVrP29mQ6MsCWxzwe2CjRfTANl+StvxpccXN9a2yzFbQ/tEdHiTBt3/2WzLgfFsAgXYttOakV2Mic3XhA28HpXLCVxOlul+xDyW0aKShQImZwzN0L2T5+/72RZuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603888521; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y0VuGJY2luS+4nk2/VZIBgCDU0aHOzC6PjTRGHHaXbI=; b=A5iR69rkAm7MPC7agWmZ5FHWuZiLOduC5Y6n5/gt8kmIGH4RhnwTQ62ZbybTDXMdFyl+9ahYUheganCdLrKWa7xGwNw28hCAwvulCrhnp8U29v+TCwc/S1OxpjR0UWxEkD2S8UlBERn/iAIkVSVZxGj7716dFvGZCfBEqPC29PY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603888521179469.2108853008501; Wed, 28 Oct 2020 05:35:21 -0700 (PDT) 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-553-5YRIRzp-OAiZCkJVsbitew-1; Wed, 28 Oct 2020 08:35:17 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 199BE804017; Wed, 28 Oct 2020 12:35:12 +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 D20F86EF6B; Wed, 28 Oct 2020 12:35:11 +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 0607E44A43; Wed, 28 Oct 2020 12:35:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09SCUmoZ015394 for ; Wed, 28 Oct 2020 08:30:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 367FB6EF65; Wed, 28 Oct 2020 12:30:48 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-216.ams2.redhat.com [10.36.113.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EFEB6EF5F; Wed, 28 Oct 2020 12:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603888520; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=y0VuGJY2luS+4nk2/VZIBgCDU0aHOzC6PjTRGHHaXbI=; b=dfgz/V54peqD/dmZo+emNvk8t21eT0pW5eWN3K3gMnyoLnZzEAJreuatOpbroM4G0iGR5J NDe1Z96BiRnuU86f+PZ+E79QussvB2i1b+IP46XEqjRcXYFVG25jkvR0EUi5UaQpiDV/Ff shuLATgjwWn9BM7B5BNfi2bMjmgDn1I= X-MC-Unique: 5YRIRzp-OAiZCkJVsbitew-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] rpm: tell meson whether to use libssh or libssh2 explicitly Date: Wed, 28 Oct 2020 12:30:37 +0000 Message-Id: <20201028123037.666295-3-berrange@redhat.com> In-Reply-To: <20201028123037.666295-1-berrange@redhat.com> References: <20201028123037.666295-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.13 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", thus any feature in the RPM which has a "with_XXX" condition, needs to explicitly pass a "-DXXX=3Dstate" arg to %meson to override the auto features setting. The with_libssh and with_libssh2 conditions were not exposed to meson, so if either was set disabled, then meson would fail the build if the -devel packages were not found. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- libvirt.spec.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 47fb53c681..8faa8c656f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1109,6 +1109,18 @@ exit 1 %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=3Ddisabled %endif =20 +%if %{with_libssh} + %define arg_libssh -Dlibssh=3Denabled +%else + %define arg_libssh -Dlibssh=3Ddisabled +%endif + +%if %{with_libssh2} + %define arg_libssh2 -Dlibssh2=3Denabled +%else + %define arg_libssh2 -Dlibssh2=3Ddisabled +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} --=20 2.26.2