wpa-supplicant-0.7.inc patch

wpa-supplicant-0.7.inc patch

[Martin Bures]

[-- Attachment #1: Type: text/plain, Size: 180 bytes --]

The wpa-supplicant recipe does not place dbus configuration files even
though dbus is enabled in the .config.

The following patch fixes this for me.

Best Regards,
martin.

[-- Attachment #2: wpa-supplicant-dbus-placement-fix.patch --]
[-- Type: text/x-patch, Size: 1871 bytes --]

From b8d6a52070f678371aef194fc0df37c6911e1952 Mon Sep 17 00:00:00 2001
From: Martin Bures <mbures@zoll.com>
Date: Thu, 12 May 2011 16:35:29 -0400
Subject: [PATCH] Fixed issue where dbus configuration is not detected.  This prevented
 wpa-supplicant dbus support from being included.

---
 recipes/wpa-supplicant/wpa-supplicant-0.7.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
index 722f5fa..6e2f754 100644
--- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -50,15 +50,15 @@ do_install () {
 	install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
 	install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
 
-	if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config || grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
+	if grep -q ^CONFIG_CTRL_IFACE_DBUS=y ${S}/.config || grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y ${S}/.config; then
 		install -d ${D}/${sysconfdir}/dbus-1/system.d
 		install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
 		install -d ${D}/${datadir}/dbus-1/system-services
-		if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config; then
+		if grep -q ^CONFIG_CTRL_IFACE_DBUS=y ${S}/.config; then
 			sed -i -e s:/sbin:${sbindir}:g ${S}/dbus/fi.epitest.hostap.WPASupplicant.service
 			install -m 644 ${S}/dbus/fi.epitest.hostap.WPASupplicant.service ${D}/${datadir}/dbus-1/system-services
 		fi
-		if grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
+		if grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y ${S}/.config; then
 			sed -i -e s:/sbin:${sbindir}:g ${S}/dbus/fi.w1.wpa_supplicant1.service
 			install -m 644 ${S}/dbus/fi.w1.wpa_supplicant1.service ${D}/${datadir}/dbus-1/system-services
 		fi
-- 
1.7.0.4

Re: wpa-supplicant-0.7.inc patch

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 3669 bytes --]

Dear Martin,


Am Donnerstag, den 12.05.2011, 16:53 -0400 schrieb Martin Bures:
> The wpa-supplicant recipe does not place dbus configuration files even
> though dbus is enabled in the .config.

you can add this to the commit message too.

> The following patch fixes this for me.

Thank you very much for the patch. Unfortunately we cannot commit this
yet, since at least your Signed-off-by line is missing. Please take a
look at the commit policy [1].

> From b8d6a52070f678371aef194fc0df37c6911e1952 Mon Sep 17 00:00:00 2001
> From: Martin Bures <mbures@zoll.com>

You should decide what address to use and also take that for the
Signed-off-by line.

> Date: Thu, 12 May 2011 16:35:29 -0400
> Subject: [PATCH] Fixed issue where dbus configuration is not detected.  This prevented
>  wpa-supplicant dbus support from being included.

Please use a short commit summary and an elaborate commit message
(body).

wpa-supplicant-0.7.inc: use `.config` in the source directory `${S}`

Using the `.config` in the working directory `${WORKDIR}` …

> ---
>  recipes/wpa-supplicant/wpa-supplicant-0.7.inc |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> index 722f5fa..6e2f754 100644
> --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> @@ -50,15 +50,15 @@ do_install () {
>         install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
>         install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
>  
> -       if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config || grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
> +       if grep -q ^CONFIG_CTRL_IFACE_DBUS=y ${S}/.config || grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y ${S}/.config; then

I still do not quite understand the change. Looking at

        do_configure () {
        	install -m 0755 ${WORKDIR}/defconfig .config
        	if [ "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0, d)}" = "1" ]; then
        		echo "CONFIG_DRIVER_MADWIFI=y" >> .config
        		echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
        	fi
        }

`.config` should be created in `${WORKDIR}` as a copy of `defconfig`.
Why do you now consider `.config` in the source directory? Maybe you
should adapt the `defconfig` shipped by OpenEmbedded?

>                 install -d ${D}/${sysconfdir}/dbus-1/system.d
>                 install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
>                 install -d ${D}/${datadir}/dbus-1/system-services
> -               if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config; then
> +               if grep -q ^CONFIG_CTRL_IFACE_DBUS=y ${S}/.config; then
>                         sed -i -e s:/sbin:${sbindir}:g ${S}/dbus/fi.epitest.hostap.WPASupplicant.service
>                         install -m 644 ${S}/dbus/fi.epitest.hostap.WPASupplicant.service ${D}/${datadir}/dbus-1/system-services
>                 fi
> -               if grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
> +               if grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y ${S}/.config; then
>                         sed -i -e s:/sbin:${sbindir}:g ${S}/dbus/fi.w1.wpa_supplicant1.service
>                         install -m 644 ${S}/dbus/fi.w1.wpa_supplicant1.service ${D}/${datadir}/dbus-1/system-services
>                 fi

I do not know the recipe, so please excuse my questions.


Thanks,

Paul


[1] http://openembedded.org/index.php/Commit_Policy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: wpa-supplicant-0.7.inc patch

[Martin Bures]

Hi, Paul -

I will take a look at the policy and try to update the patch tomorrow.

As for your questions/comments about .config.  That was how the recipe was
when I found it - I was just trying to make minimal modifications from what
was there to get it working.  I agree that it could be changed to use
defconfig.  As with the patch submission guidelines, I will take a look and
see if this change as-suggested works correctly tomorrow and modify and
resubmit the patch accordingly.

best regards,
martin.

On Thu, May 12, 2011 at 5:33 PM, Paul Menzel <
paulepanter@users.sourceforge.net> wrote:

> Dear Martin,
>
>
> Am Donnerstag, den 12.05.2011, 16:53 -0400 schrieb Martin Bures:
> > The wpa-supplicant recipe does not place dbus configuration files even
> > though dbus is enabled in the .config.
>
> you can add this to the commit message too.
>
> > The following patch fixes this for me.
>
> Thank you very much for the patch. Unfortunately we cannot commit this
> yet, since at least your Signed-off-by line is missing. Please take a
> look at the commit policy [1].
>
> > From b8d6a52070f678371aef194fc0df37c6911e1952 Mon Sep 17 00:00:00 2001
> > From: Martin Bures <mbures@zoll.com>
>
> You should decide what address to use and also take that for the
> Signed-off-by line.
>
> > Date: Thu, 12 May 2011 16:35:29 -0400
> > Subject: [PATCH] Fixed issue where dbus configuration is not detected.
>  This prevented
> >  wpa-supplicant dbus support from being included.
>
> Please use a short commit summary and an elaborate commit message
> (body).
>
> wpa-supplicant-0.7.inc: use `.config` in the source directory `${S}`
>
> Using the `.config` in the working directory `${WORKDIR}` …
>
> > ---
> >  recipes/wpa-supplicant/wpa-supplicant-0.7.inc |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> > index 722f5fa..6e2f754 100644
> > --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> > +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> > @@ -50,15 +50,15 @@ do_install () {
> >         install -m 600 ${WORKDIR}/defaults-sane
> ${D}${sysconfdir}/default/wpa
> >         install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane
> ${D}${sysconfdir}/wpa_supplicant.conf
> >
> > -       if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config || grep -q
> ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
> > +       if grep -q ^CONFIG_CTRL_IFACE_DBUS=y ${S}/.config || grep -q
> ^CONFIG_CTRL_IFACE_DBUS_NEW=y ${S}/.config; then
>
> I still do not quite understand the change. Looking at
>
>        do_configure () {
>                install -m 0755 ${WORKDIR}/defconfig .config
>                if [ "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0,
> d)}" = "1" ]; then
>                        echo "CONFIG_DRIVER_MADWIFI=y" >> .config
>                        echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >>
> .config
>                fi
>        }
>
> `.config` should be created in `${WORKDIR}` as a copy of `defconfig`.
> Why do you now consider `.config` in the source directory? Maybe you
> should adapt the `defconfig` shipped by OpenEmbedded?
>
> >                 install -d ${D}/${sysconfdir}/dbus-1/system.d
> >                 install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf
> ${D}/${sysconfdir}/dbus-1/system.d
> >                 install -d ${D}/${datadir}/dbus-1/system-services
> > -               if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config; then
> > +               if grep -q ^CONFIG_CTRL_IFACE_DBUS=y ${S}/.config; then
> >                         sed -i -e s:/sbin:${sbindir}:g
> ${S}/dbus/fi.epitest.hostap.WPASupplicant.service
> >                         install -m 644
> ${S}/dbus/fi.epitest.hostap.WPASupplicant.service
> ${D}/${datadir}/dbus-1/system-services
> >                 fi
> > -               if grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
> > +               if grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y ${S}/.config;
> then
> >                         sed -i -e s:/sbin:${sbindir}:g
> ${S}/dbus/fi.w1.wpa_supplicant1.service
> >                         install -m 644
> ${S}/dbus/fi.w1.wpa_supplicant1.service
> ${D}/${datadir}/dbus-1/system-services
> >                 fi
>
> I do not know the recipe, so please excuse my questions.
>
>
> Thanks,
>
> Paul
>
>
> [1] http://openembedded.org/index.php/Commit_Policy
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>

Re: wpa-supplicant-0.7.inc patch

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

Dear Martin,


Am Donnerstag, den 12.05.2011, 17:54 -0400 schrieb Martin Bures:

> I will take a look at the policy and try to update the patch tomorrow.

thanks.

> As for your questions/comments about .config.  That was how the recipe was
> when I found it - I was just trying to make minimal modifications from what
> was there to get it working.  I agree that it could be changed to use
> defconfig.  As with the patch submission guidelines, I will take a look and
> see if this change as-suggested works correctly tomorrow and modify and
> resubmit the patch accordingly.

Please also take a look at commit aa35ba5c [1] and maybe even CC the
author and committer.

        commit aa35ba5cf7e1bf30fb2edb1408c0b599ec89290a
        Author: Steve Sakoman <steve@sakoman.com>
        Date:   Tue Apr 19 08:40:52 2011 -0700
        
            wpa-supplicant: Enable CONFIG_CTRL_IFACE_DBUS and CONFIG_CTRL_IFACE_DBUS_NEW
            
            Signed-off-by: Steve Sakoman <steve@sakoman.com>
            Signed-off-by: Koen Kooi <koen@openembedded.org>

I do not know what build configuration you use. Please remember to write
down what version you are using and what distribution and machine.


Thanks,

Paul


[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=aa35ba5cf7e1bf30fb2edb1408c0b599ec89290a

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: wpa-supplicant-0.7.inc patch

[Martin Bures]

I have updated the patch and simplified it a bit.  I do not want to switch
the recipe to use defconfig instead of .config because defconfig is modified
by the recipe.

The change simplifies down to just changing the directory back to ${S}.
Then .config can be found again.  The line above the first test changes the
pwd and this is the problem.

As I already submitted the patch via email, I will continue for this one and
use git's submission mechanism in the future.

Best regards,
martin.

From f3f91d271e2f8664b72ed77fc523a733094f701a Mon Sep 17 00:00:00 2001
From: Martin Bures <needemesleepe@gmail.com>
Date: Mon, 16 May 2011 09:47:51 -0400
Subject: [PATCH] wpa-supplicant: fixed .inc recipe to correctly deploy dbus
configuration
 files when dbus is configured.

The current recipe changes the directory, changing the scope such that
the recipe cannot resolve .config.  When tests are made whether .config
contains DBUS configurations, it always fails.  This causes the
placement of DBUS configuration files to always fail.

Signed-off-by: Martin Bures <needemesleepe@gmail.com>
---
 recipes/wpa-supplicant/wpa-supplicant-0.7.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
index 7649038..abf01c2 100644
--- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -63,6 +63,7 @@ do_install () {
     cd ${D}${sysconfdir}/network/ && \
     ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant

+    cd ${S}
     if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config || grep -q
^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
         install -d ${D}/${sysconfdir}/dbus-1/system.d
         install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf
${D}/${sysconfdir}/dbus-1/system.d
-- 
1.7.0.4


On Thu, May 12, 2011 at 6:13 PM, Paul Menzel <
paulepanter@users.sourceforge.net> wrote:

> Dear Martin,
>
>
> Am Donnerstag, den 12.05.2011, 17:54 -0400 schrieb Martin Bures:
>
> > I will take a look at the policy and try to update the patch tomorrow.
>
> thanks.
>
> > As for your questions/comments about .config.  That was how the recipe
> was
> > when I found it - I was just trying to make minimal modifications from
> what
> > was there to get it working.  I agree that it could be changed to use
> > defconfig.  As with the patch submission guidelines, I will take a look
> and
> > see if this change as-suggested works correctly tomorrow and modify and
> > resubmit the patch accordingly.
>
> Please also take a look at commit aa35ba5c [1] and maybe even CC the
> author and committer.
>
>        commit aa35ba5cf7e1bf30fb2edb1408c0b599ec89290a
>        Author: Steve Sakoman <steve@sakoman.com>
>        Date:   Tue Apr 19 08:40:52 2011 -0700
>
>            wpa-supplicant: Enable CONFIG_CTRL_IFACE_DBUS and
> CONFIG_CTRL_IFACE_DBUS_NEW
>
>            Signed-off-by: Steve Sakoman <steve@sakoman.com>
>            Signed-off-by: Koen Kooi <koen@openembedded.org>
>
> I do not know what build configuration you use. Please remember to write
> down what version you are using and what distribution and machine.
>
>
> Thanks,
>
> Paul
>
>
> [1]
> http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=aa35ba5cf7e1bf30fb2edb1408c0b599ec89290a
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>

Re: wpa-supplicant-0.7.inc patch

[Andreas Oberritter]

On 05/16/2011 04:02 PM, Martin Bures wrote:
> diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> index 7649038..abf01c2 100644
> --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
> @@ -63,6 +63,7 @@ do_install () {
>      cd ${D}${sysconfdir}/network/ && \
>      ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
> 
> +    cd ${S}

Sorry for not having replied earlier, but I think the more obvious fix
is to not use "cd" at all. How about this?

ln -s ../if-pre-up.d/wpa-supplicant
${D}${sysconfdir}/network/if-post-down.d/wpa-supplicant

(Using ln -f just hides possible errors in this case.)

Regards,
Andreas

>      if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config || grep -q
> ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
>          install -d ${D}/${sysconfdir}/dbus-1/system.d
>          install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf
> ${D}/${sysconfdir}/dbus-1/system.d

Re: wpa-supplicant-0.7.inc patch

[Andreas Oberritter]

On 05/16/2011 04:20 PM, Andreas Oberritter wrote:
> On 05/16/2011 04:02 PM, Martin Bures wrote:
>> diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
>> b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
>> index 7649038..abf01c2 100644
>> --- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
>> +++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
>> @@ -63,6 +63,7 @@ do_install () {
>>      cd ${D}${sysconfdir}/network/ && \
>>      ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
>>
>> +    cd ${S}
> 
> Sorry for not having replied earlier, but I think the more obvious fix
> is to not use "cd" at all. How about this?
> 
> ln -s ../if-pre-up.d/wpa-supplicant
> ${D}${sysconfdir}/network/if-post-down.d/wpa-supplicant
> 
> (Using ln -f just hides possible errors in this case.)

Btw, I think your patch is for an outdated version. The problem was
solved in master by this commit:

commit aa35ba5cf7e1bf30fb2edb1408c0b599ec89290a
Author: Steve Sakoman <steve@sakoman.com>
Date:   Tue Apr 19 08:40:52 2011 -0700

    wpa-supplicant: Enable CONFIG_CTRL_IFACE_DBUS and CONFIG_CTRL_IFACE_DBUS_NEW
    
    Signed-off-by: Steve Sakoman <steve@sakoman.com>
    Signed-off-by: Koen Kooi <koen@openembedded.org>

The comment about avoiding "cd" still applies, though.

Regards,
Andreas