connman: update to 0.76

The libnl patch isn't needed anymore, the wifi-scan util is gone

(From meta-openembedded rev: 037a063303d35c2fab8097d977aa5625c916c565)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-connectivity/connman/connman.inc b/meta-openembedded/meta-oe/recipes-connectivity/connman/connman.inc
index 1022ce7..2652125 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-connectivity/connman/connman.inc
+++ b/meta-openembedded/meta-oe/recipes-connectivity/connman/connman.inc
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
                     file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e"
 
 # we need to define the depends here, the dynamic stuff is too late
-DEPENDS  = "libnl wpa-supplicant dbus glib-2.0 ppp busybox dhcp resolvconf bluez4 iptables gnutls ntp"
+DEPENDS  = "wpa-supplicant dbus glib-2.0 ppp busybox dhcp resolvconf bluez4 iptables gnutls ntp"
 
 EXTRA_OECONF += "\
     ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
@@ -47,7 +47,6 @@ do_install_append() {
        install -d ${D}${bindir}
        install -m 0755 ${S}/tools/*-test ${D}${bindir}
        install -m 0755 ${S}/tools/wispr ${D}${bindir}
-       install -m 0755 ${S}/tools/wifi-scan ${D}${bindir}
 }
 
 python populate_packages_prepend() {
@@ -69,7 +68,7 @@ PACKAGES_DYNAMIC = "${PN}-plugin-*"
 
 PACKAGES =+ "${PN}-scripts ${PN}-tools ${PN}-tests"
 
-FILES_${PN}-tools = "${bindir}/wispr ${bindir}/wifi-scan"
+FILES_${PN}-tools = "${bindir}/wispr"
 FILES_${PN{-tests = "${bindir}/*-test"
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \

diff --git a/meta-openembedded/meta-oe/recipes-connectivity/connman/connman/link-against-libnl2.patch b/meta-openembedded/meta-oe/recipes-connectivity/connman/connman/link-against-libnl2.patch
deleted file mode 100644 (file)
index 5be1618..0000000
--- a/meta-openembedded/meta-oe/recipes-connectivity/connman/connman/link-against-libnl2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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)

diff --git a/meta-openembedded/meta-oe/recipes-connectivity/connman/connman_0.75.bb b/meta-openembedded/meta-oe/recipes-connectivity/connman/connman_0.76.bb
similarity index 75%
rename from meta-openembedded/meta-oe/recipes-connectivity/connman/connman_0.75.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/connman/connman_0.76.bb
index 8270761..8257be5 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-connectivity/connman/connman_0.75.bb
+++ b/meta-openembedded/meta-oe/recipes-connectivity/connman/connman_0.76.bb
@@ -19,12 +19,11 @@ EXTRA_OECONF += "\
 
 SRC_URI  = "\
   http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
-  file://link-against-libnl2.patch \
   file://connman \
 "
 
-SRC_URI[md5sum] = "9973cb89a11fff6b51fc85b51c13b711"
-SRC_URI[sha256sum] = "b15361237f7ec8092fb0e55d4585550ab35491485edaf10ddd032d6e36299db7"
+SRC_URI[md5sum] = "59b4cfd9fa4f736f7a2d88ee0c758fe9"
+SRC_URI[sha256sum] = "bf58fa72454bb63033da8f847a4709dbdfe64c000056a93a7504240cb31c1321"
 
 # alg-test doesn't build, so disable that
 do_configure_prepend() {