From nobody Fri May 17 10:13:25 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=1618921869; cv=none; d=zohomail.com; s=zohoarc; b=UsYCSvprGLMat6LxR7VQpJLTgGdcsFkX2rJcq/z98hg1W+OEtPjLtNhjVNJz4d3GpQctl5K8b4XwzYnChUlds4PlTHxuU/FPv9rLLIIVno6c2C12Goonos725X+2tuanz0F2Utb5K6dGmIOsOQGa7N0NFVIjvX2AXgeIcEqgunc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618921869; 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=Onv1nDM6TCvD7km8MqbTRTRv6/zHqTYbWtruQDzWMlY=; b=cCFHTSi3XM7TxXa9K30zbtquQvfL/k/WMSm13vryj3DYrUsbWIVyGKnDjQB4lPg6tP/TXvrEZk7IbiL3JU4w6tY3UmRI+phgy5IVeTrXyspPhDpeaRn4BhDAr+cB6XOhTzW20bD2a7lX4dKgBnAJoPT7HVsM+XZsBN0fOPmVV50= 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 1618921869758265.35166076303256; Tue, 20 Apr 2021 05:31:09 -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-519-HLdGPp-AOuGqGT01oNFJHg-1; Tue, 20 Apr 2021 08:31:06 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22A05107ACCD; Tue, 20 Apr 2021 12:31:00 +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 1179019D9B; Tue, 20 Apr 2021 12:30:59 +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 7EF2D180B617; Tue, 20 Apr 2021 12:30:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13KCUuLa025256 for ; Tue, 20 Apr 2021 08:30:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id C3314BA6F; Tue, 20 Apr 2021 12:30:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.191]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A576610F3 for ; Tue, 20 Apr 2021 12:30:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618921868; 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=Onv1nDM6TCvD7km8MqbTRTRv6/zHqTYbWtruQDzWMlY=; b=d+ijYMh2FQm2yI/uEVXa/Ypg9M9g7fCFXV9GXwXEEpU70Wr+RxPADZhw0+8jIailJzWUkL deU6cBfXYx7fOPpDQkOsIn7B1WamzSdI5HMpo6qSddgC2By2uy57spoRFKCpgA5ZR6vxgh tMjBnGSF1PGAEhybRb7cgs5bHSXxazI= X-MC-Unique: HLdGPp-AOuGqGT01oNFJHg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 1/4] spec: Merge -admin package into -daemon Date: Tue, 20 Apr 2021 14:30:30 +0200 Message-Id: <20210420123033.471957-2-abologna@redhat.com> In-Reply-To: <20210420123033.471957-1-abologna@redhat.com> References: <20210420123033.471957-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.84 on 10.5.11.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It's useful to have virt-admin around when debugging issues with libvirtd, and since it's a tiny binary we can simply include it in the -daemon package to ensure it's always going to be available when needed. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- libvirt.spec.in | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f9af330186..db88b1bf3d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -430,6 +430,9 @@ Summary: Server side daemon and supporting files for li= bvirt library # The client side, i.e. shared libs are in a subpackage Requires: %{name}-libs =3D %{version}-%{release} =20 +# bash completion support for virt-admin +Requires: %{name}-bash-completion =3D %{version}-%{release} + # (client invokes 'nc' against the UNIX socket on the server) Requires: /usr/bin/nc =20 @@ -461,6 +464,10 @@ Requires: dbus # For uid creation during pre Requires(pre): shadow-utils =20 +# Ensure smooth upgrades +Obsoletes: libvirt-admin < 7.3.0 +Provides: libvirt-admin + %description daemon Server side daemon required to manage the virtualization capabilities of recent versions of Linux. Requires a hypervisor specific sub-RPM @@ -918,14 +925,6 @@ Requires: cyrus-sasl-gssapi %description libs Shared libraries for accessing the libvirt daemon. =20 -%package admin -Summary: Set of tools to control libvirt daemon -Requires: %{name}-libs =3D %{version}-%{release} -Requires: %{name}-bash-completion =3D %{version}-%{release} - -%description admin -The client side utilities to control the libvirt daemon. - %package bash-completion Summary: Bash completion script =20 @@ -1589,12 +1588,16 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtlogd %attr(0755, root, root) %{_sbindir}/virtlockd =20 +%{_mandir}/man1/virt-admin.1* %{_mandir}/man8/libvirtd.8* %{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtlockd.8* %{_mandir}/man8/virtproxyd.8* %{_mandir}/man7/virkey*.7* =20 +%{_bindir}/virt-admin +%{_datadir}/bash-completion/completions/virt-admin + %files daemon-config-network %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml @@ -1911,11 +1914,6 @@ exit 0 =20 %{_datadir}/libvirt/test-screenshot.png =20 -%files admin -%{_mandir}/man1/virt-admin.1* -%{_bindir}/virt-admin -%{_datadir}/bash-completion/completions/virt-admin - %files bash-completion %{_datadir}/bash-completion/completions/vsh =20 --=20 2.26.3 From nobody Fri May 17 10:13:25 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=1618921880; cv=none; d=zohomail.com; s=zohoarc; b=jtdJ36dC/8BtIzdNXYAANPJ6HHv3DtUz17JYVfQA+mo56jXq7rlIKYcrDE4mNzUzU26mEg2ubVJTPKcPc1HWTEnTbTWu8HgDtgTsyp159g7t1KAaAjcv+j8B9sBnXME1/2OA1DBhekZXgG9VxwLjEUfexhQ+csR37rQwv+Klmvw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618921880; 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=Y3b5R1XyURnVpsFB9QvwY7jrBiWBMY/29hiyP739/N4=; b=l5lK70/TJED4FD96v2ntX8+njVciB5akoxOINkoy/IZ8chGTp2iKlQxC9mbY/NbbTnAxFYtbLyjjMHDpnTm/H05PVuE8ySxb4Awt5pjUJAQAfooSuJItgavLZHT+qxYNgSsyIQAtK608W+JOtA3+qe7FvMta46v0BTFHprAVc1s= 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 1618921880635430.86625978803977; Tue, 20 Apr 2021 05:31:20 -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-271-eHQT7lpgN2W7lIIcamjFqw-1; Tue, 20 Apr 2021 08:31:14 -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 50848107ACF8; Tue, 20 Apr 2021 12:31:07 +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 2FC79648A1; Tue, 20 Apr 2021 12:31:07 +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 E398344A5E; Tue, 20 Apr 2021 12:31:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13KCUwq1025266 for ; Tue, 20 Apr 2021 08:30:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 141F71378D; Tue, 20 Apr 2021 12:30:58 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.191]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3169A2AE92 for ; Tue, 20 Apr 2021 12:30:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618921879; 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=Y3b5R1XyURnVpsFB9QvwY7jrBiWBMY/29hiyP739/N4=; b=W0165bneMBjrZNbiuw9td7yHnvP+r/5fwRhkRDuO8KwIeikdmXfoFX8EPUaeHc39GCxJ+G LrD6R6Vlu5jjHDtuNQGpBzvvS+8X2DzYG3z9iZ5PsD8+lhCPQf8rWGwmhMmxkFpEQYXxiH 1pIxAy7GZCjEhQjxVOlgGF0UR7nHEmU= X-MC-Unique: eHQT7lpgN2W7lIIcamjFqw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 2/4] spec: Move some files from -client to -daemon Date: Tue, 20 Apr 2021 14:30:31 +0200 Message-Id: <20210420123033.471957-3-abologna@redhat.com> In-Reply-To: <20210420123033.471957-1-abologna@redhat.com> References: <20210420123033.471957-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The -client package's purpose is enabling remote machines to connect to a virtualization host, but the virt-host-validate and libvirt-guests tools are designed to be run directly on the virtualization host and as such are a better fit for the -daemon package. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- libvirt.spec.in | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index db88b1bf3d..5bdf12898f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -463,6 +463,8 @@ Requires: numad Requires: dbus # For uid creation during pre Requires(pre): shadow-utils +# Needed by /usr/libexec/libvirt-guests.sh script. +Requires: gettext =20 # Ensure smooth upgrades Obsoletes: libvirt-admin < 7.3.0 @@ -904,8 +906,6 @@ capabilities of VirtualBox %package client Summary: Client side utilities of the libvirt library Requires: %{name}-libs =3D %{version}-%{release} -# Needed by /usr/libexec/libvirt-guests.sh script. -Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils Requires: %{name}-bash-completion =3D %{version}-%{release} @@ -1533,6 +1533,7 @@ exit 0 %{_unitdir}/virtlockd.service %{_unitdir}/virtlockd.socket %{_unitdir}/virtlockd-admin.socket +%{_unitdir}/libvirt-guests.service %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/sysconfig/virtproxyd %config(noreplace) %{_sysconfdir}/sysconfig/virtlogd @@ -1542,6 +1543,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf +%config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf =20 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd @@ -1587,14 +1589,17 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtproxyd %attr(0755, root, root) %{_sbindir}/virtlogd %attr(0755, root, root) %{_sbindir}/virtlockd +%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh =20 %{_mandir}/man1/virt-admin.1* +%{_mandir}/man1/virt-host-validate.1* %{_mandir}/man8/libvirtd.8* %{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtlockd.8* %{_mandir}/man8/virtproxyd.8* %{_mandir}/man7/virkey*.7* =20 +%{_bindir}/virt-host-validate %{_bindir}/virt-admin %{_datadir}/bash-completion/completions/virt-admin =20 @@ -1877,11 +1882,9 @@ exit 0 %{_mandir}/man1/virsh.1* %{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-pki-validate.1* -%{_mandir}/man1/virt-host-validate.1* %{_bindir}/virsh %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-validate -%{_bindir}/virt-host-validate =20 %{_datadir}/systemtap/tapset/libvirt_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp @@ -1891,11 +1894,6 @@ exit 0 =20 %{_datadir}/bash-completion/completions/virsh =20 - -%{_unitdir}/libvirt-guests.service -%config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests -%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh - %files libs -f %{name}.lang %license COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf --=20 2.26.3 From nobody Fri May 17 10:13:25 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=1618921884; cv=none; d=zohomail.com; s=zohoarc; b=P4ymM4M8PEqGc+TRra5k0mZANcZgnkQH8tt83i3KQPTi7nw5CjTnppc8/jez6TptJV/atcD56qesmiqjP8IzLzbmt6VCnjGgrve5ZYMuEYbaIvlV0yXNzbXcpXZ4T70AW86xR2OBD3bWZ4fh0FkZD3PeyljxWIZzDpXJaFK6lJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618921884; 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=1IKhJcvzixIrnB5Yy5Fjivp8OjGq9Dlew9LpLLBSuww=; b=Q5qESzQODFRB2VHv+F+TV6MH5Hq2MkHj2h021ZVdbMFe3ejk95j3rsb0V90GgsGSO/M9aZf3OMyBdUzkolxrQxrqf1KGEji98CeTPNJqIT+cLzxyE+aqBj2M9+SW6BouRnBijNIOH9bMTM/NV+InhDEEiWqZPZ4vz4+6JO9a4Qc= 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 1618921884237511.7268684637543; Tue, 20 Apr 2021 05:31:24 -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-241-VcTfCdxEOPSM1BvsxwD1eg-1; Tue, 20 Apr 2021 08:31:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4A440343AD; Tue, 20 Apr 2021 12:31:07 +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 215F45C1A1; Tue, 20 Apr 2021 12:31:07 +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 DA6E044A5C; Tue, 20 Apr 2021 12:31:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13KCUxAE025281 for ; Tue, 20 Apr 2021 08:30:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id D6E182B1CD; Tue, 20 Apr 2021 12:30:59 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.191]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D7B71610F4 for ; Tue, 20 Apr 2021 12:30:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618921882; 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=1IKhJcvzixIrnB5Yy5Fjivp8OjGq9Dlew9LpLLBSuww=; b=G7gKYtJe5qWX6/9wNuZT+dOJulkms8Uzm9BMvehKkACiuVa5wImNz6srswYjnXXPIk8e6o 9WXAo2dLANyGDqTpGpovQQu1ZYLw263F5Sa9+fQRg6VkFziC8ZORzQzFcV66jXgBaV/Tjk vMTsVEQll1mq3l0ohBEOVAf/Bwcu9bk= X-MC-Unique: VcTfCdxEOPSM1BvsxwD1eg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 3/4] spec: Move systemtap probes from -client to -libs Date: Tue, 20 Apr 2021 14:30:32 +0200 Message-Id: <20210420123033.471957-4-abologna@redhat.com> In-Reply-To: <20210420123033.471957-1-abologna@redhat.com> References: <20210420123033.471957-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Any application that uses the libraries can take advantage of the systemtap probes, so they should be shipped in the -libs package rather than in -client. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- libvirt.spec.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5bdf12898f..0fec79c133 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1886,12 +1886,6 @@ exit 0 %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-validate =20 -%{_datadir}/systemtap/tapset/libvirt_probes*.stp -%{_datadir}/systemtap/tapset/libvirt_functions.stp -%if %{with_qemu} -%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp -%endif - %{_datadir}/bash-completion/completions/virsh =20 %files libs -f %{name}.lang @@ -1906,6 +1900,12 @@ exit 0 %dir %{_datadir}/libvirt/schemas/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ =20 +%{_datadir}/systemtap/tapset/libvirt_probes*.stp +%{_datadir}/systemtap/tapset/libvirt_functions.stp +%if %{with_qemu} +%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp +%endif + %{_datadir}/libvirt/schemas/*.rng =20 %{_datadir}/libvirt/cpu_map/*.xml --=20 2.26.3 From nobody Fri May 17 10:13:25 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=1618921874; cv=none; d=zohomail.com; s=zohoarc; b=ivcHUcqRPLF3P8gv3YWfizokCP2rvWavtb/xpdWZ2M6W/ZZcczCXDECVYWNaGLF+WLbWgTYdggnfJbjkontW/NsnWaN4zimFWmCgpAgvNYYV0bIJhxEbr0/4t26O6I2quh4wejBBkhYhkvBoch/gx5WlLH5JoT+iRWCpiRh8kAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618921874; 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=te2WAW2e51MHuhJkQu8SNmZ3+xU7lGLOSjV1w/qEjIc=; b=Ev83CPxVfHxdoPGVRPBakeA/Dv5iwjoVgBSFuFzgT4SrShNVETYmxJwX6BfspYjTolL4FH5kuMj8Es+MqyNGtrmesSpJSa335RVAa+vCfHaDdGRb60fnWjpBNgBWW63zmRokirYtBMumQJFbTP6ybQfX81el52wK7AktX0QAhoc= 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 1618921874754275.2722713707627; Tue, 20 Apr 2021 05:31:14 -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-13-yr-RdzhcNfekXzx9qLM4yQ-1; Tue, 20 Apr 2021 08:31:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C27361008079; Tue, 20 Apr 2021 12:31:03 +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 962DF107D5C4; Tue, 20 Apr 2021 12:31:03 +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 591A61806D1D; Tue, 20 Apr 2021 12:31:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13KCV1Wr025290 for ; Tue, 20 Apr 2021 08:31:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3D160BA6F; Tue, 20 Apr 2021 12:31:01 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.191]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 52D77610F3 for ; Tue, 20 Apr 2021 12:31:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618921873; 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=te2WAW2e51MHuhJkQu8SNmZ3+xU7lGLOSjV1w/qEjIc=; b=F2+L5c/z/ZxePrAjrl4T6qaBXgcnNfKEZWWZatz+1GcTrGGPxin0NqMivXNIj2qWP3KWMy 33bWgnmFWW7uqn3LXoElKZv4ezKlsotOevk/zA+SU/KknZVPxOMVQlNLmRlI0IFOUtRvwQ Xbqf2bii3Bw5IO3OHbgT2DlIVX/jffg= X-MC-Unique: yr-RdzhcNfekXzx9qLM4yQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v3 4/4] spec: Drop -bash-completion package Date: Tue, 20 Apr 2021 14:30:33 +0200 Message-Id: <20210420123033.471957-5-abologna@redhat.com> In-Reply-To: <20210420123033.471957-1-abologna@redhat.com> References: <20210420123033.471957-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.84 on 10.5.11.22 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The completion script is so tiny that it makes more sense to potentially have two copies of it on disk than for it to have its own package. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- libvirt.spec.in | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0fec79c133..11abbb080e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -430,9 +430,6 @@ Summary: Server side daemon and supporting files for li= bvirt library # The client side, i.e. shared libs are in a subpackage Requires: %{name}-libs =3D %{version}-%{release} =20 -# bash completion support for virt-admin -Requires: %{name}-bash-completion =3D %{version}-%{release} - # (client invokes 'nc' against the UNIX socket on the server) Requires: /usr/bin/nc =20 @@ -469,6 +466,7 @@ Requires: gettext # Ensure smooth upgrades Obsoletes: libvirt-admin < 7.3.0 Provides: libvirt-admin +Obsoletes: libvirt-bash-completion < 7.3.0 =20 %description daemon Server side daemon required to manage the virtualization capabilities @@ -908,7 +906,9 @@ Summary: Client side utilities of the libvirt library Requires: %{name}-libs =3D %{version}-%{release} # Needed by virt-pki-validate script. Requires: gnutls-utils -Requires: %{name}-bash-completion =3D %{version}-%{release} + +# Ensure smooth upgrades +Obsoletes: libvirt-bash-completion < 7.3.0 =20 %description client The client binaries needed to access the virtualization @@ -925,12 +925,6 @@ Requires: cyrus-sasl-gssapi %description libs Shared libraries for accessing the libvirt daemon. =20 -%package bash-completion -Summary: Bash completion script - -%description bash-completion -Bash completion script stub. - %if %{with_wireshark} %package wireshark Summary: Wireshark dissector plugin for libvirt RPC transactions @@ -1296,6 +1290,17 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvi= rt_qemu_probes.stp \ %endif %endif =20 +# Turning these symlinks into regular files allows us to make the +# -client and -daemon packages, both of which need bash-completion +# support, completely independent by only paying a tiny price in +# terms of additional disk usage +for cmd in virsh virt-admin; do + rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/$cmd + cp $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/vsh \ + $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/$cmd +done +rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/vsh + %check # Building on slow archs, like emulated s390x in Fedora copr, requires # raising the test timeout @@ -1912,9 +1917,6 @@ exit 0 =20 %{_datadir}/libvirt/test-screenshot.png =20 -%files bash-completion -%{_datadir}/bash-completion/completions/vsh - %if %{with_wireshark} %files wireshark %{wireshark_plugindir}/libvirt.so --=20 2.26.3