diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-10-03 13:12:18 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-03 13:34:51 +0100 |
| commit | 41388c3ae0f4d9cd07e1599fbe125123c20820f8 (patch) | |
| tree | b1a935ed7299e2f9f0b1170ab46ef17f6e1be6ec /meta/recipes-connectivity | |
| parent | eb96be4db46039752c44dc37ef676eaac04e3dba (diff) | |
| download | openembedded-core-41388c3ae0f4d9cd07e1599fbe125123c20820f8.tar.gz openembedded-core-41388c3ae0f4d9cd07e1599fbe125123c20820f8.tar.bz2 openembedded-core-41388c3ae0f4d9cd07e1599fbe125123c20820f8.zip | |
wpa-supplicant: don't break the DBus service file
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb | 2 |
2 files changed, 1 insertions, 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 873e923f35..485a2dd5dd 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 a60cd863f1..36ee25c7e0 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" |