summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-10-03 12:12:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-03 12:37:02 (GMT)
commit595b119894631189196d00e467bfbc56df38c3a0 (patch)
tree8f050b279b1da08ac208b34001fc2413ab13d8ae /meta/recipes-connectivity
parent2f9328ff32cdbd67ba56a13a3a9a32820605a31f (diff)
downloadpoky-595b119894631189196d00e467bfbc56df38c3a0.tar.gz
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] (From OE-Core rev: 41388c3ae0f4d9cd07e1599fbe125123c20820f8) 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.inc1
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb2
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 () {
61 install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d 61 install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
62 install -d ${D}/${datadir}/dbus-1/system-services 62 install -d ${D}/${datadir}/dbus-1/system-services
63 install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services 63 install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services
64 sed -i -e s:${base_sbindir}:${sbindir}:g ${D}/${datadir}/dbus-1/system-services/*.service
65 64
66 install -d ${D}/etc/default/volatiles 65 install -d ${D}/etc/default/volatiles
67 install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles 66 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 @@
1require wpa-supplicant-1.0.inc 1require wpa-supplicant-1.0.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI[md5sum] = "8650f6aa23646ef634402552d0669640" 5SRC_URI[md5sum] = "8650f6aa23646ef634402552d0669640"
6SRC_URI[sha256sum] = "91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c" 6SRC_URI[sha256sum] = "91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c"