[OE-core] [PATCH] wpa-supplicant: don't break the DBus service file

[Darren Hart]

On 10/03/2012 07:49 AM, Darren Hart wrote:
> On 10/03/2012 05:12 AM, Ross Burton wrote:
>> The recipe exports $BINDIR as ${sbindir} and the build system uses this when
>> writing the DBus service file, so sedding it and replacing $base_sbindir with
>> $sbindir (/sbin and /usr/sbin) isn't useful when it ends up as
>> /usr/usr/sbin/wpa_supplicant.
>>
>> [YOCTO: #3202]
>>
>> Signed-off-by: Ross Burton <ross.burton at intel.com>

Applied to master, built for FRI2, mkefidisk'd it, booted, associated
with home network, ifdown eth0, pingtest to google. Perfect.

Tested-by: Darren Hart <dvhart at linux.intel.com>


>> ---
>>  meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc |    1 -
>>  meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb  |    2 +-
>>  2 files changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
>> index 873e923..485a2dd 100644
>> --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
>> +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
>> @@ -61,7 +61,6 @@ do_install () {
>>  	install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
>>  	install -d ${D}/${datadir}/dbus-1/system-services
>>  	install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services
>> -	sed -i -e s:${base_sbindir}:${sbindir}:g ${D}/${datadir}/dbus-1/system-services/*.service
> 
> Huh... I didn't detect this as a difference from 0.7 to 1.0, so I wonder
> why 0.7 worked.
> 
> But I don't wonder too much - thanks for the fix!
> 
> Building and testing now.
> 

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel