From nobody Mon Feb 9 09:32:57 2026 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=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1670977893; cv=none; d=zohomail.com; s=zohoarc; b=je44kCGmSrYWuGBh7NhdsMIR2gkx+jr/5o2imA0JBA1nHhebkZ7kIW3EKUhjvYqwLbahNCydTgcOxCcropf4pRDMDm5ZjfUy1Z77NnZ68vPrs8p4Rad+ZRncwk0OJjv4SelSpwaCXOq6u82j47SNX58/OC4/fty41/B/XeRuPdM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670977893; 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=1V3RqhJu+a1hW6oi9t+yVf1edk+X3T2+MCatNyiJLkw=; b=cx2mEqRCtqI2ekFctdZwOQdUfft0zc6mGztZi4bNOk+aZvM8KvkG7UUrOVjgqliJsnDA/Sb1pXwdNiHoT8C944w+IdFukCDiriNh2IKageENVhXM6D55hlhiuSKr7LcbGDWRb+hR7trPfzMko5ehZIeh19tTxo4yrTpCfJzsOKk= 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=fail header.from= (p=quarantine dis=quarantine) 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 1670977893097574.3825471351535; Tue, 13 Dec 2022 16:31:33 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-292-okFbaz5JMI2JGcX0jF3Wiw-1; Tue, 13 Dec 2022 19:31:28 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06EE68032E6; Wed, 14 Dec 2022 00:31:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4AF32166B26; Wed, 14 Dec 2022 00:31:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CFE1419465B3; Wed, 14 Dec 2022 00:31:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 532B9194658F for ; Wed, 14 Dec 2022 00:31:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 43C33492B02; Wed, 14 Dec 2022 00:31:26 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3BCA9492B00 for ; Wed, 14 Dec 2022 00:31:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1D5808339C6 for ; Wed, 14 Dec 2022 00:31:26 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2044.outbound.protection.outlook.com [40.107.6.44]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-13-y9k_Wy_LNRK3vP3tOQZoGw-2; Tue, 13 Dec 2022 19:31:22 -0500 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by AM9PR04MB8906.eurprd04.prod.outlook.com (2603:10a6:20b:409::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.11; Wed, 14 Dec 2022 00:31:21 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f%7]) with mapi id 15.20.5880.019; Wed, 14 Dec 2022 00:31:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670977892; 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=1V3RqhJu+a1hW6oi9t+yVf1edk+X3T2+MCatNyiJLkw=; b=Ne0Goy5UMM4iOuxxTtIcdMovy0FkGQd8VWpivKmZQWvSm2+q434SoOTn5tMXi9oPcariT4 dCvjxgYrG29w96vVCPNJ1ojV/UslHzVqTXN1ZNElJ/euwoULqQbEjmlhuDcqqShGvIKXEW vqIT7Gzcz9LRCbqt+1WD1KHYnDI5W4M= X-MC-Unique: okFbaz5JMI2JGcX0jF3Wiw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: y9k_Wy_LNRK3vP3tOQZoGw-2 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH V2 4/9] spec: Move lockd plugin to a new subpackage Date: Tue, 13 Dec 2022 17:30:57 -0700 Message-ID: <20221214003102.22711-5-jfehlig@suse.com> In-Reply-To: <20221214003102.22711-1-jfehlig@suse.com> References: <20221214003102.22711-1-jfehlig@suse.com> X-ClientProxiedBy: FR2P281CA0175.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::12) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|AM9PR04MB8906:EE_ X-MS-Office365-Filtering-Correlation-Id: 56d04eb8-19b4-443b-9fa9-08dadd6a864a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: 2s6oHWMUtt257+suYNAv5WblWie0mKkvpEdNkCTof1kY2lt92SVi4N0mHKLaTsyXjrxg4bJrd9ArnA6JWpCx/K1MuSM80RrKQWV+3EEngndpt7kVm0Z1hlyKaJBV9ZI3/JkzNuQ/hxDZhgjwojrpD5gOsOXKnOavowDx+wPCi93GlDHeCxwL4P0EBq4z0CGqftNVl2FD6g7R5SaM8b1KpWC4fntCa7PRM1N3BndYJqFc/+6L6H3VDZAFJLc6AwqUTXSbeQlPWQoRjrwaTDlcwJ0SJCxyq/NUmNjV3B7nPBgCjVxh8gs5e1cs/RusI/3T6zXy1QxDf48nxT44WaMFKKI0uooZchD+I6C53KnuRLxRTM4EhmZcv6qRsHN1x7C6t2WgXxnEZIIy4tgB2CGgcxlpwKIScXyaxc0wbHYpkWgp1qCBeGbIwWd5rlC5TL9XaOtnPtuCWXEXQk2YKXojph9ZwCUMtD92JnuY75qPB7D6gGQK+cPSDTZi9EAQfl0szP1hODRhLyb4mPQFA2YY+9crAnMbs0taxK4wDrXZsky+pXTHFur3ldl4OIBd7fJTMbuNx4YpCdo8xgr5jrEdVIxraoN21VKXWvTGDQwvUcbseNclw0tNV9vnic4W6dX34yzGr3cVi79PHLDRFpC/lg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR04MB4899.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(366004)(376002)(396003)(136003)(346002)(39860400002)(451199015)(6506007)(6666004)(478600001)(6486002)(6512007)(26005)(83380400001)(41300700001)(5660300002)(8936002)(66946007)(2906002)(186003)(38100700002)(36756003)(6916009)(2616005)(1076003)(316002)(66556008)(66476007)(8676002)(86362001); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VsBP/THs705FglZZyxs4298x0g6dCD+ClJyr0xaSrToXUJdSxt4ogwpv7cZq?= =?us-ascii?Q?ivRVf9yzTtcIkNYptW7TRlnoh+4RVdRFagGKbjre0o12T45wAnmxh7V+2Ptp?= =?us-ascii?Q?5Tjn5FaMOyqDX56Fk5zRwwNbd+NFB/0Oddpz/y/g18Ytw5BNFv99DPOpeMjb?= =?us-ascii?Q?kltvtD0IQV3u5hiM23czrKkRggAr1DmHQG6z5eXvVxwOUR3dcsYLr+n3hdbP?= =?us-ascii?Q?iGssKH2IJ/jNtLyFMBMkZiLMQd9y+Oapi1hbJ9w447S0mqG3ZljJ6pkQmugS?= =?us-ascii?Q?rx850cgyP+S1rNnyCwTKUmgptKHHO4baBSNIZ1a0mG4AoJ0Me9KRWvUaR582?= =?us-ascii?Q?B94yuyUHVw8/RVkHGxF6liEZ38dFqwNapb/1Hs+C+oCzrJ6hfkw+Fyb6DG5V?= =?us-ascii?Q?VLPMbfKc+MFSZVopnzqjJ82yeZqdmGc2uRTAwAFShb+AUKljkhpKSFtqWEov?= =?us-ascii?Q?VN6J49F0LXiD+8nRA8gjja6/0rsHeIjTvxsoQWdSeVFb+cHgf7MYe34XbHNq?= =?us-ascii?Q?6QG1Hm4umOiqM4gsDqEt48BkHEiN04eY+QYLcdJxTJAdfek0Bt7p/y6Gv1c0?= =?us-ascii?Q?jfFQ4LbX6/sG7ce37sHFLCYirrRM6wL/rzI7IU6T+5FLpnDTcWVmxbDkpG46?= =?us-ascii?Q?uo2a3IxRw6IV/OjuV85aQmVZ+zGQv5YtJ/E3CrV/2B1Ymn4fOLEDqSxxtQ5P?= =?us-ascii?Q?Pt21DuZzDRFS/w1bm7ckzq3B1cgThPe7BC7NqpSHrcUgQ2JN8zM74rRAWOF3?= =?us-ascii?Q?KvbtP34DFzEGjw62P3SGbQ0zdgoRcMZuLMfCnm0uh5bjo7l2YckjWWNbbeQU?= =?us-ascii?Q?wCqNCQdxLqEGVPALu+mq7aWr9sss53Us1qYOQMiBKjDrh28VtPT7KpVDueX6?= =?us-ascii?Q?LT2sJMA/2tJySUR19HW3M8qfHihFcmA2ppw+y//YUtCXoApMHz8fNa6yPnIG?= =?us-ascii?Q?+0wham+P0ouLQCKlEliMBZ9Xp9Ld7SNCxWnE5yn5JgSGKsO4Tx44hQ1SrxGb?= =?us-ascii?Q?gAiHr56V4INMkRsRII/oCuNgMohWYYs3z/5hNrn3EMsEaVWh1HgcWzpt5paO?= =?us-ascii?Q?k7+3s0pDqr2eW9Ee9LFFYhjb3V60jD6NyUpKOf8bzg9tn0GKKtiSJalVe5Zw?= =?us-ascii?Q?aoQC4ap5iw2/C46AxBfFk6qyyyeGpw2JaLp5Su7GbfJ3eSqSa4bcvYBs2F8E?= =?us-ascii?Q?+e/doLMYifniTj4l0ADLbE+f50km4jptqOucXfx/fPVXQ0rIl5qGIrEVhntl?= =?us-ascii?Q?keXxXgnyKSR1ZWSg2zwUmgcFCFkBBJZlfc1xaMvRea1cV8KkMps0jjNfOOcF?= =?us-ascii?Q?sfi7XXfZab3AliF7KaaKPEJJ7fpBiagAcKugC+7DVEZj0VGaLq4nF5SoQUcC?= =?us-ascii?Q?ixpxhPNt826vyQ6zli7v8lc8nQrpL4v7HPd29mt987/H1YHBiJXuXN9xYBQy?= =?us-ascii?Q?NYreTfPMjdooG0pn5Yy2XZAc5F5PKtZ/HuZ7LdFmF0OpJggr96wS0Tmc2jC7?= =?us-ascii?Q?B1uZani4x+a1Rf7cK6hhL9buxUxAvAZSW2BThU3elFmSx887Swl7GVI6Bdg/?= =?us-ascii?Q?G//p87g7wsHIBwqLaeO6EZVRm0JArB8w6sJl24mZ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56d04eb8-19b4-443b-9fa9-08dadd6a864a X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 00:31:21.6593 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tpoX1loO0OvadIQA6kW/s4tHCl84W07i2b2g+g/vkHAtYx/wPxFD4QdkHRRMLCzXRnZ3X9yKCJ6NnkE4F7HpOw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8906 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1670977895244100003 Content-Type: text/plain; charset="utf-8" Introduce the libvirt-daemon-plugin-lockd subpackage to provide the client-side lockd plugin for virtlockd. The sanlock plugin also needs the directory %{_libdir}/libvirt/lock-driver, which it currently gets via the libvirt-daemon dependency. Duplicate the directory in the %files section of the sanlock plugin, allowing the libvirt-daemon dependency to be dropped. Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 633cf05100..63b29ba6f4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -430,6 +430,7 @@ Summary: Server side daemon and supporting files for li= bvirt library # The client side, i.e. shared libs are in a subpackage Requires: libvirt-libs =3D %{version}-%{release} Requires: libvirt-daemon-lock =3D %{version}-%{release} +Requires: libvirt-daemon-plugin-lockd =3D %{version}-%{release} Requires: libvirt-daemon-log =3D %{version}-%{release} Requires: libvirt-daemon-proxy =3D %{version}-%{release} # The libvirt-guests.sh script requires virsh from libvirt-client subpacka= ge, @@ -488,6 +489,13 @@ Requires: libvirt-libs =3D %{version}-%{release} Server side daemon used to manage locks held against virtual machine resources =20 +%package daemon-plugin-lockd +Summary: lockd client plugin for virtlockd +Requires: libvirt-libs =3D %{version}-%{release} + +%description daemon-plugin-lockd +A client-side plugin for virtlockd that implements locking using POSIX fcn= tl advisory locks + %package daemon-log Summary: Server side daemon for managing logs Requires: libvirt-libs =3D %{version}-%{release} @@ -951,7 +959,6 @@ Summary: Sanlock lock manager plugin for QEMU driver Requires: sanlock >=3D 2.4 #for virt-sanlock-cleanup require augeas Requires: augeas -Requires: libvirt-daemon =3D %{version}-%{release} Requires: libvirt-libs =3D %{version}-%{release} =20 %description lock-sanlock @@ -1812,8 +1819,6 @@ exit 0 %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ %dir %attr(0755, root, root) %{_libdir}/libvirt/ %dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/ -%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver -%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so %{_datadir}/augeas/lenses/libvirtd.aug %{_datadir}/augeas/lenses/tests/test_libvirtd.aug %{_datadir}/polkit-1/actions/org.libvirt.unix.policy @@ -1847,6 +1852,10 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtlockd %{_mandir}/man8/virtlockd.8* =20 +%files daemon-plugin-lockd +%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver +%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so + %files daemon-log %{_unitdir}/virtlogd.service %{_unitdir}/virtlogd.socket @@ -2154,6 +2163,7 @@ exit 0 %if %{with_libxl} %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf %endif +%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so %{_datadir}/augeas/lenses/libvirt_sanlock.aug %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug --=20 2.38.1