network-manager svn: sync with poky

1 files changed, 48 insertions, 7 deletions

diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb
index d879381975..610bd01e7e 100644
--- a/packages/networkmanager/networkmanager_svn.bb
+++ b/packages/networkmanager/networkmanager_svn.bb
@@ -1,14 +1,55 @@
-require networkmanager.inc
+DESCRIPTION = "NetworkManager"
+SECTION = "net/misc"
+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 dhcp-client"
 
-PV = "0.6.5+svn${SRCDATE}"
-PR = "r0"
+PV = "0.7+svnr${SRCREV}"
+PR = "r2"
 
-SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \
-	file://NetworkManager \
+SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
+	file://no-restarts.diff;patch=1;pnum=0 \
+	file://25NetworkManager \
 	file://99_networkmanager"
 
-DEFAULT_PREFERENCE = "-1"
+EXTRA_OECONF = " \
+		--with-distro=debian \
+		--with-ip=/sbin/ip"
+# TODO: will /bin/ip from busybox do?
 
-S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE"
+S = "${WORKDIR}/trunk"
 
+inherit autotools pkgconfig
 
+do_install_append () {
+	install -d ${D}/etc/default/volatiles
+	install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
+	install -d ${D}/etc/dbus-1/event.d
+	install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d
+}
+
+do_stage () {
+	autotools_stage_all
+}
+
+pkg_postinst () {
+        if [ "x$D" != "x" ]; then
+                exit 1
+        fi
+        /etc/init.d/populate-volatile.sh update
+}
+
+PACKAGES =+ "libnmutil libnmglib"
+
+FILES_libnmutil += "${libdir}/libnm-util.so.*"
+
+FILES_libnmglib += "${libdir}/libnm_glib.so.*"
+
+FILES_${PN}-dev = "${includedir}/* \
+        ${libdir}/*.so \
+        ${libdir}/*.a \
+        ${libdir}/pkgconfig/*.pc \
+        ${datadir}/NetworkManager/gdb-cmd \
+        "