networkmanager: remove integrated patches, fix startup script to start NetworkManagerDispatcher, add missing depends, don't restart ncsd as we don't use it

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

1 files changed, 4 insertions, 4 deletions

diff --git a/meta-extras/packages/networkmanager/networkmanager_svn.bb b/meta-extras/packages/networkmanager/networkmanager_svn.bb
index cb3f72e2e6..5f05c1433d 100644
--- a/meta-extras/packages/networkmanager/networkmanager_svn.bb
+++ b/meta-extras/packages/networkmanager/networkmanager_svn.bb
@@ -4,20 +4,20 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.gnome.org"
 PRIORITY = "optional"
 DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp"
-RDEPENDS = "hal wpa-supplicant iproute2"
+RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
 
 PV = "0.7+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
-        file://build-fixes.diff;patch=1;pnum=0 \
-        file://install-tools.patch;patch=1;pnum=0 \
+        file://no-restarts.diff;patch=1;pnum=0 \
         file://25NetworkManager \
         file://99_networkmanager"
 
 EXTRA_OECONF = " \
                 --with-distro=debian \
                 --with-ip=/sbin/ip"
+# TODO: will /bin/ip from busybox do?
 
 S = "${WORKDIR}/trunk"