From e600587fdc3f3e55de886c6f883f55777df7dfcf Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 7 Feb 2008 20:00:09 +0000
Subject: [PATCH] networkmanager: Move from meta-extras to meta

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3709 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../packages/networkmanager/files/25NetworkManager              | 2 ++
 .../packages/networkmanager/files/99_networkmanager             | 0
 .../packages/networkmanager/files/applet-no-animation.patch     | 0
 .../packages/networkmanager/files/applet-no-gnome.diff          | 0
 .../packages/networkmanager/files/no-restarts.diff              | 0
 .../packages/networkmanager/networkmanager-applet_svn.bb        | 0
 .../packages/networkmanager/networkmanager_svn.bb               | 2 +-
 7 files changed, 3 insertions(+), 1 deletion(-)
 rename {meta-extras => meta}/packages/networkmanager/files/25NetworkManager (84%)
 rename {meta-extras => meta}/packages/networkmanager/files/99_networkmanager (100%)
 rename {meta-extras => meta}/packages/networkmanager/files/applet-no-animation.patch (100%)
 rename {meta-extras => meta}/packages/networkmanager/files/applet-no-gnome.diff (100%)
 rename {meta-extras => meta}/packages/networkmanager/files/no-restarts.diff (100%)
 rename {meta-extras => meta}/packages/networkmanager/networkmanager-applet_svn.bb (100%)
 rename {meta-extras => meta}/packages/networkmanager/networkmanager_svn.bb (99%)

diff --git a/meta-extras/packages/networkmanager/files/25NetworkManager b/meta/packages/networkmanager/files/25NetworkManager
similarity index 84%
rename from meta-extras/packages/networkmanager/files/25NetworkManager
rename to 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
similarity index 100%
rename from meta-extras/packages/networkmanager/files/99_networkmanager
rename to 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
similarity index 100%
rename from meta-extras/packages/networkmanager/files/applet-no-animation.patch
rename to 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
similarity index 100%
rename from meta-extras/packages/networkmanager/files/applet-no-gnome.diff
rename to 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
similarity index 100%
rename from meta-extras/packages/networkmanager/files/no-restarts.diff
rename to 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
similarity index 100%
rename from meta-extras/packages/networkmanager/networkmanager-applet_svn.bb
rename to meta/packages/networkmanager/networkmanager-applet_svn.bb
diff --git a/meta-extras/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb
similarity index 99%
rename from meta-extras/packages/networkmanager/networkmanager_svn.bb
rename to 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 \
-- 
2.40.1