From nobody Wed May 29 02:15:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1643804957; cv=none; d=zohomail.com; s=zohoarc; b=hdKUw2EkZDQoumPI5Rwv8z9lQfoGCyNSb6Uoe3H1HmqYZPAAFEiUbaSY/PmuK1Q7B2nIWxyfN2wyLqmLO7NJDGW8D+ZopoCrN9IyC680YlrlzZVbd9fDzocOEMC2uJHsjTy6ZoVeaYBbO0lbp4vRx3wRbNDg8vsKcMlGAMv5V+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643804957; 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=eQpqCpZThOE8iViGWEOD5Ws8UGSJykjL0tZ2SbvWXGo=; b=F9ukk147/ATurMzDKG6uqVSPcBKU9xKr2cLzTpVJ/tju4ZWM/fAVy7R2RHP2aY53qUmD5jtK7CVjjMVC97HgJN5lxrzpsZSQ9wWgphRnpnQnEUrpXtiN9EJdZtUlNIBhRSvMrIc4M1bMkF4LD9vFATlyIxi5KpKk0HT9KP6Bs34= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 164380495734130.71216068015815; Wed, 2 Feb 2022 04:29:17 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-468-chKZcRw3Mmi1oX_IrLtwsA-1; Wed, 02 Feb 2022 07:29:13 -0500 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 B23181083F64; Wed, 2 Feb 2022 12:29:07 +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 6B5D91086482; Wed, 2 Feb 2022 12:29: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 8979F1806D1C; Wed, 2 Feb 2022 12:29:04 +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 212CT2lU022503 for ; Wed, 2 Feb 2022 07:29:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id DF48B2377A; Wed, 2 Feb 2022 12:29:02 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.193.165]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E41223773 for ; Wed, 2 Feb 2022 12:29:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643804956; 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=eQpqCpZThOE8iViGWEOD5Ws8UGSJykjL0tZ2SbvWXGo=; b=CDRbJvgJ59x3H4IV/QPXWjZJS8dWwC3kRQqwdQFrLNDwWC4tk7Sc7xK4RWLVnqERel6FWW acn5DdbEcbXu4m8B4ZjjEumnAbPN1gEGIIEduEOIyNNSIXe8rZXcK8pviFFkCn4sxDlzd/ alA3t4b6vN+UWtLQ1HF57Qi0E4suXnM= X-MC-Unique: chKZcRw3Mmi1oX_IrLtwsA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] rpm: List one more directory Date: Wed, 2 Feb 2022 13:28:51 +0100 Message-Id: <20220202122853.190793-2-abologna@redhat.com> In-Reply-To: <20220202122853.190793-1-abologna@redhat.com> References: <20220202122853.190793-1-abologna@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.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) X-ZM-MESSAGEID: 1643804960600100001 Content-Type: text/plain; charset="utf-8" Commit 4b43da0bff9b missed it. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 4a56ace1d6..0cbdd45baf 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1910,6 +1910,7 @@ exit 0 %ghost %dir %{_rundir}/libvirt/qemu/ %ghost %dir %{_rundir}/libvirt/qemu/dbus/ %ghost %dir %{_rundir}/libvirt/qemu/slirp/ +%ghost %dir %{_rundir}/libvirt/qemu/swtpm/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvir= t/qemu/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvir= t/qemu/channel/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvir= t/qemu/channel/target/ --=20 2.34.1 From nobody Wed May 29 02:15:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1643804969; cv=none; d=zohomail.com; s=zohoarc; b=EDgZSLtFi39QH4suegWZpCnuQkksCZtUmwperr1fraKDXu52MUSCbOvjaCatDCBx1zAZa0fELKR6kBGN7pWXn+w+ksVQ/xLoOdaoaasE8W3dJ2kNl5iOWst2T5F5lHTBOJhedGENHu0DLvwAYmcQHT4HSQD6cTcJCPZO1xZJ5i0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643804969; 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=FF9aS6d7oMRKi05LCkgw5c0BlktaBMKYhARoFCU9nOo=; b=cUuWhSOsl5rm1g/XjYhez4Pej7rEIh0n2ZswmGSiFNIMdyxVE96V1NL7jFVcCol76GHMKFFx5oIZiTLeZp90XoNHBtMy5AfJFELbhKaHoq+bolfOmwcY5B9L0IoWpuJey+gBLdVpmjyIJTZorN1vAJZULyENGf3fmtGPVbF5wfc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1643804969330112.91415409362492; Wed, 2 Feb 2022 04:29:29 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-552-K02dNfADOPmqbJBGbxScWQ-1; Wed, 02 Feb 2022 07:29:27 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F07818B613D; Wed, 2 Feb 2022 12:29:22 +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 F0C2D6E1F5; Wed, 2 Feb 2022 12:29:21 +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 96CFF1806D2D; Wed, 2 Feb 2022 12:29:21 +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 212CT3CQ022513 for ; Wed, 2 Feb 2022 07:29:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id DEE0F2377A; Wed, 2 Feb 2022 12:29:03 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.193.165]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B50E23773 for ; Wed, 2 Feb 2022 12:29:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643804968; 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=FF9aS6d7oMRKi05LCkgw5c0BlktaBMKYhARoFCU9nOo=; b=I3dj3R9CXKhWGmOtZSKWP+hW6SWafUHJM6AzFNmkeoIS/lxO8hNIYaSA9lJK9HoyUvhVLF StUauVocf4KRnnkbZkL1NVtPViX5kXV4VH0BNRPYiS4JPAeMi2gVVvZRCYudCmpaJk+bYG nm4UV5ueXGA7fXjbd7rNVFzrT8Vz8Iw= X-MC-Unique: K02dNfADOPmqbJBGbxScWQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] meson: Sort virt_install_dirs Date: Wed, 2 Feb 2022 13:28:52 +0100 Message-Id: <20220202122853.190793-3-abologna@redhat.com> In-Reply-To: <20220202122853.190793-1-abologna@redhat.com> References: <20220202122853.190793-1-abologna@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.11 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) X-ZM-MESSAGEID: 1643804972605100001 Content-Type: text/plain; charset="utf-8" This will make subsequent patches nicer. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- src/libxl/meson.build | 2 +- src/lxc/meson.build | 2 +- src/qemu/meson.build | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 8347a3c966..91696d3490 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -80,7 +80,7 @@ if conf.has('WITH_LIBXL') =20 virt_install_dirs +=3D [ localstatedir / 'lib' / 'libvirt' / 'libxl', - runstatedir / 'libvirt' / 'libxl', localstatedir / 'log' / 'libvirt' / 'libxl', + runstatedir / 'libvirt' / 'libxl', ] endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build index c1f71b43e1..d399556abd 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -177,7 +177,7 @@ if conf.has('WITH_LXC') =20 virt_install_dirs +=3D [ localstatedir / 'lib' / 'libvirt' / 'lxc', - runstatedir / 'libvirt' / 'lxc', localstatedir / 'log' / 'libvirt' / 'lxc', + runstatedir / 'libvirt' / 'lxc', ] endif diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 5f82f687c1..b23c96353f 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -174,12 +174,12 @@ if conf.has('WITH_QEMU') endif =20 virt_install_dirs +=3D [ - localstatedir / 'lib' / 'libvirt' / 'qemu', - runstatedir / 'libvirt' / 'qemu', localstatedir / 'cache' / 'libvirt' / 'qemu', - localstatedir / 'log' / 'libvirt' / 'qemu', + localstatedir / 'lib' / 'libvirt' / 'qemu', localstatedir / 'lib' / 'libvirt' / 'swtpm', - runstatedir / 'libvirt' / 'qemu' / 'swtpm', + localstatedir / 'log' / 'libvirt' / 'qemu', localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + runstatedir / 'libvirt' / 'qemu', + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ] endif --=20 2.34.1 From nobody Wed May 29 02:15:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1643804971; cv=none; d=zohomail.com; s=zohoarc; b=NJMS92XczSNJbMqNzyMV35J6gZ0bcji5Tkfbosj7oY2OchVfc3Zu6AucE+os6vqlXtv0OHOwjVR9Tz172Xv6JLsSw7AnE13kefGJ7TQUYpqJGB3G6N4HXwl84+EW77DRwve/Nv6OkFdR4JJh+D7crk7S4gV+q/Q+6it6EQUWvEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643804971; 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=Zb5VRyCxV1t7zz0acGAg9JWjkkg10Bs+yUZq1DNCSY4=; b=d29SLtS7cNBNcTfSieMLfY5rQY/rqiqerOX9DwTscPx88UUksCJx6Cz263wEEoy8na1gyO3tJ5qUYPyM9mBDEBfEZi1MVyBPO2DL1GSHQBg+VtfKLxFK368ocS/zsynSY+ey9m+TJYjzizZTR2RzUU7UkGBE6wCUx3ZilgsypoU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1643804971356548.1698689245003; Wed, 2 Feb 2022 04:29:31 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-453-kLgL-9J_OvCUtIym3KZiyA-1; Wed, 02 Feb 2022 07:29:27 -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 356622F48; Wed, 2 Feb 2022 12:29:22 +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 170947B039; Wed, 2 Feb 2022 12:29:22 +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 DC8E34CA9B; Wed, 2 Feb 2022 12:29:21 +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 212CT4x3022521 for ; Wed, 2 Feb 2022 07:29:04 -0500 Received: by smtp.corp.redhat.com (Postfix) id DAB9423773; Wed, 2 Feb 2022 12:29:04 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.193.165]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 48E6E2378A for ; Wed, 2 Feb 2022 12:29:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643804970; 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=Zb5VRyCxV1t7zz0acGAg9JWjkkg10Bs+yUZq1DNCSY4=; b=aMq9u/Eu2PBhSKhgXrmBEe9ZZtnIdnjwWxvhtJMm40LuQkGCMUTw5TupKZxW1MuknCJrjb CAg7DTyuE+tWO/3F9m7oM3Ob6vNMiStJ3m4beeYYYeB1NDC9D0iyG+psvzcWUK9iU7viLD 9N6xdAeV2w7c9i4RyVCu70CcklVctYk= X-MC-Unique: kLgL-9J_OvCUtIym3KZiyA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] meson: Add missing virt_install_dirs Date: Wed, 2 Feb 2022 13:28:53 +0100 Message-Id: <20220202122853.190793-4-abologna@redhat.com> In-Reply-To: <20220202122853.190793-1-abologna@redhat.com> References: <20220202122853.190793-1-abologna@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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1643804972944100003 Content-Type: text/plain; charset="utf-8" We recently started listing these in the spec file and, since we were not creating them during the installation phase, that broke RPM builds. Fixes: 4b43da0bff9b78dcf1189388d4c89e524238b41d Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- src/ch/meson.build | 1 + src/interface/meson.build | 4 ++++ src/libxl/meson.build | 6 ++++++ src/lxc/meson.build | 2 ++ src/meson.build | 2 +- src/network/meson.build | 2 ++ src/node_device/meson.build | 4 ++++ src/nwfilter/meson.build | 6 ++++++ src/qemu/meson.build | 12 ++++++++++++ src/remote/meson.build | 2 ++ src/secret/meson.build | 5 +++++ src/storage/meson.build | 6 ++++++ 12 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/ch/meson.build b/src/ch/meson.build index a4bf0c6649..66b77907b0 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -65,6 +65,7 @@ if conf.has('WITH_CH') =20 virt_install_dirs +=3D [ localstatedir / 'lib' / 'libvirt' / 'ch', + localstatedir / 'log' / 'libvirt' / 'ch', runstatedir / 'libvirt' / 'ch', ] endif diff --git a/src/interface/meson.build b/src/interface/meson.build index f9f378aeb0..828f274422 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -54,4 +54,8 @@ if conf.has('WITH_INTERFACE') 'name': 'virtinterfaced', 'in_file': files('virtinterfaced.init.in') } + + virt_install_dirs +=3D [ + runstatedir / 'libvirt' / 'interface', + ] endif diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 91696d3490..0cc277db82 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -79,7 +79,13 @@ if conf.has('WITH_LIBXL') } =20 virt_install_dirs +=3D [ + confdir / 'libxl', + confdir / 'libxl' / 'autostart', localstatedir / 'lib' / 'libvirt' / 'libxl', + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel', + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target', + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump', + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save', localstatedir / 'log' / 'libvirt' / 'libxl', runstatedir / 'libvirt' / 'libxl', ] diff --git a/src/lxc/meson.build b/src/lxc/meson.build index d399556abd..99d4a34213 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -176,6 +176,8 @@ if conf.has('WITH_LXC') } =20 virt_install_dirs +=3D [ + confdir / 'lxc', + confdir / 'lxc' / 'autostart', localstatedir / 'lib' / 'libvirt' / 'lxc', localstatedir / 'log' / 'libvirt' / 'lxc', runstatedir / 'libvirt' / 'lxc', diff --git a/src/meson.build b/src/meson.build index fc6c77f5d1..3890df7124 100644 --- a/src/meson.build +++ b/src/meson.build @@ -210,7 +210,7 @@ openrc_init_files =3D [] =20 # virt_install_dirs: # list of directories to create during installation -virt_install_dirs =3D [] +virt_install_dirs =3D [ confdir ] =20 # driver_source_files: # driver source files to check diff --git a/src/network/meson.build b/src/network/meson.build index e7c43bc4c4..b5eff0c3ab 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -73,6 +73,8 @@ if conf.has('WITH_NETWORK') } =20 virt_install_dirs +=3D [ + confdir / 'qemu' / 'networks', + confdir / 'qemu' / 'networks' / 'autostart', localstatedir / 'lib' / 'libvirt' / 'network', localstatedir / 'lib' / 'libvirt' / 'dnsmasq', runstatedir / 'libvirt' / 'network', diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 5013d825b3..1c95975c37 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -62,4 +62,8 @@ if conf.has('WITH_NODE_DEVICES') 'name': 'virtnodedevd', 'in_file': files('virtnodedevd.init.in'), } + + virt_install_dirs +=3D [ + runstatedir / 'libvirt' / 'nodedev', + ] endif diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index ebbe712906..55cf8fcce4 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -61,5 +61,11 @@ if conf.has('WITH_NWFILTER') 'in_file': files('virtnwfilterd.init.in'), } =20 + virt_install_dirs +=3D [ + confdir / 'nwfilter', + runstatedir / 'libvirt' / 'nwfilter-binding', + runstatedir / 'libvirt' / 'nwfilter', + ] + subdir('xml') endif diff --git a/src/qemu/meson.build b/src/qemu/meson.build index b23c96353f..3ea084cff8 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -174,12 +174,24 @@ if conf.has('WITH_QEMU') endif =20 virt_install_dirs +=3D [ + confdir / 'qemu', + confdir / 'qemu' / 'autostart', localstatedir / 'cache' / 'libvirt' / 'qemu', localstatedir / 'lib' / 'libvirt' / 'qemu', + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel', + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target', + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint', + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump', + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram', + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram', + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save', + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot', localstatedir / 'lib' / 'libvirt' / 'swtpm', localstatedir / 'log' / 'libvirt' / 'qemu', localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', runstatedir / 'libvirt' / 'qemu', + runstatedir / 'libvirt' / 'qemu' / 'dbus', + runstatedir / 'libvirt' / 'qemu' / 'slirp', runstatedir / 'libvirt' / 'qemu' / 'swtpm', ] endif diff --git a/src/remote/meson.build b/src/remote/meson.build index fc98d0e5be..b2aafe6320 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -236,6 +236,8 @@ if conf.has('WITH_REMOTE') =20 virt_install_dirs +=3D [ localstatedir / 'log' / 'libvirt', + runstatedir / 'libvirt', + runstatedir / 'libvirt' / 'common', ] =20 logrotate_conf =3D configuration_data() diff --git a/src/secret/meson.build b/src/secret/meson.build index efc0ebb1e6..1bda59849b 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -43,4 +43,9 @@ if conf.has('WITH_SECRETS') 'name': 'virtsecretd', 'in_file': files('virtsecretd.init.in'), } + + virt_install_dirs +=3D [ + confdir / 'secrets', + runstatedir / 'libvirt' / 'secrets', + ] endif diff --git a/src/storage/meson.build b/src/storage/meson.build index c43707461d..26e7ff1a1a 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -125,6 +125,12 @@ if conf.has('WITH_STORAGE') 'name': 'virtstoraged', 'in_file': files('virtstoraged.init.in'), } + + virt_install_dirs +=3D [ + confdir / 'storage', + confdir / 'storage' / 'autostart', + runstatedir / 'libvirt' / 'storage', + ] endif =20 if conf.has('WITH_STORAGE_DISK') --=20 2.34.1