diff options
| author | Jeff Dike <jdike@linux.intel.com> | 2010-06-03 15:23:17 -0400 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-07 16:03:45 +0100 |
| commit | 42e7e4f3e2e2f2783d4960a352e93f67e8ef4e9f (patch) | |
| tree | 109bd192dd5ff7c94ff46d83ca38d24bd0f318ea | |
| parent | 8f367b6930a0cc4c711996dc1bfb8203fedd37fa (diff) | |
| download | poky-42e7e4f3e2e2f2783d4960a352e93f67e8ef4e9f.tar.gz | |
wpa-supplicant: Don't run populate-volatile.sh on the build system
Move the populate-volatile.sh call to below the offline check.
Otherwise, it will try to run during the build, on a system which
likely doesn't have populate-volatile.sh.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
| -rw-r--r-- | meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc | 4 | ||||
| -rw-r--r-- | meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc index 667b168ee6..220516e57f 100644 --- a/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc +++ b/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc | |||
| @@ -59,13 +59,13 @@ do_install () { | |||
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | pkg_postinst_wpa-supplicant () { | 61 | pkg_postinst_wpa-supplicant () { |
| 62 | /etc/init.d/populate-volatile.sh update | ||
| 63 | |||
| 64 | # can't do this offline | 62 | # can't do this offline |
| 65 | if [ "x$D" != "x" ]; then | 63 | if [ "x$D" != "x" ]; then |
| 66 | exit 1 | 64 | exit 1 |
| 67 | fi | 65 | fi |
| 68 | 66 | ||
| 67 | /etc/init.d/populate-volatile.sh update | ||
| 68 | |||
| 69 | DBUSPID=`pidof dbus-daemon` | 69 | DBUSPID=`pidof dbus-daemon` |
| 70 | 70 | ||
| 71 | if [ "x$DBUSPID" != "x" ]; then | 71 | if [ "x$DBUSPID" != "x" ]; then |
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb b/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb index 440cdebfd8..6feed719eb 100644 --- a/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb +++ b/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | require wpa-supplicant-0.5.inc | 1 | require wpa-supplicant-0.5.inc |
| 2 | 2 | ||
| 3 | PR = "r5" | 3 | PR = "r6" |
