From patchwork Wed Apr 2 16:02:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 60633 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08AB3C36017 for ; Wed, 2 Apr 2025 16:02:32 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web11.12823.1743609745938740141 for ; Wed, 02 Apr 2025 09:02:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bj4QM0sv; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: alex.kiernan@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43cf680d351so6107955e9.0 for ; Wed, 02 Apr 2025 09:02:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743609744; x=1744214544; darn=lists.openembedded.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=BeWdzIfO2DW+yUfvaZaspXmNGunE2+lJN2R+b207DXE=; b=bj4QM0svjWVBauifp3j2lOHyip338k398zdkriT42GyrIFXNeyCsMsgOcpSXEqzq0c no0Rdq3arxkLXo9ohjEiet591saDQKTpxdYKUpNlQJ7R7NaAWtdzGd5oeocFS49usSpD 3b/NVrlkidRpxDb0tsSp/UeVXmhBGXWL5SWc74Y+QwJTMGhVEXA0L2hLDSKQh4A/lXEH 87M0joPIsFyy7iCIuHQO5OWiKFF1a+0fonB4Z3Xm9+L2RN1xcXBC5azhqUBJKclyaeO4 MUUM95imljKrYguNf6O7Al4u9n8E5O5sH2srLNcBmosdLmFc3pCVN70ptTfgvwnuTLvX 5mAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743609744; x=1744214544; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BeWdzIfO2DW+yUfvaZaspXmNGunE2+lJN2R+b207DXE=; b=mnkxCIbNu70Mny5JGJJb583OsKyKYC2VDN6Y6JOP5m/qXKouotHzYJAsVQ8yk4KLaW 419HrNRUNX208kYGtW19WZ7g23D0cDBDxHvvkECv4eWrOPFOsZgexV8uke1n24si+I/V Ee1RVf6fxsUi3NUT+2l4ErbIFfV5AqrESOI0dduPxly4MECt26S6ybYfjYN8n2p52T+p txyI0Dmp9FZTFZOb/ULbkOOTNxoO7kUSbR83cSwDyPzgOAt2poQ2b+YzkXFpvYfxeLHi TnzRIhFxhWAfCahlZivKM+U+Im4YVNYMCI7K+iQmrLTFBxT41VKsW+cwAfGRHt0qb2xl sx0g== X-Gm-Message-State: AOJu0YwVuYCFU6TjQwHx3XSykjn/DBLjoSk8usTR2RFx9fm47XcQ1AVF eF01aOukstusox6zRZQfE0ALbTOrvRGsfsTmCgHOCEX8Rv6cQoXMuKVffA== X-Gm-Gg: ASbGncsDCE3YwMZXkr29DIVKe7WQhG6OejT9ZpXa223yKU+vaysjIApvLjIdBp3bSi9 DC0qOneLqX+weCDp7rrwE21hCh1dc1yNpE0Gc553iP8X1r+4UKIE50dI2hBt3qNItMKJbtq9WPE Wtfg4aeJ48tDZd7lkb9B9em24ws8MA8PedVLm7aPx9wDtwlFteXgArgxRwKB5fhaoyJ8HqE5j0h Zyyuih826Jtxl+m+DlXY9vrbt8Lul1kf+mdysOEFcRF+JWSLFPUZqNUXHK/GCJ0zzdsBgQ/kCJj NvQIl9vWrLao6ecumIRaRSA9BnQlvOjqPhjQZoyngPNFGLLfm/OlU48x95csSD6HMJcVPobw5dP U3z3TNP31LTw= X-Google-Smtp-Source: AGHT+IEmxR5iaMctEpodHF/gumsteH1g7r1Pai7AWwIjzOcK/KGpS+9fR6wZNugSpxj8DMSybpbg4g== X-Received: by 2002:a05:6000:1a89:b0:390:dec3:2780 with SMTP id ffacd0b85a97d-39c2e634ea7mr72334f8f.24.1743609743566; Wed, 02 Apr 2025 09:02:23 -0700 (PDT) Received: from ip-10-0-0-134.eu-west-1.compute.internal ([2a05:d018:db1:fb00:c4f8:7a97:b7aa:1bfd]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c0b79e0a3sm17543565f8f.71.2025.04.02.09.02.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 09:02:22 -0700 (PDT) From: Alex Kiernan Date: Wed, 02 Apr 2025 16:02:14 +0000 Subject: [PATCH OE-Core 2/5] connman: Delete patches for gold and MIPS binutils fix MIME-Version: 1.0 Message-Id: <20250402-connman-v1-2-2e4fbbb7caf9@gmail.com> References: <20250402-connman-v1-0-2e4fbbb7caf9@gmail.com> In-Reply-To: <20250402-connman-v1-0-2e4fbbb7caf9@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan X-Mailer: b4 0.14.2 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 02 Apr 2025 16:02:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214282 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. Signed-off-by: Alex Kiernan --- ...ange-visibility-to-default-for-debug-symb.patch | 31 -------------- .../connman/connman/no-version-scripts.patch | 47 ---------------------- meta/recipes-connectivity/connman/connman_1.44.bb | 13 +++--- 3 files changed, 5 insertions(+), 86 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch b/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch deleted file mode 100644 index a68707b2fa62a6e1ac37e05b8706908c456cec02..0000000000000000000000000000000000000000 --- a/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c254226d4ebbd846c1f8169d70413a0d32d7ae77 Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 - -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 = { \ diff --git a/meta/recipes-connectivity/connman/connman/no-version-scripts.patch b/meta/recipes-connectivity/connman/connman/no-version-scripts.patch deleted file mode 100644 index 3667a166f69346c3ca3592d179cc1baaa16cb1b4..0000000000000000000000000000000000000000 --- a/meta/recipes-connectivity/connman/connman/no-version-scripts.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 67f37aafcc8ef5d2eb006387e7bec21f74518727 Mon Sep 17 00:00:00 2001 -From: Ross Burton -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 ---- - 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) \ diff --git a/meta/recipes-connectivity/connman/connman_1.44.bb b/meta/recipes-connectivity/connman/connman_1.44.bb index 1cd97d342f894bcffa6a7ed80ac8dc23e6a0565d..553a377684c67190bbf274a28759bc1825b21d75 100644 --- a/meta/recipes-connectivity/connman/connman_1.44.bb +++ b/meta/recipes-connectivity/connman/connman_1.44.bb @@ -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