diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2012-01-26 16:32:00 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-01-30 17:46:16 +0100 |
| commit | 509a107a89eca38cc7c3f5b431f3ae83d0349926 (patch) | |
| tree | 863c1e842f51e9d30fe0fd1552fd058c90ee9e5c | |
| parent | f823dadf0af64133c07f1e185c0c4d9dd452c74c (diff) | |
| download | ptxdist-509a107a89eca38cc7c3f5b431f3ae83d0349926.tar.gz ptxdist-509a107a89eca38cc7c3f5b431f3ae83d0349926.tar.xz | |
wpa_supplicant: optionally build wpa_supplicant with dbus support
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/wpa_supplicant.in | 15 | ||||
| -rw-r--r-- | rules/wpa_supplicant.make | 26 |
2 files changed, 41 insertions, 0 deletions
diff --git a/rules/wpa_supplicant.in b/rules/wpa_supplicant.in index 7221ce87f..292797c3c 100644 --- a/rules/wpa_supplicant.in +++ b/rules/wpa_supplicant.in @@ -5,11 +5,26 @@ menuconfig WPA_SUPPLICANT prompt "wpa_supplicant " select OPENSSL select LIBNL + select DBUS if WPA_SUPPLICANT_CTRL_IFACE_DBUS help IEEE 802.1X/WPA supplicant for secure wireless transfers if WPA_SUPPLICANT +config WPA_SUPPLICANT_CTRL_IFACE_DBUS + bool + prompt "dbus control interface" + help + TBD + +config WPA_SUPPLICANT_CTRL_IFACE_DBUS_NEW + bool + default WPA_SUPPLICANT_CTRL_IFACE_DBUS + +config WPA_SUPPLICANT_CTRL_IFACE_DBUS_INTRO + bool + default WPA_SUPPLICANT_CTRL_IFACE_DBUS + config WPA_SUPPLICANT_DRIVER_HOSTAP bool prompt "hostap" diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make index 0dc9b2be8..7cf3a4511 100644 --- a/rules/wpa_supplicant.make +++ b/rules/wpa_supplicant.make @@ -80,6 +80,23 @@ $(STATEDIR)/wpa_supplicant.prepare: @$(call touch) # ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/wpa_supplicant.install: + @$(call targetinfo) + @$(call world/install, WPA_SUPPLICANT) + + install -D -m 644 "$(WPA_SUPPLICANT_DIR)/$(WPA_SUPPLICANT_SUBDIR)/dbus/dbus-wpa_supplicant.conf" \ + "$(WPA_SUPPLICANT_PKGDIR)/etc/dbus-1/system.d/wpa_supplicant.conf" + install -D -m 644 "$(WPA_SUPPLICANT_DIR)/$(WPA_SUPPLICANT_SUBDIR)/dbus/fi.epitest.hostap.WPASupplicant.service" \ + "$(WPA_SUPPLICANT_PKGDIR)/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service" + install -D -m 644 "$(WPA_SUPPLICANT_DIR)/$(WPA_SUPPLICANT_SUBDIR)/dbus/fi.w1.wpa_supplicant1.service" \ + "$(WPA_SUPPLICANT_PKGDIR)/usr/share/dbus-1/system-services/fi.w1.wpa_supplicant1.service" + + @$(call touch) + +# ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -97,6 +114,15 @@ $(STATEDIR)/wpa_supplicant.targetinstall: @$(call install_copy, wpa_supplicant, 0, 0, 0755, -, \ /sbin/wpa_cli) +ifdef PTXCONF_WPA_SUPPLICANT_CTRL_IFACE_DBUS + @$(call install_alternative, wpa_supplicant, 0, 0, 0644, \ + /etc/dbus-1/system.d/wpa_supplicant.conf) + @$(call install_alternative, wpa_supplicant, 0, 0, 0644, \ + /usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service) + @$(call install_alternative, wpa_supplicant, 0, 0, 0644, \ + /usr/share/dbus-1/system-services/fi.w1.wpa_supplicant1.service) +endif + @$(call install_finish, wpa_supplicant) @$(call touch) |