wpa-supplicant: do not start at boot - it is started on wlan0 if-up

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3643 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 2 insertions, 10 deletions

diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
index f56f060151..c8578e7c25 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
+++ b/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
@@ -8,7 +8,6 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
         file://wpa_supplicant-0.5.7-always-scan.patch;patch=1 \
         file://wpa_supplicant-fix-deprecated-dbus-function.patch;patch=1;pnum=0 \
         file://defconfig-gnutls \
-        file://init.sh \
         file://defaults-sane \
         file://wpa-supplicant.sh \
         file://wpa_supplicant.conf \
@@ -22,10 +21,6 @@ FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli"
 
 RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
 
-INITSCRIPT_NAME = "wpa"
-INITSCRIPT_PARAMS = "defaults 10"
-inherit update-rc.d
-
 do_configure () {
         install -m 0755 ${WORKDIR}/defconfig-gnutls  .config
 }
@@ -45,9 +40,6 @@ do_install () {
         install -d ${D}${docdir}/wpa_supplicant
         install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
 
-        install -d ${D}${sysconfdir}/init.d
-        install -m 700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa
-
         install -d ${D}${sysconfdir}/default
         install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
         install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
@@ -75,4 +67,4 @@ pkg_postinst_wpa-supplicant () {
         if [ "x$DBUSPID" != "x" ]; then
                 /etc/init.d/dbus-1 reload
         fi
-}
\ No newline at end of file
+}
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 ce744b3fe7..e4babb2b6d 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 @@
 require wpa-supplicant-0.5.inc
 
-PR = "r3"
+PR = "r4"