[oe-commits] Michael 'Mickey' Lauer : connman: use libnl2

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 20e56bce4f4c951365b53e8c44d464a17f2ce79f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=20e56bce4f4c951365b53e8c44d464a17f2ce79f

Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Jan  7 17:54:33 2010 +0100

connman: use libnl2

---

 recipes/connman/connman.inc                     |    2 +-
 recipes/connman/connman_0.46.bb                 |    6 +++---
 recipes/connman/files/link-against-libnl2.patch |   13 +++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc
index 5b2f0cc..9ea04e3 100644
--- a/recipes/connman/connman.inc
+++ b/recipes/connman/connman.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
 SECTION = "libs/network"
 LICENSE = "GPL"
 # we need to define the depends here, the dynamic stuff is too late
-DEPENDS  = "libnl wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4"
+DEPENDS  = "libnl2 wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4"
 
 EXTRA_OECONF += "\
     ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb
index 814187d..9fcd7a7 100644
--- a/recipes/connman/connman_0.46.bb
+++ b/recipes/connman/connman_0.46.bb
@@ -1,6 +1,5 @@
 require connman.inc
-
-PR = "r3"
+PR = "r5"
 
 EXTRA_OECONF += "\
   --disable-gtk-doc \
@@ -15,6 +14,7 @@ EXTRA_OECONF += "\
   --enable-dhclient \
   --enable-resolvconf \
   --enable-dnsproxy \
+  --enable-tools \
   --disable-novatel \
   --disable-huawei \
   --disable-hso \
@@ -32,7 +32,7 @@ EXTRA_OECONF += "\
 
 SRC_URI  = "\
   http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
+  file://link-against-libnl2.patch;patch=1 \
   file://no_system_user_perms.patch;patch=1 \
   file://connman \
 "
-
diff --git a/recipes/connman/files/link-against-libnl2.patch b/recipes/connman/files/link-against-libnl2.patch
new file mode 100644
index 0000000..5be1618
--- /dev/null
+++ b/recipes/connman/files/link-against-libnl2.patch
@@ -0,0 +1,13 @@
+Index: connman-0.46/configure.ac
+===================================================================
+--- connman-0.46.orig/configure.ac
++++ connman-0.46/configure.ac
+@@ -326,7 +326,7 @@
+ AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools],
+ 		[enable testing tools]), [enable_tools=${enableval}])
+ if (test "${enable_tools}" = "yes"); then
+-	PKG_CHECK_MODULES(NETLINK, libnl-1, dummy=yes,
++	PKG_CHECK_MODULES(NETLINK, libnl-2.0, dummy=yes,
+ 				AC_MSG_ERROR(Netlink library is required))
+ 	AC_SUBST(NETLINK_CFLAGS)
+ 	AC_SUBST(NETLINK_LIBS)