[ptxdist] [PATCH v2] util-linux: add an option to enable rfkill

[ptxdist] [PATCH v2] util-linux: add an option to enable rfkill

[Philipp Zabel]

Add a configuration option UTIL_LINUX_RFKILL to enable the rfkill tool.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
Changes since v1: depend on !BUSYBOX_RFKILL, add comment if it is set.
---
 rules/util-linux.in   | 13 +++++++++++++
 rules/util-linux.make |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/rules/util-linux.in b/rules/util-linux.in
index 429473404a14..7b89ced68eb7 100644
--- a/rules/util-linux.in
+++ b/rules/util-linux.in
@@ -468,6 +468,19 @@ config UTIL_LINUX_READPROFILE
 comment "BusyBox' readprofile is selected!"
 	depends on BUSYBOX_READPROFILE
 
+config UTIL_LINUX_RFKILL
+	bool
+	prompt "rfkill"
+	select UTIL_LINUX_LIBSMARTCOLS
+	depends on !BUSYBOX_RFKILL || ALLYES
+	help
+	  rfkill is a simple tool for accessing the Linux rfkill device
+	  interface, which is used to enable and disable wireless networking
+	  devices, typically WLAN, Bluetooth and mobile broadband.
+
+comment "BusyBox' rfkill is selected!"
+	depends on BUSYBOX_RFKILL
+
 config UTIL_LINUX_SWAPON
 	bool
 	prompt "swapon"
diff --git a/rules/util-linux.make b/rules/util-linux.make
index 0afa9ecdd938..c0f2dab369e4 100644
--- a/rules/util-linux.make
+++ b/rules/util-linux.make
@@ -116,7 +116,7 @@ UTIL_LINUX_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCS)-ipcs \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_IRQTOP)-irqtop \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LSIRQ)-lsirq \
-	--disable-rfkill \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_RFKILL)-rfkill \
 	--disable-scriptutils \
 	--disable-tunelp \
 	--disable-kill \
@@ -238,6 +238,7 @@ UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_MOUNTPOINT)		+= bin/mountpoint
 UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NSENTER)		+= bin/nsenter
 UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_PIVOT_ROOT)		+= sbin/pivot_root
 UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_READPROFILE)	+= sbin/readprofile
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_RFKILL)		+= sbin/rfkill
 UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SWAPON)		+= sbin/swapoff sbin/swapon
 UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SWITCH_ROOT)	+= sbin/switch_root
 UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_UMOUNT)		+= bin/umount
-- 
2.30.2

Re: [ptxdist] [APPLIED] util-linux: add an option to enable rfkill

[Michael Olbrich]

Thanks, applied as d106e99c3673d6a5a75e864012c89d8280059041.

Michael

[sent from post-receive hook]

On Tue, 03 Jan 2023 12:08:20 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Add a configuration option UTIL_LINUX_RFKILL to enable the rfkill tool.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20221214113320.792585-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/util-linux.in b/rules/util-linux.in
> index 429473404a14..7b89ced68eb7 100644
> --- a/rules/util-linux.in
> +++ b/rules/util-linux.in
> @@ -468,6 +468,19 @@ config UTIL_LINUX_READPROFILE
>  comment "BusyBox' readprofile is selected!"
>  	depends on BUSYBOX_READPROFILE
>  
> +config UTIL_LINUX_RFKILL
> +	bool
> +	prompt "rfkill"
> +	select UTIL_LINUX_LIBSMARTCOLS
> +	depends on !BUSYBOX_RFKILL || ALLYES
> +	help
> +	  rfkill is a simple tool for accessing the Linux rfkill device
> +	  interface, which is used to enable and disable wireless networking
> +	  devices, typically WLAN, Bluetooth and mobile broadband.
> +
> +comment "BusyBox' rfkill is selected!"
> +	depends on BUSYBOX_RFKILL
> +
>  config UTIL_LINUX_SWAPON
>  	bool
>  	prompt "swapon"
> diff --git a/rules/util-linux.make b/rules/util-linux.make
> index 0afa9ecdd938..c0f2dab369e4 100644
> --- a/rules/util-linux.make
> +++ b/rules/util-linux.make
> @@ -116,7 +116,7 @@ UTIL_LINUX_CONF_OPT	:= \
>  	--$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCS)-ipcs \
>  	--$(call ptx/endis, PTXCONF_UTIL_LINUX_IRQTOP)-irqtop \
>  	--$(call ptx/endis, PTXCONF_UTIL_LINUX_LSIRQ)-lsirq \
> -	--disable-rfkill \
> +	--$(call ptx/endis, PTXCONF_UTIL_LINUX_RFKILL)-rfkill \
>  	--disable-scriptutils \
>  	--disable-tunelp \
>  	--disable-kill \
> @@ -238,6 +238,7 @@ UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_MOUNTPOINT)		+= bin/mountpoint
>  UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NSENTER)		+= bin/nsenter
>  UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_PIVOT_ROOT)		+= sbin/pivot_root
>  UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_READPROFILE)	+= sbin/readprofile
> +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_RFKILL)		+= sbin/rfkill
>  UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SWAPON)		+= sbin/swapoff sbin/swapon
>  UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SWITCH_ROOT)	+= sbin/switch_root
>  UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_UMOUNT)		+= bin/umount