From 48fe5bd58c0a6384162fc69c9fb2519d01b9bb5c Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Fri, 2 Mar 2012 11:58:43 -0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc') 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 -- cgit v1.2.3-54-g00ecf