[ptxdist] [PATCH] util-linux-ng: make wdctl tool selectable

[ptxdist] [PATCH] util-linux-ng: make wdctl tool selectable

[Uwe Kleine-König]

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 rules/util-linux-ng.in   | 6 ++++++
 rules/util-linux-ng.make | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index a9735e13c910..34fcd5a47271 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 88abca85f15e..ff583267f8ed 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
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [APPLIED] util-linux-ng: make wdctl tool selectable

[Michael Olbrich]

Thanks, applied as 4ec32aa513cd1beac7a74a9fe792ffa6493cb9fc.

Michael

[sent from post-receive hook]

On Tue, 19 May 2020 14:23:37 +0200, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> 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>
> 
> diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
> index a9735e13c910..34fcd5a47271 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 88abca85f15e..ff583267f8ed 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

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de