summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2020-05-14 18:11:21 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-05-15 13:51:12 +0200
commit4ec32aa513cd1beac7a74a9fe792ffa6493cb9fc (patch)
treebcca5dd82b286ed33ae8c45f4a82e08c6eedfe72
parent0e807864fd2ce9dadfcfbac6ca45a005c7d0bc41 (diff)
downloadptxdist-4ec32aa513cd1beac7a74a9fe792ffa6493cb9fc.tar.gz
ptxdist-4ec32aa513cd1beac7a74a9fe792ffa6493cb9fc.tar.xz
util-linux-ng: make wdctl tool selectable
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Message-Id: <20200514161121.22474-1-u.kleine-koenig@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/util-linux-ng.in6
-rw-r--r--rules/util-linux-ng.make5
2 files changed, 10 insertions, 1 deletions
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index a9735e13c..34fcd5a47 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -342,6 +342,12 @@ config UTIL_LINUX_NG_HWCLOCK
comment "BusyBox' hwclock is selected!"
depends on BUSYBOX_HWCLOCK
+config UTIL_LINUX_NG_WDCTL
+ bool
+ prompt "wdctl"
+ help
+ wdctl - Utility to show hardware watchdog status.
+
config UTIL_LINUX_NG_IONICE
bool
prompt "ionice"
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 88abca85f..ff583267f 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -92,7 +92,7 @@ UTIL_LINUX_NG_CONF_OPT := \
--disable-fdformat \
--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_HWCLOCK)-hwclock \
--disable-lslogins \
- --disable-wdctl \
+ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_WDCTL)-wdctl \
--disable-cal \
--disable-logger \
--disable-switch_root \
@@ -279,6 +279,9 @@ endif
ifdef PTXCONF_UTIL_LINUX_NG_HWCLOCK
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/hwclock)
endif
+ifdef PTXCONF_UTIL_LINUX_NG_WDCTL
+ @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/wdctl)
+endif
ifdef PTXCONF_UTIL_LINUX_NG_IONICE
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/ionice)
endif