From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 15 Jul 2026 12:02:07 +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 1wjwRL-00404z-1j for lore@lore.pengutronix.de; Wed, 15 Jul 2026 12:02:07 +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 1wjwRJ-0005hU-Gj; Wed, 15 Jul 2026 12:02:05 +0200 Received: from mx1.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::107]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wjwR5-0005gj-TW; Wed, 15 Jul 2026 12:01:51 +0200 Received: from drehscheibe.grey.stw.pengutronix.de (drehscheibe.grey.stw.pengutronix.de [IPv6:2a0a:edc0:0:c01:1d::a2]) (Authenticated sender: relay-from-drehscheibe.grey.stw.pengutronix.de) by mx1.white.stw.pengutronix.de (Postfix) with ESMTPSA id D181520222C; Wed, 15 Jul 2026 12:01:46 +0200 (CEST) Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wjwR0-001unw-2R; Wed, 15 Jul 2026 12:01:46 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1wjwR0-00000005GVL-2wYz; Wed, 15 Jul 2026 12:01:46 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 15 Jul 2026 12:01:46 +0200 Message-ID: <20260715100146.1255076-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260703083435.1279918-1-s.pueschel@pengutronix.de> References: <20260703083435.1279918-1-s.pueschel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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 Thanks, applied as 6feea7bf78c362b416b05fdd7b342072e2470ee5. Michael [sent from post-receive hook] On Wed, 15 Jul 2026 12:01:46 +0200, Sven Püschel wrote: > 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 > Message-Id: <20260703083435.1279918-1-s.pueschel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/lvm2.in b/rules/lvm2.in > index f0b8123fc2da..db009f8d5825 100644 > --- a/rules/lvm2.in > +++ b/rules/lvm2.in > @@ -4,10 +4,10 @@ menuconfig LVM2 > tristate > select LIBC_DL > select GCCLIBS_GCC_S > - select LIBAIO > + select LIBAIO if LVM2_LVM_TOOLS > select READLINE > select NCURSES > - select SYSTEMD if LVM2_SYSTEMD > + select SYSTEMD if LVM2_SYSTEMD > prompt "lvm2 " > help > LVM2 refers to a new userspace toolset that provide logical volume management > diff --git a/rules/lvm2.make b/rules/lvm2.make > index 6e781c66fd7e..d45c89356ba5 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)