[oe-commits] Ross Burton : wpa-supplicant: don't break the DBus service file
git at git.openembedded.org
git at git.openembedded.org
Wed Oct 3 12:45:18 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 41388c3ae0f4d9cd07e1599fbe125123c20820f8
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=41388c3ae0f4d9cd07e1599fbe125123c20820f8
Author: Ross Burton <ross.burton at intel.com>
Date: Wed Oct 3 13:12:18 2012 +0100
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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../wpa-supplicant/wpa-supplicant-1.0.inc | 1 -
.../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 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"
More information about the Openembedded-commits
mailing list