aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/wpa-supplicant
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2012-03-02 11:58:43 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-02 22:35:03 +0000
commit857840472705af1c0fbb8db917b4bb6809b929a6 (patch)
tree43f53da34cf5e03d223ebec0c26128ef6d71131f /meta/recipes-connectivity/wpa-supplicant
parentb24d4bcde21b013e48eaffea5f3a70d8b1df1047 (diff)
downloadopenembedded-core-contrib-857840472705af1c0fbb8db917b4bb6809b929a6.tar.gz
openembedded-core-contrib-857840472705af1c0fbb8db917b4bb6809b929a6.tar.bz2
openembedded-core-contrib-857840472705af1c0fbb8db917b4bb6809b929a6.zip
wpa-supplicant: fix breakage during rebuild
Install phase currently edits files in $S with sed. This causes breakage if install is run a second time (due to sstate hash rebuild for example) The result is hidden build breakage, in particular /usr/share/dbus-1/system-services/fi.w1.wpa_supplicant1.service now contains: Exec=/usr/usr/sbin/wpa_supplicant -u rather than: Exec=/usr/sbin/wpa_supplicant -u This patch does the sed edit after the files are copied to $D, which should be safe. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/wpa-supplicant')
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc2
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index 99317e4c49..539ab8c19a 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -58,8 +58,8 @@ do_install () {
install -d ${D}/${sysconfdir}/dbus-1/system.d
install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
install -d ${D}/${datadir}/dbus-1/system-services
- sed -i -e s:${base_sbindir}:${sbindir}:g ${S}/dbus/*.service
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_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
index 49f5482326..c607fadee3 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@
require wpa-supplicant-0.7.inc
-PR = "r6"
+PR = "r7"
SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"