diff options
| -rw-r--r-- | meta/packages/networkmanager/files/25NetworkManager (renamed from meta-extras/packages/networkmanager/files/25NetworkManager) | 2 | ||||
| -rw-r--r-- | meta/packages/networkmanager/files/99_networkmanager (renamed from meta-extras/packages/networkmanager/files/99_networkmanager) | 0 | ||||
| -rw-r--r-- | meta/packages/networkmanager/files/applet-no-animation.patch (renamed from meta-extras/packages/networkmanager/files/applet-no-animation.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/networkmanager/files/applet-no-gnome.diff (renamed from meta-extras/packages/networkmanager/files/applet-no-gnome.diff) | 0 | ||||
| -rw-r--r-- | meta/packages/networkmanager/files/no-restarts.diff (renamed from meta-extras/packages/networkmanager/files/no-restarts.diff) | 0 | ||||
| -rw-r--r-- | meta/packages/networkmanager/networkmanager-applet_svn.bb (renamed from meta-extras/packages/networkmanager/networkmanager-applet_svn.bb) | 0 | ||||
| -rw-r--r-- | meta/packages/networkmanager/networkmanager_svn.bb (renamed from meta-extras/packages/networkmanager/networkmanager_svn.bb) | 2 |
7 files changed, 3 insertions, 1 deletions
diff --git a/meta-extras/packages/networkmanager/files/25NetworkManager b/meta/packages/networkmanager/files/25NetworkManager index 8e4dec167..676fde35c 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 20cbcc1bc..20cbcc1bc 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 d437fd0fc..d437fd0fc 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 e098e8c9e..e098e8c9e 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 20bdf82aa..20bdf82aa 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 c6c4be425..c6c4be425 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 31b57ffc6..d6e30732e 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 \ |