Patchwork wpa-supplicant: don't break the DBus service file

login
register
mail settings
Submitter Ross Burton
Date Oct. 3, 2012, 12:12 p.m.
Message ID <1349266338-15222-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/37681/
State Accepted
Commit 41388c3ae0f4d9cd07e1599fbe125123c20820f8
Headers show

Comments

Ross Burton - Oct. 3, 2012, 12:12 p.m.
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@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(-)
Darren Hart - Oct. 3, 2012, 2:49 p.m.
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@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.
Ross Burton - Oct. 3, 2012, 2:57 p.m.
On 3 October 2012 15:49, Darren Hart <dvhart@linux.intel.com> wrote:
> 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!

It wasn't a difference, I suspect that the 0.7 source had some quirks.
 If there's some weird case with non-standard directory layouts I'm
not understanding it.  Either way that sed with the 1.0 source and
standard layout *will* corrupt the paths, so it's best gone.

Ross
Darren Hart - Oct. 3, 2012, 3:03 p.m.
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@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@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.
>

Patch

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
 
 	install -d ${D}/etc/default/volatiles
 	install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
index a60cd86..36ee25c 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
@@ -1,6 +1,6 @@ 
 require wpa-supplicant-1.0.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "8650f6aa23646ef634402552d0669640"
 SRC_URI[sha256sum] = "91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c"