| Submitter | Martin Bures |
|---|---|
| Date | May 16, 2011, 2:02 p.m. |
| Message ID | <BANLkTinkK8Erz22QP=2CbyOReFc9b2YnSw@mail.gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/4131/ |
| State | New, archived |
| Headers | show |
Comments
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
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
Patch
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
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(-) install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d