[oe] 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 at 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 at 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 at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>