summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-11-09 17:01:09 -0600
committerSaul Wold <sgw@linux.intel.com>2011-11-11 00:33:50 -0800
commit1ce23fe7d7c33c196af3ba25b4e97496718328d1 (patch)
treec38bc9d20b3e0d7392367265ae931163f8c6edb0
parenta7e70227bac72c4f7d3419f94f6915da4c7e3f43 (diff)
downloadopenembedded-core-1ce23fe7d7c33c196af3ba25b4e97496718328d1.tar.gz
openembedded-core-1ce23fe7d7c33c196af3ba25b4e97496718328d1.tar.bz2
openembedded-core-1ce23fe7d7c33c196af3ba25b4e97496718328d1.zip
wpa-supplicant: Avoid blocking the post install script at cross rootfs time.
We only want to reload dbus, if we're install on the target -- not on the host. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc4
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb2
2 files changed, 3 insertions, 3 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 cd62d8f7e9..ccdc4c3e7e 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -66,9 +66,9 @@ do_install () {
}
pkg_postinst_wpa-supplicant () {
- # can't do this offline
+ # If we're offline, we don't need to do this.
if [ "x$D" != "x" ]; then
- exit 1
+ exit 0
fi
DBUSPID=`pidof dbus-daemon`
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 03bd937890..98eba77de7 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 = "r4"
+PR = "r5"
SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"