From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 30 Jun 2026 18:03:22 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1weavi-00BWAD-2f for lore@lore.pengutronix.de; Tue, 30 Jun 2026 18:03:22 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1weavi-0007YT-KX; Tue, 30 Jun 2026 18:03:22 +0200 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1weavU-0007Xl-62; Tue, 30 Jun 2026 18:03:08 +0200 From: =?UTF-8?q?Sven=20P=C3=BCschel?= To: ptxdist@pengutronix.de Date: Tue, 30 Jun 2026 18:01:56 +0200 Message-ID: <20260630160303.2174761-1-s.pueschel@pengutronix.de> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 1/2] lvm2: make libaio dependency conditional X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false When only using the device-mapper related part of lvm2, libaio is not required. This requires us to only use the [install_]device-mapper make targets to avoid trying to compile the lvm2 tools, which depend on libaio. Also move the lvm2 configuration file to the LVM_TOOLS option, as it won't be built by the device-mapper target and doesn't seem to be relevant for dmsetup alone. Signed-off-by: Sven Püschel --- rules/lvm2.in | 2 +- rules/lvm2.make | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rules/lvm2.in b/rules/lvm2.in index f0b8123fc..dc1724ecc 100644 --- a/rules/lvm2.in +++ b/rules/lvm2.in @@ -4,7 +4,6 @@ menuconfig LVM2 tristate select LIBC_DL select GCCLIBS_GCC_S - select LIBAIO select READLINE select NCURSES select SYSTEMD if LVM2_SYSTEMD @@ -19,6 +18,7 @@ if LVM2 config LVM2_LVM_TOOLS bool default y + select LIBAIO prompt "install lvm tools" help If disabled, only dmsetup and the dm-mapper library are installed. diff --git a/rules/lvm2.make b/rules/lvm2.make index 6e781c66f..d45c89356 100644 --- a/rules/lvm2.make +++ b/rules/lvm2.make @@ -90,6 +90,11 @@ LVM2_CONF_OPT := \ --with-device-gid=$(PTXCONF_LVM2_DEVICE_GID) \ --with-device-mode=$(PTXCONF_LVM2_DEVICE_MODE) +ifndef PTXCONF_LVM2_LVM_TOOLS +LVM2_MAKE_OPT := device-mapper +LVM2_INSTALL_OPT := install_device-mapper +endif + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -153,9 +158,9 @@ ifdef PTXCONF_LVM2_LVM_TOOLS @$(call install_link, lvm2, lvm, /usr/sbin/vgs) @$(call install_link, lvm2, lvm, /usr/sbin/vgscan) @$(call install_link, lvm2, lvm, /usr/sbin/vgsplit) -endif @$(call install_alternative, lvm2, 0, 0, 0644, /etc/lvm/lvm.conf) +endif @$(call install_lib, lvm2, 0, 0, 0644, libdevmapper) @$(call install_lib, lvm2, 0, 0, 0644, libdevmapper-event) -- 2.47.3