From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 23 Jan 2025 21:55:09 +0100 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 1tb4EH-003b0w-0k for lore@lore.pengutronix.de; Thu, 23 Jan 2025 21:55:09 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tb4EH-0002Ru-Mf; Thu, 23 Jan 2025 21:55:09 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tb4E2-0002RY-AO; Thu, 23 Jan 2025 21:54:54 +0100 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 1tb4E2-001WD2-0R; Thu, 23 Jan 2025 21:54:54 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1tb4E2-00BvBA-08; Thu, 23 Jan 2025 21:54:54 +0100 From: Ahmad Fatoum To: ptxdist@pengutronix.de Date: Thu, 23 Jan 2025 21:54:53 +0100 Message-Id: <20250123205453.2841392-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] util-linux: add option for building blkdiscard 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: jre@pengutronix.de, Ahmad Fatoum 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 We currently only have an option for BusyBox blkdiscard, but that one lacks some options like -z for zeroing the block device. This can be important as regular discard on an eMMC isn't guaranteed to clear data. Add a util-linux blkdiscard option to address this. Signed-off-by: Ahmad Fatoum --- rules/util-linux.in | 10 ++++++++++ rules/util-linux.make | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/rules/util-linux.in b/rules/util-linux.in index 8bf035f3901e..83e075852689 100644 --- a/rules/util-linux.in +++ b/rules/util-linux.in @@ -62,6 +62,16 @@ config UTIL_LINUX_ADDPART help The addpart utility. +config UTIL_LINUX_BLKDISCARD + bool + depends on !BUSYBOX_BLKDISCARD || ALLYES + prompt "blkdiscard" + help + blkdiscard is used to discard device sectors. + +comment "BusyBox' blkdiscard is selected!" + depends on BUSYBOX_BLKDISCARD + config UTIL_LINUX_CFDISK bool select UTIL_LINUX_FDISKS diff --git a/rules/util-linux.make b/rules/util-linux.make index 579c165e6edb..02d83715c6f1 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -54,7 +54,7 @@ UTIL_LINUX_CONF_OPT := \ -Dbuild-agetty=$(call ptx/endis, PTXCONF_UTIL_LINUX_AGETTY)d \ -Dbuild-bash-completion=disabled \ -Dbuild-bfs=disabled \ - -Dbuild-blkdiscard=disabled \ + -Dbuild-blkdiscard=$(call ptx/endis, PTXCONF_UTIL_LINUX_BLKDISCARD)d \ -Dbuild-blkpr=disabled \ -Dbuild-blkzone=disabled \ -Dbuild-blockdev=disabled \ @@ -197,6 +197,7 @@ UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_LIBFDISK) += fdisk # disk-utils UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_ADDPART) += sbin/addpart +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_BLKDISCARD) += sbin/blkdiscard UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_CFDISK) += sbin/cfdisk UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_DELPART) += sbin/delpart UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_RESIZEPART) += sbin/resizepart -- 2.39.5