mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
connman: Delete patches for gold and MIPS binutils fix
gold is no longer built/supported. The workaround for binutils on MIPS no longer appears to be required. Also fix up tabs/whitespace in shell functions, correct HOMEPAGE, drop broken BUGTRACKER link. (From OE-Core rev: 5c269ba9a396832af3f8139ecaa0cfd9f7d4d1b5) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alex Kiernan
Richard Purdie
parent
fbecb1dc20
commit
2430a96138
|
|
@ -1,31 +0,0 @@
|
|||
From c254226d4ebbd846c1f8169d70413a0d32d7ae77 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 7 Apr 2012 18:52:12 -0700
|
||||
Subject: [PATCH] plugin.h: Change visibility to default for debug symbols
|
||||
|
||||
gold refuses to link in undefined weak symbols which
|
||||
have hidden visibility
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
include/plugin.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/plugin.h b/include/plugin.h
|
||||
index 8d2bb08..a12a6be 100644
|
||||
--- a/include/plugin.h
|
||||
+++ b/include/plugin.h
|
||||
@@ -89,9 +89,9 @@ struct connman_plugin_desc {
|
||||
#else
|
||||
#define CONNMAN_PLUGIN_DEFINE(name, description, version, priority, init, exit) \
|
||||
extern struct connman_debug_desc __start___debug[] \
|
||||
- __attribute__ ((weak, visibility("hidden"))); \
|
||||
+ __attribute__ ((weak, visibility("default"))); \
|
||||
extern struct connman_debug_desc __stop___debug[] \
|
||||
- __attribute__ ((weak, visibility("hidden"))); \
|
||||
+ __attribute__ ((weak, visibility("default"))); \
|
||||
extern struct connman_plugin_desc connman_plugin_desc \
|
||||
__attribute__ ((visibility("default"))); \
|
||||
struct connman_plugin_desc connman_plugin_desc = { \
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From 67f37aafcc8ef5d2eb006387e7bec21f74518727 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Tue, 9 Aug 2016 12:12:02 +0100
|
||||
Subject: [PATCH] connman: disable version-scripts to fix crashes at startup
|
||||
|
||||
With binutils 2.27 on at least MIPS, connmand will crash on startup. This
|
||||
appears to be due to the symbol visibilty scripts hiding symbols that stdio
|
||||
looks up at runtime, resulting in it segfaulting.
|
||||
|
||||
This certainly appears to be a bug in binutils 2.27 although the problem has
|
||||
been known about for some time:
|
||||
|
||||
https://sourceware.org/bugzilla/show_bug.cgi?id=17908
|
||||
|
||||
As the version scripts are only used to hide symbols from plugins we can safely
|
||||
remove the scripts to work around the problem until binutils is fixed.
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
---
|
||||
Makefile.am | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 3dc3bb5..3be5ccb 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -143,8 +143,7 @@ src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
|
||||
@GIO_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ \
|
||||
-lresolv -ldl -lrt
|
||||
|
||||
-src_connmand_LDFLAGS = -Wl,--export-dynamic \
|
||||
- -Wl,--version-script=$(srcdir)/src/connman.ver
|
||||
+src_connmand_LDFLAGS = -Wl,--export-dynamic
|
||||
|
||||
src_connmand_wait_online_SOURCES = src/connmand-wait-online.c
|
||||
|
||||
@@ -187,8 +186,7 @@ vpn_connman_vpnd_LDADD = gdbus/libgdbus-internal.la $(builtin_vpn_libadd) \
|
||||
@GIO_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @GNUTLS_LIBS@ \
|
||||
-lresolv -ldl
|
||||
|
||||
-vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \
|
||||
- -Wl,--version-script=$(srcdir)/vpn/vpn.ver
|
||||
+vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic
|
||||
endif
|
||||
|
||||
BUILT_SOURCES = $(local_headers) src/builtin.h $(service_files) \
|
||||
|
|
@ -7,8 +7,7 @@ It is a fully modular system that can be extended, through plug-ins, \
|
|||
to support all kinds of wired or wireless technologies. Also, \
|
||||
configuration methods, like DHCP and domain name resolving, are \
|
||||
implemented using plug-ins."
|
||||
HOMEPAGE = "http://connman.net/"
|
||||
BUGTRACKER = "https://01.org/jira/browse/CM"
|
||||
HOMEPAGE = "https://web.git.kernel.org/pub/scm/network/connman/connman.git/about/"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
|
||||
file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36"
|
||||
|
|
@ -20,10 +19,8 @@ CVE_PRODUCT = "connman connection_manager"
|
|||
DEPENDS = "dbus glib-2.0 ppp"
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
|
||||
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
|
||||
file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
|
||||
file://connman \
|
||||
file://no-version-scripts.patch \
|
||||
file://0002-resolve-musl-does-not-implement-res_ninit.patch \
|
||||
"
|
||||
|
||||
|
|
@ -116,10 +113,10 @@ do_install:append() {
|
|||
# plugins directory to be present for ownership
|
||||
mkdir -p ${D}${libdir}/connman/plugins
|
||||
|
||||
# For read-only filesystem, do not create links during bootup
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
|
||||
ln -sf ../run/connman/resolv.conf ${D}${sysconfdir}/resolv-conf.connman
|
||||
fi
|
||||
# For read-only filesystem, do not create links during bootup
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
|
||||
ln -sf ../run/connman/resolv.conf ${D}${sysconfdir}/resolv-conf.connman
|
||||
fi
|
||||
}
|
||||
|
||||
# These used to be plugins, but now they are core
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user