diff options
| author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2014-07-21 15:59:09 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-23 21:44:20 +0100 |
| commit | d2328d6aa52fd4f0b47ae3292ae6ae07301bf9d0 (patch) | |
| tree | f83d61065acc46ccaf8937766c897c7cbb4ebd98 /meta | |
| parent | b8b6214b885a0757f0e628937f8fe21c92c45155 (diff) | |
| download | openembedded-core-d2328d6aa52fd4f0b47ae3292ae6ae07301bf9d0.tar.gz openembedded-core-d2328d6aa52fd4f0b47ae3292ae6ae07301bf9d0.tar.bz2 openembedded-core-d2328d6aa52fd4f0b47ae3292ae6ae07301bf9d0.zip | |
connman: Fix PPTP VPN plugin QA issue
This error was seen when building ConnMan. Fixed by not
building ConnMan pptp plugin with module versioning info.
ERROR: QA Issue: non -dev/-dbg/-nativesdk package contains symlink .so: connman-plugin-vpn-pptp path '/work/core2-32-oe-linux/connman/1.24+gitAUTOINC+42779cd63c-r20/packages-split/connman-plugin-vpn-pptp/usr/lib/connman/scripts/libppp-plugin.so' [dev-so]
ERROR: QA run found fatal errors. Please consider fixing them.
ERROR: Function failed: do_package_qa
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman_1.24.bb | 1 |
2 files changed, 33 insertions, 0 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 new file mode 100644 index 0000000000..8e81f1bc52 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch @@ -0,0 +1,32 @@ +Upstream-Status: Submitted +Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> + +From dd8044ed6ccb468558bab037257e27a409903d86 Mon Sep 17 00:00:00 2001 +From: Jukka Rissanen <jukka.rissanen@linux.intel.com> +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 index 66a8c58681..29e239c671 100644 --- a/meta/recipes-connectivity/connman/connman_1.24.bb +++ b/meta/recipes-connectivity/connman/connman_1.24.bb @@ -4,6 +4,7 @@ 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" |