From 76d5209023f2742ffbb501161250fab485d41844 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Wed, 27 Aug 2014 21:10:01 +0300 Subject: connman: upgrade to 1.25 build-libppp-plugin-without-versioning-info.patch no longer needed, removed. Changelog: Fix issue with handling rebind timer for DHCPv6. Fix issue with handling DHCP renew transaction. Fix issue with user supplied proxy settings and DHCP. Fix issue with extra status codes from captive portals. Fix issue with service idle state reset on failure. Fix issue with DNS label compression handling. Add support for experimental P2P Peer service. Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie (cherry picked from commit f53c5e7914ea37338817fcb7efbd42414045e07c) Signed-off-by: Andreas Oberritter --- ...ild-libppp-plugin-without-versioning-info.patch | 32 ---------------------- meta/recipes-connectivity/connman/connman_1.24.bb | 12 -------- meta/recipes-connectivity/connman/connman_1.25.bb | 11 ++++++++ 3 files changed, 11 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch delete mode 100644 meta/recipes-connectivity/connman/connman_1.24.bb create mode 100644 meta/recipes-connectivity/connman/connman_1.25.bb diff --git a/meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch b/meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch deleted file mode 100644 index 8e81f1bc52..0000000000 --- a/meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Jukka Rissanen - -From dd8044ed6ccb468558bab037257e27a409903d86 Mon Sep 17 00:00:00 2001 -From: Jukka Rissanen -Date: Mon, 21 Jul 2014 15:01:45 +0300 -Subject: [PATCH] scripts: Build libppp-plugin as a plain .so file - -There is no need to have module versioning for libppp-plugin.so -file so build the plugin same way as other vpn plugins. - -This issue was seen when building ConnMan for Yocto. ---- - Makefile.plugins | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.plugins b/Makefile.plugins -index 294cae0..8139967 100644 ---- a/Makefile.plugins -+++ b/Makefile.plugins -@@ -4,7 +4,7 @@ plugin_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \ - plugin_ldflags = -no-undefined -module -avoid-version - - script_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \ -- @DBUS_CFLAGS@ -+ @DBUS_CFLAGS@ $(plugin_ldflags) -shared - - if LOOPBACK - builtin_modules += loopback --- -1.8.3.1 - diff --git a/meta/recipes-connectivity/connman/connman_1.24.bb b/meta/recipes-connectivity/connman/connman_1.24.bb deleted file mode 100644 index 29e239c671..0000000000 --- a/meta/recipes-connectivity/connman/connman_1.24.bb +++ /dev/null @@ -1,12 +0,0 @@ -require connman.inc - -SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ - file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ - file://add_xuser_dbus_permission.patch \ - file://connman \ - file://build-libppp-plugin-without-versioning-info.patch \ - " -SRC_URI[md5sum] = "dd6e1b4d9b9a28d127edb9f9b58bdec1" -SRC_URI[sha256sum] = "551df7a5f0c6e4d69523dd2b3aa2c54525b323457d5135f64816215bad3dc24c" - -RRECOMMENDS_${PN} = "connman-conf" diff --git a/meta/recipes-connectivity/connman/connman_1.25.bb b/meta/recipes-connectivity/connman/connman_1.25.bb new file mode 100644 index 0000000000..1758c95ee1 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman_1.25.bb @@ -0,0 +1,11 @@ +require connman.inc + +SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ + file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ + file://add_xuser_dbus_permission.patch \ + file://connman \ + " +SRC_URI[md5sum] = "a449d2e49871494506e48765747e6624" +SRC_URI[sha256sum] = "c1d266d6be18d2f66231f3537a7ed17b57637ca43c27328bc13c508cbeacce6e" + +RRECOMMENDS_${PN} = "connman-conf" -- cgit 1.2.3-korg