From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 17 Jul 2026 15:12:03 +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 1wkiME-004kfP-3A for lore@lore.pengutronix.de; Fri, 17 Jul 2026 15:12:02 +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 1wkiMC-0000BO-UK; Fri, 17 Jul 2026 15:12:00 +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 1wkiLw-0008Rq-Iw; Fri, 17 Jul 2026 15:11:44 +0200 From: =?UTF-8?q?Sven=20P=C3=BCschel?= To: ptxdist@pengutronix.de Date: Fri, 17 Jul 2026 15:11:13 +0200 Message-ID: <20260717131143.1109355-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 v4] lvm2: move lvmdump and fsadm into separate options 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 Move lvmdump and the fsadm command into a separate option, as both commands are bash scripts and therefore need bash as a dependency. As these commands may not be used, we don't add bash as a dependency to the much bigger LVM2_LVM_TOOLS option but instead add distinct options for these commands. The new options are guarded by the existing `if LVM2_LVM_TOOLS` to prevent them from being enabled when the other tools are not enabled. As this isn't necessary for the lvm2.make file, it doesn't nest the if conditions to avoid complexity. Signed-off-by: Sven Püschel --- v4 - removed default y to avoid auto-pulling bash on an update - removed superfluous newline between config options v3 - added new options instead of adding bash to LVM2_LVM_TOOLS - added RUNTIME flag to the bash dependency v2 - added --- rules/lvm2.in | 8 ++++++++ rules/lvm2.make | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/rules/lvm2.in b/rules/lvm2.in index 3213d9c31..bb95799e6 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 BASH if (LVM2_FSADM || LVM2_LVMDUMP) && RUNTIME prompt "lvm2 " help LVM2 refers to a new userspace toolset that provide logical volume management @@ -32,6 +33,13 @@ config LVM2_STARTSCRIPT depends on INITMETHOD_BBINIT prompt "install /etc/init.d/lvm2" +config LVM2_FSADM + bool + prompt "install the fsadm command" + +config LVM2_LVMDUMP + bool + prompt "install the lvmdump command" endif config LVM2_LIBDEVMAPPER_EVENT diff --git a/rules/lvm2.make b/rules/lvm2.make index 57773a1f7..b5aea9873 100644 --- a/rules/lvm2.make +++ b/rules/lvm2.make @@ -110,10 +110,15 @@ $(STATEDIR)/lvm2.targetinstall: @$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/dmsetup) -ifdef PTXCONF_LVM2_LVM_TOOLS +ifdef PTXCONF_LVM2_FSADM @$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/fsadm) +endif + +ifdef PTXCONF_LVM2_LVMDUMP @$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/lvmdump) +endif +ifdef PTXCONF_LVM2_LVM_TOOLS @$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/lvm) @$(call install_link, lvm2, lvm, /usr/sbin/lvchange) @$(call install_link, lvm2, lvm, /usr/sbin/lvconvert) -- 2.47.3