diff options
author | Steve Sakoman <steve@sakoman.com> | 2012-03-02 11:58:43 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-02 22:35:08 +0000 |
commit | 48fe5bd58c0a6384162fc69c9fb2519d01b9bb5c (patch) | |
tree | 5a38a24b97af8c84baf7f5cfeacb9082b6ef581e /meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc | |
parent | 98bb8f76dd81a1bf5f9213ad51089efecd4985ad (diff) | |
download | poky-48fe5bd58c0a6384162fc69c9fb2519d01b9bb5c.tar.gz |
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.
(From OE-Core rev: 857840472705af1c0fbb8db917b4bb6809b929a6)
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/wpa-supplicant-0.7.inc')
-rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc | 2 |
1 files changed, 1 insertions, 1 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 () { | |||
58 | install -d ${D}/${sysconfdir}/dbus-1/system.d | 58 | install -d ${D}/${sysconfdir}/dbus-1/system.d |
59 | install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d | 59 | install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d |
60 | install -d ${D}/${datadir}/dbus-1/system-services | 60 | install -d ${D}/${datadir}/dbus-1/system-services |
61 | sed -i -e s:${base_sbindir}:${sbindir}:g ${S}/dbus/*.service | ||
62 | install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services | 61 | install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services |
62 | sed -i -e s:${base_sbindir}:${sbindir}:g ${D}/${datadir}/dbus-1/system-services/*.service | ||
63 | 63 | ||
64 | install -d ${D}/etc/default/volatiles | 64 | install -d ${D}/etc/default/volatiles |
65 | install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles | 65 | install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles |