diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-16 12:46:45 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-16 12:46:45 +0100 |
| commit | 40bb7a30fca0bda0beb0177bdac2783c5875db2f (patch) | |
| tree | 3f451282d4bd89b137e8d0f2fc72b461f83d9eda /meta | |
| parent | e423eadb0ff65496d5ca24b12abc7080123db536 (diff) | |
| download | openembedded-core-40bb7a30fca0bda0beb0177bdac2783c5875db2f.tar.gz openembedded-core-40bb7a30fca0bda0beb0177bdac2783c5875db2f.tar.bz2 openembedded-core-40bb7a30fca0bda0beb0177bdac2783c5875db2f.zip | |
networkmanager: Update to work with recent libnl
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/networkmanager/files/libnlfix.patch | 29 | ||||
| -rw-r--r-- | meta/packages/networkmanager/networkmanager_svn.bb | 3 |
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/packages/networkmanager/files/libnlfix.patch b/meta/packages/networkmanager/files/libnlfix.patch new file mode 100644 index 0000000000..69f4922ea0 --- /dev/null +++ b/meta/packages/networkmanager/files/libnlfix.patch @@ -0,0 +1,29 @@ +Index: trunk/src/nm-netlink.c +=================================================================== +--- trunk.orig/src/nm-netlink.c 2007-09-25 22:37:50.000000000 +0100 ++++ trunk/src/nm-netlink.c 2009-05-16 12:44:26.000000000 +0100 +@@ -52,16 +52,20 @@ + struct nl_handle * + nm_netlink_get_default_handle (void) + { ++ struct nl_cb *cb; ++ + if (def_nl_handle) + return def_nl_handle; + +- def_nl_handle = nl_handle_alloc_nondefault (NL_CB_VERBOSE); +- g_assert (def_nl_handle); ++ cb = nl_cb_alloc(NL_CB_VERBOSE); ++ def_nl_handle = nl_handle_alloc_cb (cb); ++ if (!def_nl_handle) { ++ nm_warning ("couldn't allocate netlink handle."); ++ return NULL; ++ } + +- nl_handle_set_pid (def_nl_handle, (pthread_self () << 16 | getpid ())); + if (nl_connect (def_nl_handle, NETLINK_ROUTE) < 0) { + nm_error ("couldn't connect to netlink: %s", nl_geterror ()); +- nl_handle_destroy (def_nl_handle); + return NULL; + } + diff --git a/meta/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb index 96d1cf3980..d3c5443335 100644 --- a/meta/packages/networkmanager/networkmanager_svn.bb +++ b/meta/packages/networkmanager/networkmanager_svn.bb @@ -7,10 +7,11 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp gnome-common p RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" PV = "0.7+svnr${SRCREV}" -PR = "r8" +PR = "r9" SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ file://no-restarts.diff;patch=1;pnum=0 \ + file://libnlfix.patch;patch=1 \ file://makefile-fix.patch;patch=1 \ file://allow-disabling.patch;patch=1 \ file://NetworkManager \ |