[ptxdist] [PATCH v2 1/3] lvm2: make libaio dependency conditional

[ptxdist] [PATCH v2 1/3] lvm2: make libaio dependency conditional

[Sven Püschel]

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 <s.pueschel@pengutronix.de>

---
v2
- use an conditional if on LIBAIO and also indent the systemd if
---
 rules/lvm2.in   | 4 ++--
 rules/lvm2.make | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rules/lvm2.in b/rules/lvm2.in
index f0b8123fc..db009f8d5 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 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

[ptxdist] [PATCH v2 2/3] lvm2: add option for libdevmapper-event.so

[Sven Püschel]

Add an option for libdevmapper-event.so, as it's not required by
dmsetup. This allows omitting the library, if it's not being used by
any other application on the system.

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>

---
v2
- move select to LVM2 and add if condition
- remove redundant 'default n'
---
 rules/lvm2.in   | 5 +++++
 rules/lvm2.make | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/rules/lvm2.in b/rules/lvm2.in
index db009f8d5..032ed5006 100644
--- a/rules/lvm2.in
+++ b/rules/lvm2.in
@@ -8,6 +8,7 @@ menuconfig LVM2
 	select READLINE
 	select NCURSES
 	select SYSTEMD			if LVM2_SYSTEMD
+	select LVM2_LIBDEVMAPPER_EVENT	if LVM2_LVM_TOOLS
 	prompt "lvm2                          "
 	help
 	  LVM2 refers to a new userspace toolset that provide logical volume management
@@ -33,6 +34,10 @@ config LVM2_STARTSCRIPT
 
 endif
 
+config LVM2_LIBDEVMAPPER_EVENT
+	bool
+	prompt "install libdevmapper-event.so"
+
 config LVM2_DEVICE_UID
 	int
 	default 0
diff --git a/rules/lvm2.make b/rules/lvm2.make
index d45c89356..57773a1f7 100644
--- a/rules/lvm2.make
+++ b/rules/lvm2.make
@@ -163,7 +163,10 @@ ifdef PTXCONF_LVM2_LVM_TOOLS
 endif
 
 	@$(call install_lib, lvm2, 0, 0, 0644, libdevmapper)
+
+ifdef PTXCONF_LVM2_LIBDEVMAPPER_EVENT
 	@$(call install_lib, lvm2, 0, 0, 0644, libdevmapper-event)
+endif
 
 ifdef PTXCONF_LVM2_STARTSCRIPT
 	@$(call install_alternative, lvm2, 0, 0, 0755, /etc/init.d/lvm2)
-- 
2.47.3

[ptxdist] [PATCH v2 3/3] lvm2: add bash as dependency

[Sven Püschel]

Add bash as a dependency, as the fsadm and lvmdump tools are bash
shell scripts.

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>

---
v2
- added
---
 rules/lvm2.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/lvm2.in b/rules/lvm2.in
index 032ed5006..8a6b26927 100644
--- a/rules/lvm2.in
+++ b/rules/lvm2.in
@@ -9,6 +9,7 @@ menuconfig LVM2
 	select NCURSES
 	select SYSTEMD			if LVM2_SYSTEMD
 	select LVM2_LIBDEVMAPPER_EVENT	if LVM2_LVM_TOOLS
+	select BASH			if LVM2_LVM_TOOLS
 	prompt "lvm2                          "
 	help
 	  LVM2 refers to a new userspace toolset that provide logical volume management
-- 
2.47.3

Re: [ptxdist] [PATCH v2 2/3] lvm2: add option for libdevmapper-event.so

[Michael Olbrich]

On Fri, Jul 03, 2026 at 10:33:35AM +0200, Sven Püschel wrote:
> Add an option for libdevmapper-event.so, as it's not required by
> dmsetup. This allows omitting the library, if it's not being used by
> any other application on the system.
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> 
> ---
> v2
> - move select to LVM2 and add if condition

The rule for adding the 'select' to the main symbol is for external
dependencies. So I moved this back while appying.

Michael

