From nobody Tue Jan 21 04:21:57 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1736189788091294.1276296470968; Mon, 6 Jan 2025 10:56:28 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1107BB0A; Mon, 6 Jan 2025 13:56:27 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B2012AE2; Mon, 6 Jan 2025 13:56:06 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id AFB7DA70; Mon, 6 Jan 2025 12:21:15 -0500 (EST) Received: from oder.bitpalast.net (oder.bitpalast.net [49.12.83.152]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 44079A6D for ; Mon, 6 Jan 2025 12:21:14 -0500 (EST) Received: from stefan-visbeck-lan.visbeck.lan (ip-176-199-226-036.um44.pools.vodafone-ip.de [176.199.226.36]) by oder.bitpalast.net (Postfix) with ESMTPSA id C466E26A2365 for ; Mon, 6 Jan 2025 18:16:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 X-Greylist: delayed 305 seconds by postgrey-1.37 at lists.libvirt.org; Mon, 06 Jan 2025 12:21:14 EST DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=the2masters.de; s=default; t=1736183767; bh=0NXis/cfxnSWD5jC3wS3umZBT3Bd57vk/6MczRjV1J0=; h=From:To:Subject; b=jJVthOm8k9Zz1mPIxu0OO6CiU+3VMVndGHFYiOmHeeuxxktlF/uzb6eFMUeZ5v8K0 SOTt5pFL/rVPTjgm7xGKH2hhW6YkOTy09zGpvW/fVeSzH6FMkvG9gFo5xl823KI5OD iokBFbJWdxtcIE2Z7HElx1OC0B49C987URLSjuOs= Authentication-Results: oder; spf=pass (sender IP is 176.199.226.36) smtp.mailfrom=stefan@the2masters.de smtp.helo=stefan-visbeck-lan.visbeck.lan Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Received-SPF: pass (oder: connection is authenticated) From: Stefan Hellermann To: devel@lists.libvirt.org Subject: [PATCH] meson: remove unneeded dependency on libdevmapper for storage_disk Date: Mon, 6 Jan 2025 18:15:58 +0100 Message-ID: <20250106171600.222320-1-stefan@the2masters.de> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-PPP-Message-ID: <173618376708.399019.10886273226490031382@oder.bitpalast.net> X-PPP-Vhost: the2masters.de Content-Transfer-Encoding: quoted-printable X-MailFrom: stefan@the2masters.de X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 Message-ID-Hash: CUGMHTFSDYGIDTXJBAAYW7ZTESBFD3XH X-Message-ID-Hash: CUGMHTFSDYGIDTXJBAAYW7ZTESBFD3XH X-Mailman-Approved-At: Mon, 06 Jan 2025 18:56:04 -0500 X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) X-ZM-MESSAGEID: 1736189788890116600 Content-Type: text/plain; charset="utf-8" In commit dfa0e11 the last direct usage of devmapper for storage_disk was removed. There is one stale include remaining, which is unused even longer since df1011ca. Remove the include and change meson.build so we can use storage_disk without devmapper. I'm running it right now with a stripped-down config on a small arm64 router with openwrt. Signed-off-by: Stefan Hellermann Reviewed-by: Michal Privoznik --- meson.build | 4 ++-- src/storage/parthelper.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index ca1b915737..ffe91dbd46 100644 --- a/meson.build +++ b/meson.build @@ -1787,11 +1787,11 @@ if conf.has('WITH_LIBVIRTD') conf.set('WITH_STORAGE_DIR', 1) endif =20 - if not get_option('storage_disk').disabled() and devmapper_dep.found() a= nd libparted_dep.found() + if not get_option('storage_disk').disabled() and libparted_dep.found() use_storage =3D true conf.set('WITH_STORAGE_DISK', 1) elif get_option('storage_disk').enabled() - error('You must install libparted and libdevmapper to compile libvirt = with disk storage driver') + error('You must install libparted to compile libvirt with disk storage= driver') endif =20 if not get_option('storage_fs').disabled() diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index ee07ba41bb..1169ebfb64 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -31,7 +31,6 @@ #include =20 #include -#include #include #include #include --=20 2.47.1