summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch32
-rw-r--r--meta/recipes-connectivity/connman/connman_1.25.bb (renamed from meta/recipes-connectivity/connman/connman_1.24.bb)5
2 files changed, 2 insertions, 35 deletions
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 @@
1Upstream-Status: Submitted
2Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
3
4From dd8044ed6ccb468558bab037257e27a409903d86 Mon Sep 17 00:00:00 2001
5From: Jukka Rissanen <jukka.rissanen@linux.intel.com>
6Date: Mon, 21 Jul 2014 15:01:45 +0300
7Subject: [PATCH] scripts: Build libppp-plugin as a plain .so file
8
9There is no need to have module versioning for libppp-plugin.so
10file so build the plugin same way as other vpn plugins.
11
12This issue was seen when building ConnMan for Yocto.
13---
14 Makefile.plugins | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Makefile.plugins b/Makefile.plugins
18index 294cae0..8139967 100644
19--- a/Makefile.plugins
20+++ b/Makefile.plugins
21@@ -4,7 +4,7 @@ plugin_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \
22 plugin_ldflags = -no-undefined -module -avoid-version
23
24 script_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \
25- @DBUS_CFLAGS@
26+ @DBUS_CFLAGS@ $(plugin_ldflags) -shared
27
28 if LOOPBACK
29 builtin_modules += loopback
30--
311.8.3.1
32
diff --git a/meta/recipes-connectivity/connman/connman_1.24.bb b/meta/recipes-connectivity/connman/connman_1.25.bb
index 29e239c671..1758c95ee1 100644
--- a/meta/recipes-connectivity/connman/connman_1.24.bb
+++ b/meta/recipes-connectivity/connman/connman_1.25.bb
@@ -4,9 +4,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ 4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
5 file://add_xuser_dbus_permission.patch \ 5 file://add_xuser_dbus_permission.patch \
6 file://connman \ 6 file://connman \
7 file://build-libppp-plugin-without-versioning-info.patch \
8 " 7 "
9SRC_URI[md5sum] = "dd6e1b4d9b9a28d127edb9f9b58bdec1" 8SRC_URI[md5sum] = "a449d2e49871494506e48765747e6624"
10SRC_URI[sha256sum] = "551df7a5f0c6e4d69523dd2b3aa2c54525b323457d5135f64816215bad3dc24c" 9SRC_URI[sha256sum] = "c1d266d6be18d2f66231f3537a7ed17b57637ca43c27328bc13c508cbeacce6e"
11 10
12RRECOMMENDS_${PN} = "connman-conf" 11RRECOMMENDS_${PN} = "connman-conf"