1 files changed, 8 insertions, 52 deletions
diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb
index e6bd318063..4045b817de 100644
--- a/packages/networkmanager/networkmanager_svn.bb
+++ b/packages/networkmanager/networkmanager_svn.bb
@@ -1,57 +1,13 @@
-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"
+require networkmanager-pre0.7.inc
 
 PV = "0.7+svnr${SRCREV}"
-PR = "r5"
+PR = "r1"
 
-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"
 
-S = "${WORKDIR}/trunk"
-
-EXTRA_OECONF = " \
-		--with-distro=debian \
-		--with-ip=/sbin/ip.iproute2"
-
-inherit autotools pkgconfig
-
-do_stage () {
-	autotools_stage_all
-}
-
-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
-	sed -i s,/sbin/ip,/sbin/ip.iproute2, ${D}/etc/init.d/NetworkManager
-}
-
-pkg_postinst () {
-        if [ "x$D" != "x" ]; then
-                exit 1
-        fi
-        /etc/init.d/populate-volatile.sh update
-}
-
-PACKAGES =+ "libnmutil libnmglib libnmglib-vpn" 
-
-FILES_libnmutil += "${libdir}/libnm-util.so.*"
-FILES_libnmglib += "${libdir}/libnm_glib.so.*"
-FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*"
-
-FILES_${PN} += " \
-		${libexecdir} \
-		${libdir}/pppd/*/nm-pppd-plugin.so \
-		${libdir}/NetworkManager/*.so"
-FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \
-		    ${libdir}/pppd/*/.debug/ "
-FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd "
+SRC_URI += "svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
+            file://define_kernel_types_for_old_linux_headers.patch;patch=1 \
+            file://no-restarts.diff;patch=1;pnum=0 \
+           "
 
+S = "${WORKDIR}/trunk"