Fix Bug 603
PATCH 1/2 wpa-supplicant: change dbus interface
In reply to Dongxiao XuFrom: Dongxiao Xu <[email protected]>
The new interface "fi.w1.wpa_supplicant1" is used in latest connman, thus add it in the wpa_supplicant default configuration.
Besides, enable netlink support with libnl 2.0 mode.
[BUGID #603]
--- .../wpa-supplicant-0.7.3/defconfig-gnutls | 4 +++- .../wpa-supplicant/wpa-supplicant-0.7.inc | 2 +- .../wpa-supplicant/wpa-supplicant_0.7.3.bb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls +3 -1
@@ -81,7 +81,8 @@ CONFIG_DRIVER_HOSTAP=y CONFIG_DRIVER_WEXT=y # Driver interface for Linux drivers using the nl80211 kernel interface -#CONFIG_DRIVER_NL80211=y +CONFIG_LIBNL20=y +CONFIG_DRIVER_NL80211=y # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) #CONFIG_DRIVER_BSD=y
@@ -405,3 +406,4 @@ CONFIG_PEERKEY=y CONFIG_TLS = gnutls CONFIG_GNUTLS_EXTRA=y CONFIG_CTRL_IFACE_DBUS=y +CONFIG_CTRL_IFACE_DBUS_NEW=y
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc +1 -1
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 | BSD" LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \ file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e" -DEPENDS = "gnutls dbus" +DEPENDS = "gnutls dbus libnl" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb +1 -1
@@ -1,6 +1,6 @@ require wpa-supplicant-0.7.inc -PR = "r3" +PR = "r4" SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda" SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"
Signature · 1 line
1.6.3.3
PATCH 2/2 dbus: change owner and mode for dbus-daemon-launch-helper in postinst
In reply to Dongxiao XuFrom: Dongxiao Xu <[email protected]>
Add code in dbus postinst to change owner and mode for dbus-daemon-launch-helper.
[BUGID #603]
--- meta/recipes-core/dbus/dbus.inc | 4 +++- meta/recipes-core/dbus/dbus_1.4.1.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-core/dbus/dbus.inc +3 -1
@@ -53,7 +53,9 @@ pkg_postinst_dbus() { --ingroup "$MESSAGEUSER" "$MESSAGEUSER" grep -q netdev: /etc/group || addgroup netdev - chmod u+s /usr/libexec/dbus-daemon-launch-helper + + chown root:"$MESSAGEUSER" /usr/libexec/dbus-daemon-launch-helper + chmod 4754 /usr/libexec/dbus-daemon-launch-helper # add volatile after new user/grp are created echo "d messagebus messagebus 0755 /var/run/dbus none" > /etc/default/volatiles/99_dbus
meta/recipes-core/dbus/dbus_1.4.1.bb +1 -1
@@ -1,6 +1,6 @@ include dbus.inc -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac" SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"
Signature · 1 line
1.6.3.3
From: Dongxiao Xu <[email protected]>
Hi Saul,
This pull request fixes [BUGID #603], please help to review and pull.
Actually there are two bugs inside:
1) wpa_supplicant is not launched by default.
2) Even if manually launch wpa_supplicant, wifi interface still couldn't be enabled.
Some points to fix this issue:
1) Using new dbus interface in wpa_supplicant: "fi.w1.wpa_supplicant1"
2) Enable nl802.11 support in wpa_supplicant.
3) Fix the dbus-daemon-launch-helper permission issue.
Changes from v1:
Set both CONFIG_CTRL_IFACE_DBUS and CONFIG_CTRL_IFACE_DBUS_NEW to 'y' in wpa_supplicant's configuration file.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dxu4/bugfix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/bugfix
Thanks,
Dongxiao Xu <[email protected]>
---
Dongxiao Xu (2):
wpa-supplicant: change dbus interface
dbus: change owner and mode for dbus-daemon-launch-helper in postinst
.../wpa-supplicant-0.7.3/defconfig-gnutls | 4 +++- .../wpa-supplicant/wpa-supplicant-0.7.inc | 2 +- .../wpa-supplicant/wpa-supplicant_0.7.3.bb | 2 +- meta/recipes-core/dbus/dbus.inc | 4 +++- meta/recipes-core/dbus/dbus_1.4.1.bb | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-)
Richard Purdie
AppliedQuoted 20 lines · Dongxiao Xu
From: Dongxiao Xu <[email protected]>
Hi Saul,
This pull request fixes [BUGID #603], please help to review and pull.
Actually there are two bugs inside:
1)
wpa_supplicantis not launched by default.
2) Even if manually launchwpa_supplicant, wifi interface still couldn't be enabled.Some points to fix this issue:
1) Using new dbus interface in
wpa_supplicant: "fi.w1.wpa_supplicant1"
2) Enable nl802.11 support inwpa_supplicant.
3) Fix the dbus-daemon-launch-helper permission issue.Changes from v1:
Set bothCONFIG_CTRL_IFACE_DBUSandCONFIG_CTRL_IFACE_DBUS_NEWto 'y' in wpa_supplicant's configuration file.
Quoted 6 lines
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: dxu4/bugfix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/bugfixThanks,
Dongxiao Xu <[email protected]>
Merged to master.
Thanks,
Richard