[ptxdist] [PATCH] util-linux: add option for building blkdiscard

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

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 <a.fatoum@pengutronix.de>
---
 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