From patchwork Mon Mar 25 05:51:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 41433 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 14697C54E58 for ; Mon, 25 Mar 2024 05:52:10 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.45651.1711345927399660507 for ; Sun, 24 Mar 2024 22:52:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GIfZCQPU; spf=pass (domain: gmail.com, ip: 209.85.210.179, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6e6fb9a494aso3033932b3a.0 for ; Sun, 24 Mar 2024 22:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711345926; x=1711950726; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=qIXSLZNHBU14NaH+y/tCRBBexgXcKTbFHLyrqtPTCLU=; b=GIfZCQPU8qLwyQ/jrCW3JyeWfJHaE8wzk8+u9DucoFd4TmutBt5koD6qS+XmR6P3bL gjPFtueIviYbtOqvbWLxR/ZaF3H3WsMHID+gC0AOzAIVFYBY8WYRc+IeAvqa8/eBbU8I ah8p80gRumYTrAW6o9Ng/QF4f6cEtec5Z2LF/hUMiZ3sLwgV/gZa//r4jn3v/oQwk+nv 0qFaVL6Uu25gOfI+CCRul1qJzll6E5yHwn3OEGRJX6b485+IgMLg/bgUgjp9yU3ZJCFM GU+Z1DjWi7yCyEPB7yWXha8rBKEKAAqcEw4yZdGKTL/VMObOA3gSCxgmZBLbsIlI0jZl 4Mfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711345926; x=1711950726; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qIXSLZNHBU14NaH+y/tCRBBexgXcKTbFHLyrqtPTCLU=; b=ljMM07hJ2UScJbbkYw7/ClC9B4rLhPZDTIW3epiSl4r6yWcZlR1x1qzuPLN3TnS2WB q0uTjauXZthmo7hVMhBppDc/oAkVjvsi2AfT+uxm4GXYvBTGeHKYUMz6ytvehEVF8H8q uYpOUi9AT0EoVMbha0PhaU8L97cR7xG6948ALMeCH+d6PEMvTs3r1nB4Km7l471FK65N xyK2UpoUcTgiszrR8Sdr7V+zS1frNoidl/6OFkMK3fD4VwZyue9JhCzHgcLiIveOgZjp GBxqs+0pYMiaXKKMzXCKLaQYDm/704ehUw44v9mJLrKS0+FgiRghC24gjNt7SQ7Wh9+Y Mhgw== X-Gm-Message-State: AOJu0Yz29sPEnIZJ8msnPO7ZxDEnocyEGM+hz1SNz8jF2GP/vkKpj8IW BMoXPyN18Zk3ZWBsvfa40JI0qS30ja6rjUUXUdSErXsuDV7M2Lmd+8ZPWXA6 X-Google-Smtp-Source: AGHT+IGezuNECgzkhLS2bOi+WcOSOAHM7sa6LWnfBZant3WUWX1Xhd+J1nWea7i/CvbOIPeM3rg0mg== X-Received: by 2002:a05:6a20:19a0:b0:1a1:776d:15c with SMTP id bz32-20020a056a2019a000b001a1776d015cmr4357203pzb.21.1711345926189; Sun, 24 Mar 2024 22:52:06 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::5eba]) by smtp.gmail.com with ESMTPSA id x17-20020a17090a531100b002a03da6286asm5096971pjh.35.2024.03.24.22.52.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 22:52:05 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 1/4] ipset: Update to 7.21 Date: Sun, 24 Mar 2024 22:51:59 -0700 Message-ID: <20240325055204.150628-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 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 ; Mon, 25 Mar 2024 05:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109568 Fix build with latest musl while here Signed-off-by: Khem Raj --- ...et-Define-portable-basename-function.patch | 50 +++++++++++++++++++ .../ipset/{ipset_7.19.bb => ipset_7.21.bb} | 5 +- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch rename meta-networking/recipes-filter/ipset/{ipset_7.19.bb => ipset_7.21.bb} (70%) diff --git a/meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch b/meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch new file mode 100644 index 0000000000..a06bcac362 --- /dev/null +++ b/meta-networking/recipes-filter/ipset/ipset/0001-ipset-Define-portable-basename-function.patch @@ -0,0 +1,50 @@ +From 8c5c0a7a48af7652c50bc27a4efdd9cb4f7d95bd Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 24 Mar 2024 21:58:50 -0700 +Subject: [PATCH] ipset: Define portable basename function + +Newer version of musl have removed prototype for basename in string.h [1] +which now makes it fail to compile with newer clang 18+ compiler therefore +define own basename utility function and not depend on platform for it. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/ipset.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/ipset.c b/src/ipset.c +index 162f477..7b5d580 100644 +--- a/src/ipset.c ++++ b/src/ipset.c +@@ -16,6 +16,16 @@ + #include /* ipset library */ + #include /* translate to nftables */ + ++/* basename is implemented differently across different C libraries. This ++ * implementation matches the one provided by the GNU libc, and does not ++ * modify its input parameter. ++ */ ++static const char *ipset_basename(const char *path) ++{ ++ const char *base = strrchr(path, '/'); ++ return base ? base + 1 : path; ++} ++ + int + main(int argc, char *argv[]) + { +@@ -32,7 +42,7 @@ main(int argc, char *argv[]) + exit(1); + } + +- if (!strcmp(basename(argv[0]), "ipset-translate")) { ++ if (!strcmp(ipset_basename(argv[0]), "ipset-translate")) { + ret = ipset_xlate_argv(ipset, argc, argv); + } else { + ret = ipset_parse_argv(ipset, argc, argv); +-- +2.44.0 + diff --git a/meta-networking/recipes-filter/ipset/ipset_7.19.bb b/meta-networking/recipes-filter/ipset/ipset_7.21.bb similarity index 70% rename from meta-networking/recipes-filter/ipset/ipset_7.19.bb rename to meta-networking/recipes-filter/ipset/ipset_7.21.bb index bb4319f36c..c7ebdc1c66 100644 --- a/meta-networking/recipes-filter/ipset/ipset_7.19.bb +++ b/meta-networking/recipes-filter/ipset/ipset_7.21.bb @@ -9,8 +9,9 @@ SECTION = "base" DEPENDS = "libtool libmnl" -SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2" -SRC_URI[sha256sum] = "9bc1fba48d65786e3e0b63dc6b669a866823d77840c6990c0c6b23078ec2c4d6" +SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2 \ + file://0001-ipset-Define-portable-basename-function.patch" +SRC_URI[sha256sum] = "e2c6ce4fcf3acb3893ca5d35c86935f80ad76fc5ccae601185842df760e0bc69" inherit autotools pkgconfig module-base From patchwork Mon Mar 25 05:52:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 41432 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 26696C54E64 for ; Mon, 25 Mar 2024 05:52:10 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web10.45652.1711345928051652915 for ; Sun, 24 Mar 2024 22:52:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=CEOxyOBu; spf=pass (domain: gmail.com, ip: 209.85.216.43, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-29df0ca87d1so3307169a91.2 for ; Sun, 24 Mar 2024 22:52:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711345927; x=1711950727; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z+x2WM4jYIK/tILsyWD07s+AM8vNYqPY4cNMMUTcnyk=; b=CEOxyOBugV6WhuaaewfbOiAtl3yxuc5No7DJaY0m6x9mYLULHJLEQ0mhbr38PoeOoI qhjslNA29Dymnw6giz2WIecGAc6i8ecRnwKrGnUXZfgMwcQkktW+4rLk15Lamdz9+tIq ES1VG5fl/3MDLefcnMO9p0eiDg57YXrpOqvbmwyRWDKjncC/1YvNT40xaGi/v+DLoy+A N+TZGMDft3vq4G5uvcuADnD87meu5b0QS98M6qFkFW5VpP2o60V4XpjpDK7XxiA2gDxs xXGUgTv7q7X8HYNqid9ajS6RCZO6FX7PtpXIkil1y09BgEnjx2+9GfBJUmA0F4h44Cr/ JO6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711345927; x=1711950727; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z+x2WM4jYIK/tILsyWD07s+AM8vNYqPY4cNMMUTcnyk=; b=vxlTVR5ROaRw/KthpuXoajuG+pIM0jaz9I/ljhPCuYJzEq5dCPsqe2s5jC94VomKXH 6KzUo1RQkzRJDSlZAetnb/t8L+atC7/PG3s2uqVPgr6zdKOyqmqQS3UzyhW8FvazuIrJ Ay5stzGkTGkshuwX/ahEJ0Cd+OOR5BE0QftwE1PFR83xITJ7DghnEdptyp1DddkMGerD Vr6xe43A3fBOx3uZQiwO1FHoul36eUHx7MKFXmJUHVZm1OraXWL0TavvdSF4sXFln9kZ NiDzQ76hX5HObXn0F2+Q3iD9uvbQvo9lZy1rSTSySYgLuRrbgKiu1H5f09fB75zSWPUt 8IFg== X-Gm-Message-State: AOJu0Yy9XQBEE17ydrsgAgbF4zBazLrJmke9Sk4GN45QMOnpbMd0agHZ vAUd8erM0jLtfvvL8xhUiM8reCwbhQy9iWP3sPilFH8RSfs/zTmHmNtggyvE X-Google-Smtp-Source: AGHT+IFJ+dOmvol5hgChGtDQrOgE4NKvEaxhIEDjvwwEIkCGjMEocdeEmohUGKaoJWz9ORZsTh40zQ== X-Received: by 2002:a17:90a:8998:b0:2a0:1720:f5dc with SMTP id v24-20020a17090a899800b002a01720f5dcmr5593777pjn.9.1711345926866; Sun, 24 Mar 2024 22:52:06 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::5eba]) by smtp.gmail.com with ESMTPSA id x17-20020a17090a531100b002a03da6286asm5096971pjh.35.2024.03.24.22.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 22:52:06 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 2/4] ot-daemon: Update to tip of trunk Date: Sun, 24 Mar 2024 22:52:00 -0700 Message-ID: <20240325055204.150628-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240325055204.150628-1-raj.khem@gmail.com> References: <20240325055204.150628-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Mon, 25 Mar 2024 05:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109569 Drop backports which are not already available Signed-off-by: Khem Raj --- ...-PIC-inline-ASM-compilation-with-GCC.patch | 68 ------------------- .../openthread/ot-daemon/mbedtls.patch | 34 ---------- .../openthread/ot-daemon_git.bb | 8 +-- 3 files changed, 4 insertions(+), 106 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/openthread/ot-daemon/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch delete mode 100644 meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch diff --git a/meta-networking/recipes-connectivity/openthread/ot-daemon/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch b/meta-networking/recipes-connectivity/openthread/ot-daemon/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch deleted file mode 100644 index c9edb0098b..0000000000 --- a/meta-networking/recipes-connectivity/openthread/ot-daemon/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c0546e351f6d7ab50eb1de8cef1d0d167760fccc Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 27 Aug 2018 22:50:57 +0200 -Subject: [PATCH] bn_mul.h: fix x86 PIC inline ASM compilation with GCC < 5 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes #1910 - -With ebx added to the MULADDC_STOP clobber list to fix #1550, the inline -assembly fails to build with GCC < 5 in PIC mode with the following error: - -include/mbedtls/bn_mul.h:46:13: error: PIC register clobbered by ‘ebx’ in ‘asm’ - -This is because older GCC versions treated the x86 ebx register (which is -used for the GOT) as a fixed reserved register when building as PIC. - -This is fixed by an improved register allocator in GCC 5+. From the release -notes: - -Register allocation improvements: Reuse of the PIC hard register, instead of -using a fixed register, was implemented on x86/x86-64 targets. This -improves generated PIC code performance as more hard registers can be used. - -https://www.gnu.org/software/gcc/gcc-5/changes.html - -As a workaround, detect this situation and disable the inline assembly, -similar to the MULADDC_CANNOT_USE_R7 logic. - -Upstream-Status: Backport [https://github.com/Mbed-TLS/mbedtls/commit/c0546e351f6d7ab50eb1de8cef1d0d167760fccc] -Signed-off-by: Peter Korsgaard ---- - library/bn_mul.h | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - ---- a/third_party/mbedtls/repo/include/mbedtls/bn_mul.h -+++ b/third_party/mbedtls/repo/include/mbedtls/bn_mul.h -@@ -55,12 +55,28 @@ - ( !defined(__ARMCC_VERSION) || __ARMCC_VERSION >= 6000000 ) - - /* -+ * GCC < 5.0 treated the x86 ebx (which is used for the GOT) as a -+ * fixed reserved register when building as PIC, leading to errors -+ * like: bn_mul.h:46:13: error: PIC register clobbered by 'ebx' in 'asm' -+ * -+ * This is fixed by an improved register allocator in GCC 5+. From the -+ * release notes: -+ * Register allocation improvements: Reuse of the PIC hard register, -+ * instead of using a fixed register, was implemented on x86/x86-64 -+ * targets. This improves generated PIC code performance as more hard -+ * registers can be used. -+ */ -+#if defined(__GNUC__) && __GNUC__ < 5 && defined(__PIC__) -+#define MULADDC_CANNOT_USE_EBX -+#endif -+ -+/* - * Disable use of the i386 assembly code below if option -O0, to disable all - * compiler optimisations, is passed, detected with __OPTIMIZE__ - * This is done as the number of registers used in the assembly code doesn't - * work with the -O0 option. - */ --#if defined(__i386__) && defined(__OPTIMIZE__) -+#if defined(__i386__) && defined(__OPTIMIZE__) && !defined(MULADDC_CANNOT_USE_EBX) - - #define MULADDC_INIT \ - asm( \ diff --git a/meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch b/meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch deleted file mode 100644 index ffaff48dd4..0000000000 --- a/meta-networking/recipes-connectivity/openthread/ot-daemon/mbedtls.patch +++ /dev/null @@ -1,34 +0,0 @@ -mbedtls: Disable documentation warning as error with clang - -There are shortcomings with doxygen info which clang-15+ flags, dont -treat them as errors - -Remove unused variable - -Fixes -library/bignum.c:1395:29: error: variable 't' set but not used [-Werror,-Wunused-but-set-variable] - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/third_party/mbedtls/repo/library/bignum.c -+++ b/third_party/mbedtls/repo/library/bignum.c -@@ -1544,7 +1544,7 @@ __attribute__ ((noinline)) - #endif - void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b ) - { -- mbedtls_mpi_uint c = 0, t = 0; -+ mbedtls_mpi_uint c = 0, t __attribute__ ((unused)) = 0; - - #if defined(MULADDC_HUIT) - for( ; i >= 8; i -= 8 ) ---- a/third_party/mbedtls/repo/CMakeLists.txt -+++ b/third_party/mbedtls/repo/CMakeLists.txt -@@ -192,7 +192,7 @@ if(CMAKE_COMPILER_IS_GNU) - endif(CMAKE_COMPILER_IS_GNU) - - if(CMAKE_COMPILER_IS_CLANG) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wno-error=documentation") - set(CMAKE_C_FLAGS_RELEASE "-O2") - set(CMAKE_C_FLAGS_DEBUG "-O0 -g3") - set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage") diff --git a/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb b/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb index 1583a3f837..4456835410 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb +++ b/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb @@ -5,15 +5,13 @@ SUMMARY = "OpenThread Daemon is an OpenThread POSIX build mode that runs OpenThr SECTION = "net" LICENSE = "BSD-3-Clause & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ - file://third_party/mbedtls/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://third_party/mbedtls/repo/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d \ " DEPENDS = "readline" -SRCREV = "7dfde1f12923f03c9680be4d838b94b7a2320324" +SRCREV = "90adc86d34e21a9e8f86d093c2190030042c4a59" PV = "0.1+git" SRC_URI = "git://github.com/openthread/openthread.git;protocol=https;branch=main \ - file://0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch \ - file://mbedtls.patch \ " S = "${WORKDIR}/git" @@ -27,3 +25,5 @@ EXTRA_OECMAKE = "-DOT_DAEMON=ON \ -DOT_PLATFORM=posix \ -DCMAKE_BUILD_TYPE=Release \ " + +EXTRA_OECMAKE:append:libc-musl = " -DOT_TARGET_OPENWRT=ON" From patchwork Mon Mar 25 05:52:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 41431 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 1D6FDCD11BF for ; Mon, 25 Mar 2024 05:52:10 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.45654.1711345928617062235 for ; Sun, 24 Mar 2024 22:52:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YHSGSQV5; spf=pass (domain: gmail.com, ip: 209.85.210.174, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6e6f4ad4c57so2970578b3a.2 for ; Sun, 24 Mar 2024 22:52:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711345928; x=1711950728; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5R2IBZo5XvQfMfZnmhs8m8nyXS4ZirsuKHi3rySrU9E=; b=YHSGSQV50szLLdGZ+NVB4XlGLsNHbbFjsZusoyT55WL67enR58gYF5y4ucCndhBlni uFBHb4/kGi0R8FqEJm4a6m+kPhzMwc6INC7FrSCIRVRhAO3cJuFdnT8PB/6V7gAT3any oEfjTTBwCz9kPC3WqSJYtG29iVAJSbPUT8Fe0G332wNsqvCCO+TyGV6lA24h5GQeIaOn gbNX0fHlGoK0i1pRZ0a6QG4uEa49DlbCa2FAwUHdngLqdC7YUHCPKkCn8MjcR5mvJI7G FtJ3jw1SxILdo8a0YsX+N8IROErY1tL6p7dfZBVzNFFWvkQaDFLmsMCF6K7iHerBr6r4 rzag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711345928; x=1711950728; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5R2IBZo5XvQfMfZnmhs8m8nyXS4ZirsuKHi3rySrU9E=; b=AG2/Ko3pD3jdKABU4OU/wHPy0mzEBEzJ7r6RsnsTkwDvuP4h1hYunFyuUAOwayQFN1 aT7qON5JAfsKPjP4B1ieuWT0pXJK8fjJNIzyLau+4MpqeVmOb1/9WHZljh0qDwbBHzFn T6PQdkRnU20UbfcKgLEkN1PhnX99NB3pZap5vx0iyd/Yew8kQIsb2MhrFGVNfTFB/1S9 UHIpZHeM+P5PVYAfz9VQqO5aK7vgxgvTh/X7moJKIOZaPbuhQk2nE8gbsPR7LwlBZnX7 Y+cc/UzNy7PMHVfqGuaQhziSlYVFBL0MkHc8SmXk84kjdmLGmSgfLzB7hZoU25KWnQ+/ MbFA== X-Gm-Message-State: AOJu0Yxq3cLZ2n5JRXxPL51MLnPoLHKPZ2gVbjmMUVXM7VizoGvRaWvH z31hA9YNpIdGIM1OWySenBPFmXapgdwghX7mL3nZ3C/3Myrfx3MROuDEH7S9 X-Google-Smtp-Source: AGHT+IFpDa//E/ccLMRX2wEqlbkQuciwgQiN4/UbWn0s4A6v6KFx1gGZk5LmMg4JR/+ktaGF46bFUg== X-Received: by 2002:a05:6a20:d394:b0:1a3:c305:a8eb with SMTP id iq20-20020a056a20d39400b001a3c305a8ebmr4549678pzb.53.1711345927615; Sun, 24 Mar 2024 22:52:07 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::5eba]) by smtp.gmail.com with ESMTPSA id x17-20020a17090a531100b002a03da6286asm5096971pjh.35.2024.03.24.22.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 22:52:07 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 3/4] ot-br-posix: Update to latest Date: Sun, 24 Mar 2024 22:52:01 -0700 Message-ID: <20240325055204.150628-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240325055204.150628-1-raj.khem@gmail.com> References: <20240325055204.150628-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Mon, 25 Mar 2024 05:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109570 Drop backports Add a new patch to supply additional musl fixes Signed-off-by: Khem Raj --- ...-PIC-inline-ASM-compilation-with-GCC.patch | 79 ------------------- .../openthread/ot-br-posix/mbedtls.patch | 23 ------ .../openthread/ot-br-posix/musl-fixes.patch | 26 ++++++ .../openthread/ot-br-posix_git.bb | 6 +- 4 files changed, 29 insertions(+), 105 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch delete mode 100644 meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch create mode 100644 meta-networking/recipes-connectivity/openthread/ot-br-posix/musl-fixes.patch diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch deleted file mode 100644 index 8b286dfd14..0000000000 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch +++ /dev/null @@ -1,79 +0,0 @@ -From c0546e351f6d7ab50eb1de8cef1d0d167760fccc Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 27 Aug 2018 22:50:57 +0200 -Subject: [PATCH] bn_mul.h: fix x86 PIC inline ASM compilation with GCC < 5 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes #1910 - -With ebx added to the MULADDC_STOP clobber list to fix #1550, the inline -assembly fails to build with GCC < 5 in PIC mode with the following error: - -include/mbedtls/bn_mul.h:46:13: error: PIC register clobbered by ‘ebx’ in ‘asm’ - -This is because older GCC versions treated the x86 ebx register (which is -used for the GOT) as a fixed reserved register when building as PIC. - -This is fixed by an improved register allocator in GCC 5+. From the release -notes: - -Register allocation improvements: Reuse of the PIC hard register, instead of -using a fixed register, was implemented on x86/x86-64 targets. This -improves generated PIC code performance as more hard registers can be used. - -https://www.gnu.org/software/gcc/gcc-5/changes.html - -As a workaround, detect this situation and disable the inline assembly, -similar to the MULADDC_CANNOT_USE_R7 logic. - -Upstream-Status: Backport [https://github.com/Mbed-TLS/mbedtls/commit/c0546e351f6d7ab50eb1de8cef1d0d167760fccc] -Signed-off-by: Peter Korsgaard ---- - library/bn_mul.h | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - ---- a/third_party/openthread/repo/third_party/mbedtls/repo/include/mbedtls/bn_mul.h -+++ b/third_party/openthread/repo/third_party/mbedtls/repo/include/mbedtls/bn_mul.h -@@ -95,12 +95,28 @@ - ( !defined(__ARMCC_VERSION) || __ARMCC_VERSION >= 6000000 ) - - /* -+ * GCC < 5.0 treated the x86 ebx (which is used for the GOT) as a -+ * fixed reserved register when building as PIC, leading to errors -+ * like: bn_mul.h:46:13: error: PIC register clobbered by 'ebx' in 'asm' -+ * -+ * This is fixed by an improved register allocator in GCC 5+. From the -+ * release notes: -+ * Register allocation improvements: Reuse of the PIC hard register, -+ * instead of using a fixed register, was implemented on x86/x86-64 -+ * targets. This improves generated PIC code performance as more hard -+ * registers can be used. -+ */ -+#if defined(__GNUC__) && __GNUC__ < 5 && defined(__PIC__) -+#define MULADDC_CANNOT_USE_EBX -+#endif -+ -+/* - * Disable use of the i386 assembly code below if option -O0, to disable all - * compiler optimisations, is passed, detected with __OPTIMIZE__ - * This is done as the number of registers used in the assembly code doesn't - * work with the -O0 option. - */ --#if defined(__i386__) && defined(__OPTIMIZE__) -+#if defined(__i386__) && defined(__OPTIMIZE__) && !defined(MULADDC_CANNOT_USE_EBX) - - #define MULADDC_INIT \ - asm( \ ---- a/third_party/openthread/repo/third_party/mbedtls/repo/CMakeLists.txt -+++ b/third_party/openthread/repo/third_party/mbedtls/repo/CMakeLists.txt -@@ -210,7 +210,7 @@ if(CMAKE_COMPILER_IS_GNU) - endif(CMAKE_COMPILER_IS_GNU) - - if(CMAKE_COMPILER_IS_CLANG) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wno-error=documentation") - set(CMAKE_C_FLAGS_RELEASE "-O2") - set(CMAKE_C_FLAGS_DEBUG "-O0 -g3") - set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage") diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch deleted file mode 100644 index 0824eb6b9a..0000000000 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch +++ /dev/null @@ -1,23 +0,0 @@ -mbedtls: Disable documentation warning as error with clang - -There are shortcomings with doxygen info which clang-15+ flags, dont -treat them as errors - -Remove unused variable - -Fixes -library/bignum.c:1395:29: error: variable 't' set but not used [-Werror,-Wunused-but-set-variable] - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/third_party/openthread/repo/third_party/mbedtls/repo/library/bignum.c -+++ b/third_party/openthread/repo/third_party/mbedtls/repo/library/bignum.c -@@ -1392,7 +1392,7 @@ void mpi_mul_hlp( size_t i, - mbedtls_mpi_uint *d, - mbedtls_mpi_uint b ) - { -- mbedtls_mpi_uint c = 0, t = 0; -+ mbedtls_mpi_uint c = 0, t __attribute__ ((unused)) = 0; - - #if defined(MULADDC_HUIT) - for( ; i >= 8; i -= 8 ) diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/musl-fixes.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/musl-fixes.patch new file mode 100644 index 0000000000..279a60741f --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix/musl-fixes.patch @@ -0,0 +1,26 @@ +Musl fixes, which should be applied upstream too + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/src/dbus/common/types.hpp ++++ b/src/dbus/common/types.hpp +@@ -715,7 +715,7 @@ struct TrelInfo + }; + + bool mEnabled; ///< Whether TREL is enabled. +- u_int16_t mNumTrelPeers; ///< The number of TREL peers. ++ uint16_t mNumTrelPeers; ///< The number of TREL peers. + TrelPacketCounters mTrelCounters; ///< The TREL counters. + }; + +--- a/third_party/openthread/repo/src/posix/platform/CMakeLists.txt ++++ b/third_party/openthread/repo/src/posix/platform/CMakeLists.txt +@@ -172,7 +172,7 @@ target_link_libraries(openthread-posix + ) + + option(OT_TARGET_OPENWRT "enable openthread posix for OpenWRT" OFF) +-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT) ++if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT AND NOT OT_TARGET_MUSL) + target_compile_definitions(ot-posix-config + INTERFACE "OPENTHREAD_POSIX_CONFIG_NAT64_AIL_PREFIX_ENABLE=1" + ) diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb index 271340a25b..d7be1cd71d 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -11,15 +11,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=87109e44b2fda96a8991f27684a7349c \ file://third_party/openthread/repo/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ " DEPENDS = "autoconf-archive dbus readline avahi jsoncpp boost libnetfilter-queue protobuf protobuf-native" -SRCREV = "4e937939ba6ce146fd98537cb63e0f4c41c8dbe1" +SRCREV = "a35cc682305bb2201c314472adf06a4960536750" PV = "0.3.0+git" SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \ file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \ file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ - file://0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch \ - file://mbedtls.patch \ file://default-cxx-std.patch \ + file://musl-fixes.patch \ " S = "${WORKDIR}/git" @@ -56,6 +55,7 @@ EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ -DOT_DHCP6_CLIENT=ON \ -DOT_DHCP6_SERVER=ON \ " +EXTRA_OECMAKE:append:libc-musl = " -DOT_TARGET_MUSL=ON" RDEPENDS:${PN} = "iproute2 ipset avahi-daemon" From patchwork Mon Mar 25 05:52:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 41434 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 E8047C54E64 for ; Mon, 25 Mar 2024 05:52:19 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.45574.1711345929835346712 for ; Sun, 24 Mar 2024 22:52:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mD5X+JJV; spf=pass (domain: gmail.com, ip: 209.85.214.169, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1dffa5e3f2dso24005575ad.2 for ; Sun, 24 Mar 2024 22:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711345929; x=1711950729; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aul71IcVtJVraXyaSK8L/gSgjYQUrTQHHBWWAKejMAs=; b=mD5X+JJVz4VFgJ2uil+AowCYjQebMvj8XdkrBQFvTqSQ7Zk+1PO2V3UtYvxYzl/HOZ 3NhoF0dxB/xGeapZnldv7A/X9juUt3x6Mg5tnfSVXOynKR7HoZbp6uhZBPWkHEWC3MWC lYQ0mjfk/kEQ5g84tONVaQuiPdZwgdbKC1j6G76nhD5WFyJog8MOvXkieW+p4PdFMWi3 37wdipY9Rog2JMG8nw2hqbTgPX2X7R+/ZdlHZCUQfA43bU2wJ7hAXKgnZstEanZN0sLA FuI2gy+HOfaFfZu/pbBOqtsOxoAaS/Y2c/eWSlg8ys2/KBGjFuYsu1F6jLw239VmPk6o wDEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711345929; x=1711950729; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aul71IcVtJVraXyaSK8L/gSgjYQUrTQHHBWWAKejMAs=; b=s42doNoci2dkwxHXxHrTm1Msz0h2N2UEE9WE6pWbM0XMRvrd37CykYAuP8kK3Ftzlc 4OvWCYjcuc6Vcv9FB6r75pWvc4gsU+IUi6RltllVO/4TsUZCNnOv/M5WqSEUEBO22MDa A6cxNzePyqsxbwlRJHrLNPeFH98bzyu8Z2Wjfy5RxppjeQ7pnGx+awgqYgVQaDx2iJPQ COlV+j2Cs0MHYbox3lqa7eYzQabp/cxUiWJnVkPlZK5qCkfsbXoyFeaVZJQVY7QffbTG 86OhFOzWPDHvPA2GpbPmYrLV/aVj1NH2URfJFRx/jDQ56034IL/3NTFAyrFa6xAxYano FgZg== X-Gm-Message-State: AOJu0YzwRa1v/PSLe4Ld2hCcsyxzk1fFK5fMrGetzAC4jzEZYE33hp6W NVksfDtr3H2wKjdq+HYK9RKGQQcLuzrDT+TPkBgriaf853KEb/y7FOLhVR3a X-Google-Smtp-Source: AGHT+IFOJaqQgcMWlA0geczGz9cTezOGeCxTJD0fwUU+7+El5JSAXnZU0EldozNUF4ZDc75tpXZrZw== X-Received: by 2002:a17:90a:6006:b0:299:4cc5:aa25 with SMTP id y6-20020a17090a600600b002994cc5aa25mr4094439pji.25.1711345928966; Sun, 24 Mar 2024 22:52:08 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::5eba]) by smtp.gmail.com with ESMTPSA id x17-20020a17090a531100b002a03da6286asm5096971pjh.35.2024.03.24.22.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 22:52:07 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 4/4] wpantund: Update to latest Date: Sun, 24 Mar 2024 22:52:02 -0700 Message-ID: <20240325055204.150628-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240325055204.150628-1-raj.khem@gmail.com> References: <20240325055204.150628-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Mon, 25 Mar 2024 05:52:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109571 Add patch to support portable basename Signed-off-by: Khem Raj --- .../openthread/wpantund/basename.patch | 19 +++++++++++++++++++ .../openthread/wpantund_git.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-connectivity/openthread/wpantund/basename.patch diff --git a/meta-networking/recipes-connectivity/openthread/wpantund/basename.patch b/meta-networking/recipes-connectivity/openthread/wpantund/basename.patch new file mode 100644 index 0000000000..30bd9e59cf --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/wpantund/basename.patch @@ -0,0 +1,19 @@ +include libgen.h for getting prototype for basename() +Newer musl has remove prototype from string.h [1] +which renders a compile error with newer compilers like +clang 18+ about missing prototype. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/third_party/openthread/tools/spi-hdlc-adapter/spi-hdlc-adapter.c ++++ b/third_party/openthread/tools/spi-hdlc-adapter/spi-hdlc-adapter.c +@@ -32,6 +32,7 @@ + #endif + + #include ++#include + #include + #include + #include diff --git a/meta-networking/recipes-connectivity/openthread/wpantund_git.bb b/meta-networking/recipes-connectivity/openthread/wpantund_git.bb index b75d686e58..6a84897426 100644 --- a/meta-networking/recipes-connectivity/openthread/wpantund_git.bb +++ b/meta-networking/recipes-connectivity/openthread/wpantund_git.bb @@ -12,10 +12,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e7820bc7f7d1638a6b54fc2e8d7fb103 \ file://third_party/pt/LICENSE;md5=dcd598b69cad786beea33da7b1ae14b7 \ " DEPENDS = "autoconf-archive dbus readline boost" -SRCREV = "0fb1f57e4224e2df3e630e146702bfcf63fbf07a" +SRCREV = "8b5ce64c2f5bbf106cabfd015bcb3bdb2e0248d3" PV = "0.07.01+git" SRC_URI = "gitsm://github.com/openthread/wpantund.git;protocol=https;branch=master \ + file://basename.patch \ " S = "${WORKDIR}/git"