> - remove redundant 'default n'
> ---
>  rules/lvm2.in   | 5 +++++
>  rules/lvm2.make | 3 +++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/rules/lvm2.in b/rules/lvm2.in
> index db009f8d5..032ed5006 100644
> --- a/rules/lvm2.in
> +++ b/rules/lvm2.in
> @@ -8,6 +8,7 @@ menuconfig LVM2
>  	select READLINE
>  	select NCURSES
>  	select SYSTEMD			if LVM2_SYSTEMD
> +	select LVM2_LIBDEVMAPPER_EVENT	if LVM2_LVM_TOOLS
>  	prompt "lvm2                          "
>  	help
>  	  LVM2 refers to a new userspace toolset that provide logical volume management
> @@ -33,6 +34,10 @@ config LVM2_STARTSCRIPT
>  
>  endif
>  
> +config LVM2_LIBDEVMAPPER_EVENT
> +	bool
> +	prompt "install libdevmapper-event.so"
> +
>  config LVM2_DEVICE_UID
>  	int
>  	default 0
> diff --git a/rules/lvm2.make b/rules/lvm2.make
> index d45c89356..57773a1f7 100644
> --- a/rules/lvm2.make
> +++ b/rules/lvm2.make
> @@ -163,7 +163,10 @@ ifdef PTXCONF_LVM2_LVM_TOOLS
>  endif
>  
>  	@$(call install_lib, lvm2, 0, 0, 0644, libdevmapper)
> +
> +ifdef PTXCONF_LVM2_LIBDEVMAPPER_EVENT
>  	@$(call install_lib, lvm2, 0, 0, 0644, libdevmapper-event)
> +endif
>  
>  ifdef PTXCONF_LVM2_STARTSCRIPT
>  	@$(call install_alternative, lvm2, 0, 0, 0755, /etc/init.d/lvm2)
> -- 
> 2.47.3
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [ptxdist] [PATCH v2 3/3] lvm2: add bash as dependency

[Michael Olbrich]

On Fri, Jul 03, 2026 at 10:33:36AM +0200, Sven Püschel wrote:
> Add bash as a dependency, as the fsadm and lvmdump tools are bash
> shell scripts.
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> 
> ---
> v2
> - added
> ---
>  rules/lvm2.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/rules/lvm2.in b/rules/lvm2.in
> index 032ed5006..8a6b26927 100644
> --- a/rules/lvm2.in
> +++ b/rules/lvm2.in
> @@ -9,6 +9,7 @@ menuconfig LVM2
>  	select NCURSES
>  	select SYSTEMD			if LVM2_SYSTEMD
>  	select LVM2_LIBDEVMAPPER_EVENT	if LVM2_LVM_TOOLS
> +	select BASH			if LVM2_LVM_TOOLS

No. Most tools don't need this and bash is quite big. Split this into a
separate option. And add '&& RUNTIME' to the condition.

Michael

>  	prompt "lvm2                          "
>  	help
>  	  LVM2 refers to a new userspace toolset that provide logical volume management
> -- 
> 2.47.3
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [ptxdist] [APPLIED] lvm2: make libaio dependency conditional

[Michael Olbrich]

Thanks, applied as 6feea7bf78c362b416b05fdd7b342072e2470ee5.

Michael

[sent from post-receive hook]

On Wed, 15 Jul 2026 12:01:46 +0200, Sven Püschel <s.pueschel@pengutronix.de> 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 <s.pueschel@pengutronix.de>
> Message-Id: <20260703083435.1279918-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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)

Re: [ptxdist] [APPLIED] lvm2: add option for libdevmapper-event.so

[Michael Olbrich]

Thanks, applied as c3fd2fde1a80fc4826c0a7d9cf7c74a389e2c38b.

Michael

[sent from post-receive hook]

On Wed, 15 Jul 2026 12:01:47 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> Add an option for libdevmapper-event.so, as it's not required by
> dmsetup. This allows omitting the library, if it's not being used by
> any other application on the system.
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20260703083435.1279918-2-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/lvm2.in b/rules/lvm2.in
> index db009f8d5825..3213d9c315d1 100644
> --- a/rules/lvm2.in
> +++ b/rules/lvm2.in
> @@ -18,6 +18,7 @@ if LVM2
>  
>  config LVM2_LVM_TOOLS
>  	bool
> +	select LVM2_LIBDEVMAPPER_EVENT
>  	default y
>  	prompt "install lvm tools"
>  	help
> @@ -33,6 +34,10 @@ config LVM2_STARTSCRIPT
>  
>  endif
>  
> +config LVM2_LIBDEVMAPPER_EVENT
> +	bool
> +	prompt "install libdevmapper-event.so"
> +
>  config LVM2_DEVICE_UID
>  	int
>  	default 0
> diff --git a/rules/lvm2.make b/rules/lvm2.make
> index d45c89356ba5..57773a1f7149 100644
> --- a/rules/lvm2.make
> +++ b/rules/lvm2.make
> @@ -163,7 +163,10 @@ ifdef PTXCONF_LVM2_LVM_TOOLS
>  endif
>  
>  	@$(call install_lib, lvm2, 0, 0, 0644, libdevmapper)
> +
> +ifdef PTXCONF_LVM2_LIBDEVMAPPER_EVENT
>  	@$(call install_lib, lvm2, 0, 0, 0644, libdevmapper-event)
> +endif
>  
>  ifdef PTXCONF_LVM2_STARTSCRIPT
>  	@$(call install_alternative, lvm2, 0, 0, 0755, /etc/init.d/lvm2)