1 files changed, 13 insertions, 25 deletions

diff --git a/meta-extras/packages/networkmanager/networkmanager_0.6svn.bb b/meta-extras/packages/networkmanager/networkmanager_0.6svn.bb
index a590bbfe3c..5272de7791 100644
--- a/meta-extras/packages/networkmanager/networkmanager_0.6svn.bb
+++ b/meta-extras/packages/networkmanager/networkmanager_0.6svn.bb
@@ -4,13 +4,13 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.gnome.org"
 PRIORITY = "optional"
 DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
-RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
+RDEPENDS = "hal wpa-supplicant iproute2 dhcdbd"
 PV = "0.6.4+svn${SRCDATE}"
 
 PR = "r6"
 
 SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \
-        file://NetworkManager \
+        file://25NetworkManager \
         file://99_networkmanager"
 
 EXTRA_OECONF = " \
@@ -23,7 +23,7 @@ EXTRA_OECONF = " \
 
 S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE"
 
-inherit autotools
+inherit autotools pkgconfig
 
 do_staging () {
         autotools_stage_includes
@@ -31,34 +31,22 @@ do_staging () {
         oe_libinstall gnome/libnm_glib libnm_glib ${STAGING_LIBDIR}
 }
 
-do_install () {
-        oe_libinstall -C libnm-util libnm-util ${D}/usr/lib
-        oe_libinstall -C gnome/libnm_glib libnm_glib ${D}/usr/lib
-
-        oe_runmake -C src DESTDIR="${D}" install
+do_install_append () {
         install -d ${D}/etc/default/volatiles
         install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
-        install -d ${D}/etc/init.d/
-        install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
-        install -d ${D}/${datadir}/
+        install -d ${D}/etc/dbus-1/event.d
+        install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d
 }
 
 pkg_postinst () {
         /etc/init.d/populate-volatile.sh update
 }
 
-FILES_${PN} += "${datadir} \
-                ${libdir}/*.so* \
-                ${libdir}/*.la \
-                ${sbindir} \
-                ${bindir} \
-                ${sysconfdir} \
-                ${libexecdir}"
-
-FILES_${PN}-dev = "${incdir} \
-                   ${libdir}/*.a \
-                   ${libdir}/pkgconfig"
+FILES_${PN} += "${libdir}/*.so."
 
-# The networkmanager package needs to be split into app/lib/dev packages. For
-# now, silence insane.
-INSANE_SKIP_${PN} = "1"
+FILES_${PN}-dev = "${includedir}/* \
+        ${libdir}/*.so \
+        ${libdir}/*.a \
+        ${libdir}/pkgconfig/*.pc \
+        ${datadir}/NetworkManager/gdb-cmd \
+        "