From 70c2a73b3fc9ff0be0787585ea6e69695a0d177d Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 7 Mar 2019 11:47:24 +0100 Subject: [PATCH] wpa-supplicant: enable control socket interface for systemd service https://jira.digi.com/browse/DEL-6483 Signed-off-by: Arturo Buzarra --- ...ystemd-enable-control-socket-interfa.patch | 29 +++++++++++++++++++ .../wpa-supplicant/wpa-supplicant_%.bbappend | 3 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-wpa_supplicant-systemd-enable-control-socket-interfa.patch diff --git a/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-wpa_supplicant-systemd-enable-control-socket-interfa.patch b/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-wpa_supplicant-systemd-enable-control-socket-interfa.patch new file mode 100644 index 000000000..e7318e36f --- /dev/null +++ b/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-wpa_supplicant-systemd-enable-control-socket-interfa.patch @@ -0,0 +1,29 @@ +From: Arturo Buzarra +Date: Thu, 7 Mar 2019 09:47:52 +0100 +Subject: [PATCH] wpa_supplicant: systemd: enable control socket interface for + systemd service + +Otherwise the command "wpa_cli" fails with: + +Failed to connect to non-global ctrl_ifname + +https://jira.digi.com/browse/DEL-6483 + +Signed-off-by: Arturo Buzarra +--- + wpa_supplicant/systemd/wpa_supplicant.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in +index bc5d49a..6c38238 100644 +--- a/wpa_supplicant/systemd/wpa_supplicant.service.in ++++ b/wpa_supplicant/systemd/wpa_supplicant.service.in +@@ -6,7 +6,7 @@ Wants=network.target + [Service] + Type=dbus + BusName=@DBUS_INTERFACE@ +-ExecStart=@BINDIR@/wpa_supplicant -u ++ExecStart=@BINDIR@/wpa_supplicant -u -O /var/run/wpa_supplicant + + [Install] + WantedBy=multi-user.target diff --git a/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend b/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend index 7a80ba361..7867dd56c 100644 --- a/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2017 Digi International. +# Copyright (C) 2013-2019 Digi International. FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" @@ -6,6 +6,7 @@ PACKAGECONFIG ?= "openssl" SRC_URI += " \ file://0001-wpa_supplicant-enable-control-socket-interface-when-.patch \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://0002-wpa_supplicant-systemd-enable-control-socket-interfa.patch', '', d)} \ file://wpa_supplicant_p2p.conf \ "