From nobody Tue Feb 10 00:22:13 2026 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=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1673474793; cv=none; d=zohomail.com; s=zohoarc; b=c7vW1V3sZMqJPMRe0/ph/Pf/NYm6jAVrYiliU4dzVIYLU8zNNAuGQND+TNwGk6x+HOOFByJjyYNafjULXwOcdcbeVhyFntEOqHB7LSMsuSiwI6snhc/U36WYAze3uLVx95Titzabqy4Xw0RSyEUi3xYfEuQn5Q40pBTt7y5MO9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673474793; h=Content-Type:Content-Transfer-Encoding:Cc: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=8iFvU1rzj/q1XsZeqooNYK+rLdpdkYvwjI8kpKDCQeQ=; b=O/Gy3pAiL1+aSdOzkpl1lAf8I4jFKKgRk0ekO4jLVfZXnGNBaKp8nuG21tv+Ee/ZNqyis3AOjX5TpnQkQjIzbe2FvrFzgAPqxnpsNUpookNNelr0Pfkvdh40KkvGCughzB1LoKkiwc+dP3Kahcuy98C0clFx10IgXnvCsz4KUOc= 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=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.129.124]) by mx.zohomail.com with SMTPS id 1673474793038973.3184989544139; Wed, 11 Jan 2023 14:06: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-491-joZ-bNH5O_OywbYiBo-3OQ-1; Wed, 11 Jan 2023 17:06:30 -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 BF62F857D0D; Wed, 11 Jan 2023 22:06:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A53E72166B29; Wed, 11 Jan 2023 22:06:27 +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 7DDD61946A45; Wed, 11 Jan 2023 22:06:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CFD1519465A3 for ; Wed, 11 Jan 2023 22:06:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BEC4F40C2006; Wed, 11 Jan 2023 22:06:25 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B625A40C2004 for ; Wed, 11 Jan 2023 22:06:25 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 98846101A521 for ; Wed, 11 Jan 2023 22:06:25 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2051.outbound.protection.outlook.com [40.107.6.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-94-BXJwtBgSMEGXdOIha80iMw-1; Wed, 11 Jan 2023 17:06:24 -0500 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by AM7PR04MB6806.eurprd04.prod.outlook.com (2603:10a6:20b:103::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18; Wed, 11 Jan 2023 22:06:22 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f%3]) with mapi id 15.20.6002.012; Wed, 11 Jan 2023 22:06:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673474792; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=8iFvU1rzj/q1XsZeqooNYK+rLdpdkYvwjI8kpKDCQeQ=; b=dA/MYU6UznKaEI6t/vIUNIPk49lp+rhiOUram42VMW3X7VxvBp7iBhP+qw4rnOmK69q2aQ bj3XxJf2sHM6wCXpLdBzVX3j8kztdTMa6I9fibqOg7UzfE4kqJiT9XXrQwHPHODMW14o6K 5kY/PvV5ykfpO66XavptdA87RzsPrSY= X-MC-Unique: joZ-bNH5O_OywbYiBo-3OQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: BXJwtBgSMEGXdOIha80iMw-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH V8 05/13] spec: Rename the libvirt-lock-sanlock subpackage Date: Wed, 11 Jan 2023 15:05:52 -0700 Message-ID: <20230111220600.29680-6-jfehlig@suse.com> In-Reply-To: <20230111220600.29680-1-jfehlig@suse.com> References: <20230111220600.29680-1-jfehlig@suse.com> X-ClientProxiedBy: FR3P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::13) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|AM7PR04MB6806:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a9a28dd-fbd7-4a9b-316a-08daf4201304 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: 5GIem3WLMSzsh9wmNrmILorGTP4Wy2VxqRinXQTEckD6wfTm1qtUaL++QwV/GKTULMFYIoOMb1NPE7LcuT5Kt3wWo+Of8ca7WaNrSQw+oNIbg2l7H+EV59AYY7jPheq68hgz73yJXQHz8bVSUxebAbkpQiRB4Dnx9Xm9UZtlrulqkczEtXOWLNphmgsPxsc0oGUfcfqrdO38zfl9X3+s/o1dTVRja+ghLfPqsLv9vPUdVj+zy90Nq5Dj6mbo+UrHTkyP1ebjxA5iT0LpiRaynUD6NGhVOV293Gdi3QZoHnVMK5Tk3YzPaDIQdJiOk1fv887dhjhNlE4R7rhWEaKOw8+Ts9yjm1gZ8+0kwtLDxAy/5GvorrTn0sBd0+ady2fybcZH2aaWOjLwZ7Cf+7EKeNwRds9qgJVTFjqDz5fSxk1VXKQfP6IGAfrRRrwCPmtRjpwostM5SqFSg7wUVMqR1941kGldlEb7VIfT8/zKYjcYS0ch78OjmEScbYbto6mkv32bROksrm1N1RcQcaaIeQc3CXpvmT4bUm9l0G2PrEeO/S6K4VULUbRbL612WIzByXXMs7vy6CHp/ajwUtRMwcrcArVY36ZR60w29Adsy0Llo9K29jHWzj7KKcKSEH5uPJv8hBHXRM2i8Rd9I/vsLrgkeVQR/wyhs1mVa1X/TllG0oVNAy8zXmsFZ3e3PRA2 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)(376002)(346002)(39860400002)(136003)(396003)(366004)(451199015)(38100700002)(8936002)(450100002)(66946007)(2906002)(478600001)(5660300002)(6486002)(2616005)(41300700001)(86362001)(66476007)(66556008)(36756003)(4326008)(6916009)(8676002)(6512007)(26005)(186003)(316002)(83380400001)(6666004)(1076003)(6506007)(21314003); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eON4wx/nq4atBesfzqP6WMRhIZAuGOUgLC3t3Llu/GupSxSJ2xltlfGmVEGf?= =?us-ascii?Q?eJKQVlnSoOGBoWyZ5htVg6+yhvl/BLx+PHsGSZD5vLK8tGgzR1ILqRwzJjIK?= =?us-ascii?Q?IEO3t8yvJgUNSC/3Qd1jwj1j9CKojVkZkmRsZ2Ov/N9wNBZCCzdl1bFx3N3c?= =?us-ascii?Q?e41rnB+g7ODM/iePJDZBxE8GB6dOaNr7GciAHWTriwCjmJIB/ROwI0Ps23q3?= =?us-ascii?Q?P2h70lQEMnoklUcqnvFYaBQB2LwoNHh8CzgCZheVF81e5MEI9FzVU9d41EG0?= =?us-ascii?Q?KZgJlwax2guHttg4PWBoOMDNTxEMskYETc+5r5iIBCNZhZNRz++Dy9ZZ9pbN?= =?us-ascii?Q?ptebv5jMU2770JZ3Ud+kD9Bkxflb+VkivD25vKQSQBCSYASkyJSzDOrard1h?= =?us-ascii?Q?tadYDSK4Hm+ZmXq1XR9ITk9S+gwyucle0JIEUx4EPB9t6bWiUHZ6/kol1qpA?= =?us-ascii?Q?uaSkEf/ZcOV5cqCModMd1Q6Apk5yoUuJLk6rtozyOliUx1ltAMWeZOT7eznT?= =?us-ascii?Q?oZnzieUX/LEBPDcVVv0R1qDD12x6Ylh38JIRqgugJePa2INtFxUteAaAz+Ui?= =?us-ascii?Q?P/hOznkJ5AEB+kRd3ZmZkeM8dA3lqgmPZcNmmjECqeeo+LBCYXSxUVkOiw/t?= =?us-ascii?Q?zfqnmOnl1O3W2Vyu7FeJsQ+T4Uzw1zHv0OmAeo9RmBROgmmGgnN1GW4IuCdX?= =?us-ascii?Q?TGDJq2pKY9BUuTWOHxxwYsTg7xMK2LG6cHIoex/UEzocSdrA0WeDiRqmW2Mg?= =?us-ascii?Q?MfoVGe2jdl0L+J9xffJmoSqlmjAZKa2TgyJs8yc0LaNC9xgXXQTj5j2YNDe9?= =?us-ascii?Q?TVhDXP6dSYyEEt8G/h6B2Hy7glP+5tJQiFUFV/tcz0NgtQGzQp0Esc0naoMR?= =?us-ascii?Q?GBfLE4CEMotdla1ixlyTavo9An+w91zL9BElqdG/OCsYbd8gSJxXE5lHH2EV?= =?us-ascii?Q?GluVwvnVVqREATZ19xtHJzkAWxj9AbASEaIFpRohS+E8SnM5Oxdd4VX44CRh?= =?us-ascii?Q?kNnC2D6OyW9tWqmPAY53/EVBUCruY3hLTayy+RhxiGotSi92hsZioycXq23U?= =?us-ascii?Q?CvCOXywlPcScm+u6Jb7Vk2dtSAfYjffenEpNh7N/JwueW3M1GdlRindfSkr5?= =?us-ascii?Q?LRRzVkoeH7DQNTanl+o8QwIMpeypQYzRX260GqYR+zp7lylZv+0GwnnWRLEP?= =?us-ascii?Q?wIxC4Ru/jv3b1e1NdJ+GDABRcc2t1AjhPHLAEKw1Nr+zO4QL48ZTJphUnkXx?= =?us-ascii?Q?EhF8ZS/zDhQRUyMyUFpRWFiueNlR9f7N5Vwu7pGHG7AeEpxOPuLuadDpMJiy?= =?us-ascii?Q?CGPN7uEIIKcPhnu5MQNW7jkRlul1daxB/ZWxmz9Twzzy4jZsrCuhbBPmGQW6?= =?us-ascii?Q?q0yZBy8AeG2RpnQTUyJWWzs9GBWzatZdLeQP/9PswrBuacsneA/UgbJHY1vc?= =?us-ascii?Q?DbryYjJ9JeACSKnbkK9JqIZVWJ9Vaal58HOZtRpPoA1i4gC5MlIeREYd/UMf?= =?us-ascii?Q?8UEWjrn1x4A6BJH+VN/lyjitC7P+tMzYLlC13jSdvG9Qua5srKMVyZ5acAje?= =?us-ascii?Q?OfI7VSLDj9vZrZaCWJxMe4ZkF38JX9AAEaa+ncIU?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a9a28dd-fbd7-4a9b-316a-08daf4201304 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2023 22:06:22.4331 (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: jKEfX8jspRh43+8sGQlSyrjqMa/gRdTqBenEwvJzSuB6MNbSLg2fDgXSKiaDCpJOEBgBUMythabHPdYMtMuCnA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6806 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.1 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: , Cc: Andrea Bolognani 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: 1673474794713100001 Content-Type: text/plain; charset="utf-8" The new name "libvirt-daemon-plugin-sanlock" provides consistency with the newly introduced "libvirt-daemon-plugin-lockd" subpackage. It's also a good opportunity to taking ownership of %{_libdir}/libvirt/lock-driver/, removing the need for a dependency on the libvirt-daemon package. Signed-off-by: Jim Fehlig Reviewed-by: Andrea Bolognani --- docs/kbase/rpm-deployment.rst | 12 ++++++------ libvirt.spec.in | 11 ++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/docs/kbase/rpm-deployment.rst b/docs/kbase/rpm-deployment.rst index 31805c2280..7685ee1291 100644 --- a/docs/kbase/rpm-deployment.rst +++ b/docs/kbase/rpm-deployment.rst @@ -289,6 +289,12 @@ RPM packages features, the subset of libvirt-daemon-driver-XXX packages should be used instead. =20 +* libvirt-daemon-plugin-sanlock + + This package provides the sanlock.so module, a daemon plugin that implem= ents + disk locking via communication with the sanlock daemon. It is optional a= nd + only relevant to hosts with the QEMU driver and oVirt management applica= tion. + * libvirt-daemon-qemu =20 This is an empty package that exists only as a convenient way to request @@ -352,12 +358,6 @@ RPM packages take to the libvirt daemons to utilize stateful drivers (QEMU, Xen, BHyv= e, LXC, VZ, etc). This is needed on all libvirt hosts, both client and serv= er. =20 -* libvirt-lock-sanlock - - A plugin for locking disks that communicates with the sanlock daemon. It= is - optional and only relevant to hosts with the QEMU driver and oVirt manag= ement - application. - * libvirt-login-shell =20 A simple login shell that automatically spawns an LXC container for the = user diff --git a/libvirt.spec.in b/libvirt.spec.in index 8277122bcb..56cf35ef06 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -962,15 +962,16 @@ Requires: pkgconfig Include header files & development libraries for the libvirt C library. =20 %if %{with_sanlock} -%package lock-sanlock +%package daemon-plugin-sanlock 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} +Obsoletes: libvirt-lock-sanlock < 9.0.0 +Provides: libvirt-lock-sanlock =3D %{version}-%{release} =20 -%description lock-sanlock +%description daemon-plugin-sanlock Includes the Sanlock lock manager plugin for the QEMU driver %endif @@ -1829,7 +1830,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/ %dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/ %dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/ %{_datadir}/augeas/lenses/libvirtd.aug @@ -2170,13 +2170,14 @@ exit 0 %endif =20 %if %{with_sanlock} -%files lock-sanlock +%files daemon-plugin-sanlock %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf %endif %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