Patchwork [meta-systemd,v2] wpa-supplicant: add systemd support

login
register
mail settings
Submitter Andreas Müller
Date Aug. 14, 2012, 12:10 a.m.
Message ID <1344903048-2800-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/34453/
State Superseded
Headers show

Comments

Andreas Müller - Aug. 14, 2012, 12:10 a.m.
* native systemd support came in with v1.0 [1]
* needs [2] to work properly
* mends my wlan under control of networkmanager

[1] http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap-1.git;a=blob_plain;f=wpa_supplicant/ChangeLog
[2] http://patches.openembedded.org/patch/34335/

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../wpa-supplicant/wpa-supplicant_1.0.bbappend     |    3 ---
 .../wpa-supplicant/wpa-supplicant_1.0.bbappend     |   14 ++++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
 create mode 100644 meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
Andreas Müller - Aug. 16, 2012, 11:44 a.m.
On Tue, Aug 14, 2012 at 2:10 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> * native systemd support came in with v1.0 [1]
> * needs [2] to work properly
> * mends my wlan under control of networkmanager
>
> [1] http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap-1.git;a=blob_plain;f=wpa_supplicant/ChangeLog
> [2] http://patches.openembedded.org/patch/34335/
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  .../wpa-supplicant/wpa-supplicant_1.0.bbappend     |    3 ---
>  .../wpa-supplicant/wpa-supplicant_1.0.bbappend     |   14 ++++++++++++++
>  2 files changed, 14 insertions(+), 3 deletions(-)
>  delete mode 100644 meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>  create mode 100644 meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>
> diff --git a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend b/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
> deleted file mode 100644
> index 54da0ff..0000000
> --- a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> -
> -PRINC = "1"
> diff --git a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
> new file mode 100644
> index 0000000..6f62cd8
> --- /dev/null
> +++ b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
> @@ -0,0 +1,14 @@
> +PRINC = "2"
> +
> +inherit systemd
> +
> +SYSTEMD_PACKAGES = "${PN}-systemd"
> +SYSTEMD_SERVICE = "wpa_supplicant.service"
> +
> +do_install_append () {
> +    install -d ${D}${systemd_unitdir}/system
> +    install -m 644 ${S}/systemd/*.service ${D}${systemd_unitdir}/system
> +}
> +
> +# systemd.bbclass does not catch all multiple-instance-service-files
> +FILES_${PN}-systemd += "${systemd_unitdir}/system/"
> --
> 1.7.4.4
>
I am testing

SYSTEMD_AUTO_ENABLE = "disable"

to avoid starting at every boot. First results look good and I think a
V3 will follow.

Andreas
Koen Kooi - Aug. 16, 2012, noon
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 16-08-12 13:44, Andreas Müller schreef:
> On Tue, Aug 14, 2012 at 2:10 AM, Andreas Müller 
> <schnitzeltony@googlemail.com> wrote:
>> * native systemd support came in with v1.0 [1] * needs [2] to work
>> properly * mends my wlan under control of networkmanager
>> 
>> [1]
>> http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap-1.git;a=blob_plain;f=wpa_supplicant/ChangeLog
>>
>> 
[2] http://patches.openembedded.org/patch/34335/
>> 
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- 
>> .../wpa-supplicant/wpa-supplicant_1.0.bbappend     |    3 --- 
>> .../wpa-supplicant/wpa-supplicant_1.0.bbappend     |   14
>> ++++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) delete
>> mode 100644
>> meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>
>> 
create mode 100644
meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>> 
>> diff --git
>> a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>> b/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>
>> 
deleted file mode 100644
>> index 54da0ff..0000000 ---
>> a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>
>> 
+++ /dev/null
>> @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - 
>> -PRINC = "1" diff --git
>> a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>> b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>
>> 
new file mode 100644
>> index 0000000..6f62cd8 --- /dev/null +++
>> b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>
>> 
@@ -0,0 +1,14 @@
>> +PRINC = "2" + +inherit systemd + +SYSTEMD_PACKAGES = "${PN}-systemd" 
>> +SYSTEMD_SERVICE = "wpa_supplicant.service" + +do_install_append () { +
>> install -d ${D}${systemd_unitdir}/system +    install -m 644
>> ${S}/systemd/*.service ${D}${systemd_unitdir}/system +} + +#
>> systemd.bbclass does not catch all multiple-instance-service-files 
>> +FILES_${PN}-systemd += "${systemd_unitdir}/system/" -- 1.7.4.4
>> 
> I am testing
> 
> SYSTEMD_AUTO_ENABLE = "disable"
> 
> to avoid starting at every boot. First results look good and I think a V3
> will follow.

wpa-supplicant should get bus-activated using the dbus.service when
connman/networkmanager/whatever need it. Is something failing in the nm case?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQLOD7MkyGM64RGpERApwPAJ4rD/uo5K5qPUkYIcM6ryyjF20A1wCfcSy2
GlOQNzYL2vE+LzuxrMU8pQE=
=xMkp
-----END PGP SIGNATURE-----
Andreas Müller - Aug. 16, 2012, 12:28 p.m.
On Thu, Aug 16, 2012 at 2:00 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 16-08-12 13:44, Andreas Müller schreef:
>> On Tue, Aug 14, 2012 at 2:10 AM, Andreas Müller
>> <schnitzeltony@googlemail.com> wrote:
>>> * native systemd support came in with v1.0 [1] * needs [2] to work
>>> properly * mends my wlan under control of networkmanager
>>>
>>> [1]
>>> http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap-1.git;a=blob_plain;f=wpa_supplicant/ChangeLog
>>>
>>>
> [2] http://patches.openembedded.org/patch/34335/
>>>
>>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---
>>> .../wpa-supplicant/wpa-supplicant_1.0.bbappend     |    3 ---
>>> .../wpa-supplicant/wpa-supplicant_1.0.bbappend     |   14
>>> ++++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) delete
>>> mode 100644
>>> meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>>
>>>
> create mode 100644
> meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>>
>>> diff --git
>>> a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>> b/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>>
>>>
> deleted file mode 100644
>>> index 54da0ff..0000000 ---
>>> a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>>
>>>
> +++ /dev/null
>>> @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -
>>> -PRINC = "1" diff --git
>>> a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>> b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>>
>>>
> new file mode 100644
>>> index 0000000..6f62cd8 --- /dev/null +++
>>> b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
>>>
>>>
> @@ -0,0 +1,14 @@
>>> +PRINC = "2" + +inherit systemd + +SYSTEMD_PACKAGES = "${PN}-systemd"
>>> +SYSTEMD_SERVICE = "wpa_supplicant.service" + +do_install_append () { +
>>> install -d ${D}${systemd_unitdir}/system +    install -m 644
>>> ${S}/systemd/*.service ${D}${systemd_unitdir}/system +} + +#
>>> systemd.bbclass does not catch all multiple-instance-service-files
>>> +FILES_${PN}-systemd += "${systemd_unitdir}/system/" -- 1.7.4.4
>>>
>> I am testing
>>
>> SYSTEMD_AUTO_ENABLE = "disable"
>>
>> to avoid starting at every boot. First results look good and I think a V3
>> will follow.
>
> wpa-supplicant should get bus-activated using the dbus.service when
> connman/networkmanager/whatever need it. Is something failing in the nm case?
>
No nothing is failing so far. I did systemctl disable
wpa_supplicant.service on the machine and everything still works. But
before sending out V3 I would like to test on a fresh image.

Andreas

Patch

diff --git a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend b/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
deleted file mode 100644
index 54da0ff..0000000
--- a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@ 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
- 
-PRINC = "1"
diff --git a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
new file mode 100644
index 0000000..6f62cd8
--- /dev/null
+++ b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
@@ -0,0 +1,14 @@ 
+PRINC = "2"
+
+inherit systemd
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "wpa_supplicant.service"
+
+do_install_append () {
+    install -d ${D}${systemd_unitdir}/system
+    install -m 644 ${S}/systemd/*.service ${D}${systemd_unitdir}/system
+}
+
+# systemd.bbclass does not catch all multiple-instance-service-files
+FILES_${PN}-systemd += "${systemd_unitdir}/system/"