5 files changed, 151 insertions, 25 deletions

diff --git a/meta-extras/packages/networkmanager/files/NetworkManager b/meta-extras/packages/networkmanager/files/25NetworkManager
index 0beff63081..0beff63081 100644
--- a/meta-extras/packages/networkmanager/files/NetworkManager
+++ b/meta-extras/packages/networkmanager/files/25NetworkManager
diff --git a/meta-extras/packages/networkmanager/files/build-fixes.diff b/meta-extras/packages/networkmanager/files/build-fixes.diff
new file mode 100644
index 0000000000..d771c30563
--- /dev/null
+++ b/meta-extras/packages/networkmanager/files/build-fixes.diff
@@ -0,0 +1,78 @@
+Index: test/nm-tool.c
+===================================================================
+--- test/nm-tool.c      (revision 2853)
++++ test/nm-tool.c      (working copy)
+@@ -148,7 +148,7 @@
+        GString *str;
+        gboolean active = FALSE;
+        guint32 flags, wpa_flags, rsn_flags;
+-       GByteArray * ssid;
++       const GByteArray * ssid;
+        char *tmp;
+ 
+        flags = nm_access_point_get_flags (ap);
+@@ -193,7 +193,6 @@
+        ssid = nm_access_point_get_ssid (ap);
+        tmp = g_strdup_printf ("  %s%s", active ? "*" : "",
+                               ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)");
+-       g_byte_array_free (ssid, TRUE);
+ 
+        print_string (tmp, str->str);
+ 
+Index: callouts/nm-dhcp-client-action.c
+===================================================================
+--- callouts/nm-dhcp-client-action.c    (revision 2853)
++++ callouts/nm-dhcp-client-action.c    (working copy)
+@@ -176,7 +176,7 @@
+ }
+ 
+ 
+-const char ** ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL};
++static const char * ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL};
+ 
+ dbus_bool_t
+ build_message (DBusMessage * message)
+Index: src/nm-netlink.c
+===================================================================
+--- src/nm-netlink.c    (revision 2853)
++++ src/nm-netlink.c    (working copy)
+@@ -19,6 +19,7 @@
+  * (C) Copyright 2007 Red Hat, Inc.
+  */
+ 
++#include <asm/types.h>
+ #include "nm-netlink.h"
+ #include "nm-utils.h"
+ 
+Index: src/vpn-manager/nm-vpn-connection.c
+===================================================================
+--- src/vpn-manager/nm-vpn-connection.c (revision 2853)
++++ src/vpn-manager/nm-vpn-connection.c (working copy)
+@@ -406,7 +406,7 @@
+        routes = nm_vpn_connection_get_routes (connection);
+        org_freedesktop_NetworkManager_VPN_Plugin_connect_async (priv->proxy,
+                                                                                                  nm_vpn_connection_get_vpn_data (connection),
+-                                                                                                 routes,
++                                                                                                 (const char**)routes,
+                                                                                                  nm_vpn_connection_connect_cb,
+                                                                                                  connection);
+ 
+Index: libnm-glib/libnm-glib-test.c
+===================================================================
+--- libnm-glib/libnm-glib-test.c        (revision 2853)
++++ libnm-glib/libnm-glib-test.c        (working copy)
+@@ -165,13 +165,12 @@
+ static void
+ dump_access_point (NMAccessPoint *ap)
+ {
+-       GByteArray * ssid;
++       const GByteArray * ssid;
+        char * str;
+ 
+        ssid = nm_access_point_get_ssid (ap);
+        g_print ("\tSsid: %s\n",
+                 ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)");
+-       g_byte_array_free (ssid, TRUE);
+ 
+        str = nm_access_point_get_hw_address (ap);
+        g_print ("\tMAC Address: %s\n", str);
diff --git a/meta-extras/packages/networkmanager/files/install-tools.patch b/meta-extras/packages/networkmanager/files/install-tools.patch
new file mode 100644
index 0000000000..36cb9424f9
--- /dev/null
+++ b/meta-extras/packages/networkmanager/files/install-tools.patch
@@ -0,0 +1,16 @@
+Index: test/Makefile.am
+===================================================================
+--- test/Makefile.am    (revision 2853)
++++ test/Makefile.am    (working copy)
+@@ -15,8 +15,9 @@
+        -DNM_RUN_DIR=\"$(rundir)\" \
+        -DDATADIR=\"$(datadir)\"
+ 
+-noinst_PROGRAMS = nm-tool \
+-                  nm-online \
++bin_PROGRAMS = nm-tool \
++                  nm-online
++noinst_PROGRAMS = \
+                   nmtestdevices \
+                   libnm_glib_test
+ 
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 \
+        "
diff --git a/meta-extras/packages/networkmanager/networkmanager_svn.bb b/meta-extras/packages/networkmanager/networkmanager_svn.bb
new file mode 100644
index 0000000000..4106bcd047
--- /dev/null
+++ b/meta-extras/packages/networkmanager/networkmanager_svn.bb
@@ -0,0 +1,44 @@
+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"
+PV = "0.7+svn${SRCDATE}"
+
+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://25NetworkManager \
+        file://99_networkmanager"
+
+EXTRA_OECONF = " \
+                --with-distro=debian \
+                --with-ip=/sbin/ip"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools pkgconfig
+
+# TODO: stage
+
+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
+}
+
+pkg_postinst () {
+        /etc/init.d/populate-volatile.sh update
+}
+
+FILES_${PN} += "${libdir}/*.so."
+
+FILES_${PN}-dev = "${includedir}/* \
+        ${libdir}/*.so \
+        ${libdir}/*.a \
+        ${libdir}/pkgconfig/*.pc \
+        ${datadir}/NetworkManager/gdb-cmd \
+        "