networkmanager_git: fix build with static libnl1

* backend/ip6-manager didn't respect LIBNL_CFLAGS so using
  /usr/include/netlink headers from libnl-2
* older versions of networkmanager should be fixed or removed
* only build tested, please test runtime..

Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/networkmanager/networkmanager-0.7.inc b/recipes/networkmanager/networkmanager-0.7.inc
index 6c0ccbe..18af1bc 100644 (file)
--- a/recipes/networkmanager/networkmanager-0.7.inc
+++ b/recipes/networkmanager/networkmanager-0.7.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "NetworkManager"
 SECTION = "net/misc"
 LICENSE = "GPL"
 PRIORITY = "optional"
-DEPENDS = "libnl dbus dbus-glib hal wireless-tools policykit gnutls util-linux-ng ppp"
+DEPENDS = "libnl1 dbus dbus-glib hal wireless-tools policykit gnutls util-linux-ng ppp"
 RDEPENDS_${PN} = "wpa-supplicant dhcp-client \
            ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \
            "

diff --git a/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch b/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch
new file mode 100644 (file)
index 0000000..a923da5
--- /dev/null
+++ b/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch
@@ -0,0 +1,51 @@
+From 9d6414375e2371086dcfadc1d117fbcfe43fb3fc Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 23 Mar 2011 17:27:54 +0100
+Subject: [PATCH] respect libnl flags also in backends/ip6-manager
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/backends/Makefile.am    |    2 ++
+ src/ip6-manager/Makefile.am |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am
+index fbec9aa..c0780d0 100644
+--- a/src/backends/Makefile.am
++++ b/src/backends/Makefile.am
+@@ -63,10 +63,12 @@ endif
+ 
+ libnmbackend_la_LIBADD += \
+       $(top_builddir)/src/logging/libnm-logging.la \
++      $(LIBNL_LIBS) \
+       $(DBUS_LIBS) \
+       $(GLIB_LIBS)
+ 
+ libnmbackend_la_CPPFLAGS = \
++      $(LIBNL_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       -DG_DISABLE_DEPRECATED \
+diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am
+index b56b197..b98d6de 100644
+--- a/src/ip6-manager/Makefile.am
++++ b/src/ip6-manager/Makefile.am
+@@ -13,6 +13,7 @@ libip6_manager_la_SOURCES = \
+       nm-ip6-manager.h
+ 
+ libip6_manager_la_CPPFLAGS = \
++      $(LIBNL_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       -DG_DISABLE_DEPRECATED
+@@ -20,6 +21,7 @@ libip6_manager_la_CPPFLAGS = \
+ libip6_manager_la_LIBADD = \
+       $(top_builddir)/marshallers/libmarshallers.la \
+       $(top_builddir)/src/logging/libnm-logging.la \
++      $(LIBNL_LIBS) \
+       $(DBUS_LIBS) \
+       $(GLIB_LIBS)
+ 
+-- 
+1.7.4.1
+

diff --git a/recipes/networkmanager/networkmanager_git.bb b/recipes/networkmanager/networkmanager_git.bb
index bb746a1..c6bfab2 100644 (file)
--- a/recipes/networkmanager/networkmanager_git.bb
+++ b/recipes/networkmanager/networkmanager_git.bb
@@ -2,6 +2,7 @@ require networkmanager-0.7.inc
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
+DEFAULT_PREFERENCE_shr = "1"
 
 SRCREV = "9b61ec7c58e8106c28d01b33ad0b263aefb1f347"
 PV = "0.8.2+git"
@@ -18,6 +19,7 @@ SRC_URI += " \
     file://nm-system-settings.conf \
     file://NetworkManager \
     file://gtk-doc.make \
+    file://0001-respect-libnl-flags-also-in-backends-ip6-manager.patch \
 "
 
 EXTRA_OECONF += " --with-dhclient=${base_sbindir}/dhclient \