mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

wpa-supplicant: fix breakage during rebuild

Browse Source 
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.

(From OE-Core rev: 857840472705af1c0fbb8db917b4bb6809b929a6)

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Steve Sakoman
2012-03-02 11:58:43 -08:00
committed by Richard Purdie
parent 98bb8f76dd
commit 48fe5bd58c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
View File

@@ -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

2
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
View File

@@ -1,6 +1,6 @@
require wpa-supplicant-0.7.inc
PR = "r6"
PR = "r7"
SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"