[ptxdist] [PATCH 1/2] wpa_supplicant: Allow disabling of wpa_cli installation

[ptxdist] [PATCH 1/2] wpa_supplicant: Allow disabling of wpa_cli installation

[Bernhard Walle]

Often wpa_cli is not needed in the final system. So make it possible to
save a few bytes.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 rules/wpa_supplicant.in   |   18 ++++++++++++++++++
 rules/wpa_supplicant.make |    6 ++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/rules/wpa_supplicant.in b/rules/wpa_supplicant.in
index 3f634ab..733a2b5 100644
--- a/rules/wpa_supplicant.in
+++ b/rules/wpa_supplicant.in
@@ -109,4 +109,22 @@ config WPA_SUPPLICANT_DRIVER_ROBOSWITCH
 	  Driver interface for the Broadcom RoboSwitch family
 	  untested
 
+config WPA_SUPPLICANT_INSTALL_CLI
+	bool
+	prompt "Install wpa_cli"
+	default y
+	help
+	  This option enables or disables installation of the wpa_cli tool in
+	  the root file system. The tool allows controlling wpa_supplicant
+	  if used in daemon mode.
+
+	  You need something like
+
+	      ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=network
+	      update_config=1
+
+	  in your /etc/wpa_supplicant.conf to make wpa_cli working. Often
+	  it's not necessary to have wpa_cli in the final (non-development)
+	  version of an Embedded System.
+
 endif
diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make
index 436caaa..d54c6c9 100644
--- a/rules/wpa_supplicant.make
+++ b/rules/wpa_supplicant.make
@@ -120,8 +120,10 @@ $(STATEDIR)/wpa_supplicant.targetinstall:
 
 	@$(call install_copy, wpa_supplicant, 0, 0, 0755, -, \
 		/sbin/wpa_supplicant)
-	@$(call install_copy, wpa_supplicant, 0, 0, 0755, -, \
-		/sbin/wpa_cli)
+
+ifdef PTXCONF_WPA_SUPPLICANT_INSTALL_CLI
+	@$(call install_copy, wpa_supplicant, 0, 0, 0755, -, /sbin/wpa_cli)
+endif
 
 ifdef PTXCONF_WPA_SUPPLICANT_CTRL_IFACE_DBUS
 	@$(call install_alternative, wpa_supplicant, 0, 0, 0644, \
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] wpa_supplicant: Add /etc/wpa_supplicant.conf

[Bernhard Walle]

Make it possible to install a custom /etc/wpa_supplicant.conf
configuration file for the wpa_supplicant via install_alternative
mechanism of ptxdist.

The default file is just empty.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 rules/wpa_supplicant.make |    3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 generic/etc/wpa_supplicant.conf

diff --git a/generic/etc/wpa_supplicant.conf b/generic/etc/wpa_supplicant.conf
new file mode 100644
index 0000000..e69de29
diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make
index d54c6c9..56805be 100644
--- a/rules/wpa_supplicant.make
+++ b/rules/wpa_supplicant.make
@@ -134,6 +134,9 @@ ifdef PTXCONF_WPA_SUPPLICANT_CTRL_IFACE_DBUS
 		/usr/share/dbus-1/system-services/fi.w1.wpa_supplicant1.service)
 endif
 
+	@$(call install_alternative, wpa_supplicant, 0, 0, 0644, \
+		/etc/wpa_supplicant.conf)
+
 	@$(call install_finish, wpa_supplicant)
 
 	@$(call touch)
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de