networkmanager: Move from meta-extras to meta

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

7 files changed, 3 insertions, 1 deletions

diff --git a/meta-extras/packages/networkmanager/files/25NetworkManager b/meta/packages/networkmanager/files/25NetworkManager
index 8e4dec167f..676fde35c5 100644
--- a/meta-extras/packages/networkmanager/files/25NetworkManager
+++ b/meta/packages/networkmanager/files/25NetworkManager
@@ -9,6 +9,7 @@ case $1 in
     echo -n "Starting NetworkManager daemon: NetworkManager"
     /usr/sbin/NetworkManager 
     /usr/sbin/NetworkManagerDispatcher
+    /usr/sbin/wpa_supplicant -u &
     echo "."
   ;;
 
@@ -16,6 +17,7 @@ case $1 in
     echo -n "Stopping NetworkManager daemon: NetworkManager"
     kill `ps |grep  /usr/sbin/NetworkManagerDispatcher | grep -v grep | cut "-d " -f2`
     kill `ps |grep  /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2`
+    kill `ps |grep  /usr/sbin/wpa_supplicant | grep -v grep | cut "-d " -f2`
     echo "."
   ;;
 
diff --git a/meta-extras/packages/networkmanager/files/99_networkmanager b/meta/packages/networkmanager/files/99_networkmanager
index 20cbcc1bca..20cbcc1bca 100644
--- a/meta-extras/packages/networkmanager/files/99_networkmanager
+++ b/meta/packages/networkmanager/files/99_networkmanager
diff --git a/meta-extras/packages/networkmanager/files/applet-no-animation.patch b/meta/packages/networkmanager/files/applet-no-animation.patch
index d437fd0fc9..d437fd0fc9 100644
--- a/meta-extras/packages/networkmanager/files/applet-no-animation.patch
+++ b/meta/packages/networkmanager/files/applet-no-animation.patch
diff --git a/meta-extras/packages/networkmanager/files/applet-no-gnome.diff b/meta/packages/networkmanager/files/applet-no-gnome.diff
index e098e8c9ed..e098e8c9ed 100644
--- a/meta-extras/packages/networkmanager/files/applet-no-gnome.diff
+++ b/meta/packages/networkmanager/files/applet-no-gnome.diff
diff --git a/meta-extras/packages/networkmanager/files/no-restarts.diff b/meta/packages/networkmanager/files/no-restarts.diff
index 20bdf82aab..20bdf82aab 100644
--- a/meta-extras/packages/networkmanager/files/no-restarts.diff
+++ b/meta/packages/networkmanager/files/no-restarts.diff
diff --git a/meta-extras/packages/networkmanager/networkmanager-applet_svn.bb b/meta/packages/networkmanager/networkmanager-applet_svn.bb
index c6c4be425f..c6c4be425f 100644
--- a/meta-extras/packages/networkmanager/networkmanager-applet_svn.bb
+++ b/meta/packages/networkmanager/networkmanager-applet_svn.bb
diff --git a/meta-extras/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb
index 31b57ffc6f..d6e30732e8 100644
--- a/meta-extras/packages/networkmanager/networkmanager_svn.bb
+++ b/meta/packages/networkmanager/networkmanager_svn.bb
@@ -7,7 +7,7 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp"
 RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
 
 PV = "0.7+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
         file://no-restarts.diff;patch=1;pnum=0 \