From patchwork Thu Feb 6 19:18:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 56809 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 2EE81C02194 for ; Thu, 6 Feb 2025 19:20:07 +0000 (UTC) Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by mx.groups.io with SMTP id smtpd.web10.50452.1738869599739066001 for ; Thu, 06 Feb 2025 11:20:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=bgBGIJGP; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-256628-20250206191956268ef4827d2d1bb23f-dkvk8l@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20250206191956268ef4827d2d1bb23f for ; Thu, 06 Feb 2025 20:19:56 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=fcq7tLHD1P9/kz6gFc/xFUUc4z/t5qikF7x/SVTYIsk=; b=bgBGIJGPg0QZ5btRqVm9hcv6yL9rId0d5milRxB6XDcsFZqiYvN+QQZGaO7zCVja1qoS3q KkTuuGhrYKdrh4NgRFEZCu0OhmJ17J40flXCSAVWU1EcP9RXMoNJxYIC04ZeOUhlJ+VVA5Ih NeQtxVm+9eBvNVQYVMHJGMdWEtCYtt9laigqMVGEpebUeoWj+qihsW3dua6z1Y41kG3O84cC f6yb37XEPCJSAYoMo+M8X+igfFNDIi3SuOoycSQT7Uenb+pg2QzNhiidTxe0f6bRvRm60pOw XQ06s2Z8eogbawX7akjlh18x9mxyy880gaytYViESFLN9q34dYHeacBA==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-python][PATCH 1/9] python3-grpcio: drop obsolete variable Date: Thu, 6 Feb 2025 20:18:55 +0100 Message-Id: <20250206191903.2324783-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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 ; Thu, 06 Feb 2025 19:20:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115293 From: Peter Marko Variable GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY was removed in v1.62.0. Signed-off-by: Peter Marko --- meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb index 617e982382..d657ba824f 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb @@ -21,8 +21,6 @@ inherit pypi CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" -export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" - BORING_SSL_PLATFORM:arm = "linux-arm" BORING_SSL_PLATFORM:x86-64 = "linux-x86_64" BORING_SSL_PLATFORM:aarch64 = "linux-aarch64" From patchwork Thu Feb 6 19:18:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 56811 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 38DC9C0219C for ; Thu, 6 Feb 2025 19:20:07 +0000 (UTC) Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net [185.136.64.226]) by mx.groups.io with SMTP id smtpd.web11.50822.1738869601201301394 for ; Thu, 06 Feb 2025 11:20:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=YfWDGVvy; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.226, mailfrom: fm-256628-2025020619195952a6784fb6ccb4c729-tdf0bn@rts-flowmailer.siemens.com) Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2025020619195952a6784fb6ccb4c729 for ; Thu, 06 Feb 2025 20:19:59 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=3JKPtz0GB+/yDHgNxzliM0z3RBbIy3Xpn7YK/NNo4ys=; b=YfWDGVvyzwyy1aOeeA/Sf6YPb1YhuufjBc9Z907k3iNUUxvvVgD2aHkZh2pTwdSShKO3SR LZAxeeFc3CA8GtA870OzKeV/pTYE0jFYDKNsNjtfFIDSrU0l7VQzWvlNaCRbLcuSfC2HSGMb g2tfZghzeTTDyHIbiDD4wFIXH8BfNZbW/XbwBxWwngQUUADc+e5BcLGK5fF/UrmzVYrcEMZw koxJaqqONvuy4i/bolis4uAu57Eq6mv/nPWkocHiI59GuuMb9eoPbQcMemTp2xqs+W0Cu12X 468pnT51EvKo/5YochMNTpHPo+9s0OjK+Sn+/uDhVo5KhE7HGWrPh/8A==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-python][PATCH 2/9] python3-grpcio: add patch to allow unbundled build Date: Thu, 6 Feb 2025 20:18:56 +0100 Message-Id: <20250206191903.2324783-2-peter.marko@siemens.com> In-Reply-To: <20250206191903.2324783-1-peter.marko@siemens.com> References: <20250206191903.2324783-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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 ; Thu, 06 Feb 2025 19:20:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115294 From: Peter Marko This is preparation for next commits which to use system libraries instead of bundled third_party components. Signed-off-by: Peter Marko --- ...n-enable-unbundled-cross-compilation.patch | 49 +++++++++++++++++++ .../python/python3-grpcio_1.69.0.bb | 3 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch new file mode 100644 index 0000000000..8e45ee584c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch @@ -0,0 +1,49 @@ +From ff01ac8908a7267503ffbb85efd24755da0502d8 Mon Sep 17 00:00:00 2001 +From: Peter Marko +Date: Wed, 5 Feb 2025 21:06:50 +0100 +Subject: [PATCH] python: enable unbundled cross compilation + +System headers are on a sysroot path provided by the toolchain +options. + +Upstream-Status: Pending +Signed-off-by: Peter Marko +--- + setup.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/setup.py b/setup.py +index 3b6edbe..d3a0d04 100644 +--- a/setup.py ++++ b/setup.py +@@ -317,25 +317,25 @@ if BUILD_WITH_SYSTEM_OPENSSL: + lambda x: "third_party/boringssl" not in x, CORE_C_FILES + ) + CORE_C_FILES = filter(lambda x: "src/boringssl" not in x, CORE_C_FILES) +- SSL_INCLUDE = (os.path.join("/usr", "include", "openssl"),) ++ SSL_INCLUDE = () + + if BUILD_WITH_SYSTEM_ZLIB: + CORE_C_FILES = filter(lambda x: "third_party/zlib" not in x, CORE_C_FILES) +- ZLIB_INCLUDE = (os.path.join("/usr", "include"),) ++ ZLIB_INCLUDE = () + + if BUILD_WITH_SYSTEM_CARES: + CORE_C_FILES = filter(lambda x: "third_party/cares" not in x, CORE_C_FILES) +- CARES_INCLUDE = (os.path.join("/usr", "include"),) ++ CARES_INCLUDE = () + + if BUILD_WITH_SYSTEM_RE2: + CORE_C_FILES = filter(lambda x: "third_party/re2" not in x, CORE_C_FILES) +- RE2_INCLUDE = (os.path.join("/usr", "include", "re2"),) ++ RE2_INCLUDE = () + + if BUILD_WITH_SYSTEM_ABSL: + CORE_C_FILES = filter( + lambda x: "third_party/abseil-cpp" not in x, CORE_C_FILES + ) +- ABSL_INCLUDE = (os.path.join("/usr", "include"),) ++ ABSL_INCLUDE = () + + EXTENSION_INCLUDE_DIRECTORIES = ( + (PYTHON_STEM,) diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb index d657ba824f..0265fc0adc 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" DEPENDS += "python3-protobuf" -SRC_URI += "file://0001-Include-missing-cstdint-header.patch \ +SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \ + file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch \ file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \ file://0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch;patchdir=third_party/boringssl-with-bazel/src/ \ From patchwork Thu Feb 6 19:18:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 56810 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 36F76C0219B for ; Thu, 6 Feb 2025 19:20:07 +0000 (UTC) Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by mx.groups.io with SMTP id smtpd.web10.50452.1738869599739066001 for ; Thu, 06 Feb 2025 11:20:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=VIB37Kze; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-256628-202502061920025aaacbe412ebadf4af-h1yv_r@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 202502061920025aaacbe412ebadf4af for ; Thu, 06 Feb 2025 20:20:02 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=wXy9RhmCzba4bsgTXuT6mFeewiOu9HS6tsvYVrpbfbQ=; b=VIB37KzeOiJCmpctZHvU6uEM6qX/fWewBj9ZFgv0nnAv5+lX8tiReWzuolHTUfylgscCB0 EOyjhe68pfLjeqq/6VulRHNJcIXgWZJhsqRYNW8NGTKbt2JHFG162DvHFdGo7YkRmCeSC2eG cA9Qk60feGemXMBhO+mZp74IHgMkMkCs20DlPHAA19qBhQZKp9xrHi3vdsSBA2MQpuSd/ULR xmrUxR6luJiUXfN8zvzSzjl63OzVTOe4pPNOHe62XD7mQpBKjk08SQMvxz3ixh/vx0dGj2iT y/lGWDqpk243jhOajrPmy5SvYIj8xh3S2QV2WvtsDhreoK4Xd0vMbe2Q==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-python][PATCH 3/9] python3-grpcio: use openssl instead of bundled boringssl-with-bazel Date: Thu, 6 Feb 2025 20:18:57 +0100 Message-Id: <20250206191903.2324783-3-peter.marko@siemens.com> In-Reply-To: <20250206191903.2324783-1-peter.marko@siemens.com> References: <20250206191903.2324783-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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 ; Thu, 06 Feb 2025 19:20:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115295 From: Peter Marko grpc recipe already uses system openssl without problem. This also allows to remove 2 patches to maintain and corrects license, SPDX and CVE handling. Signed-off-by: Peter Marko --- ..._Generic-only-if-defined-__cplusplus.patch | 73 ------------------- ....h-define-proper-macro-for-ppc-ppc64.patch | 34 --------- .../python/python3-grpcio_1.69.0.bb | 17 +---- 3 files changed, 2 insertions(+), 122 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch deleted file mode 100644 index 790ccccc95..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch +++ /dev/null @@ -1,73 +0,0 @@ -From eee5daeb5b53b0c4a013aa5887a726434ec81600 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Mon, 6 May 2024 01:36:39 +0200 -Subject: [PATCH] crypto: use _Generic only if !defined(__cplusplus) - -* fixes build with gcc-14 which has __builtin_addc and __builtin_subc - with gcc-13 it was already using the #else branch because of missing builtins - -* fixes - https://github.com/grpc/grpc/issues/35945 - -* _Generic was introduced in boringssl with: - https://boringssl.googlesource.com/boringssl/+/70ca6bc24be103dabd68e448cd3af29b929b771d%5E%21/#F4 - -* but e.g. third_party/boringssl-with-bazel/src/ssl/d1_both.cc includes - this internal.h and from the .cc extension gcc will process it as C++ - where _Generic isn't available, causing: - -In file included from third_party/boringssl-with-bazel/src/ssl/d1_both.cc:125: -third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h: In function 'uint32_t CRYPTO_addc_u32(uint32_t, uint32_t, uint32_t, uint32_t*)': -third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1159:7: error: expected primary-expression before 'unsigned' - 1159 | unsigned: __builtin_addc, \ - | ^~~~~~~~ -third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC' - 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry); - | ^~~~~~~~~~~~~~~~~~~ -third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1160:7: error: expected primary-expression before 'unsigned' - 1160 | unsigned long: __builtin_addcl, \ - | ^~~~~~~~ -third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC' - 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry); - | ^~~~~~~~~~~~~~~~~~~ -third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1161:7: error: expected primary-expression before 'unsigned' - 1161 | unsigned long long: __builtin_addcll))((x), (y), (carry), (out_carry)) - | ^~~~~~~~ -third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC' - 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry); - | ^~~~~~~~~~~~~~~~~~~ -third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1158:4: error: '_Generic' was not declared in this scope - 1158 | (_Generic((x), \ - | ^~~~~~~~ -third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC' - 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry); - | ^~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Submitted [https://boringssl-review.googlesource.com/c/boringssl/+/68227 crypto: use _Generic only if !defined(__cplusplus)] -Signed-off-by: Martin Jansa ---- - crypto/internal.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/crypto/internal.h b/crypto/internal.h -index f93c2e5..2fca2fb 100644 ---- a/crypto/internal.h -+++ b/crypto/internal.h -@@ -1206,7 +1206,7 @@ static inline uint64_t CRYPTO_rotr_u64(uint64_t value, int shift) { - - // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry - // bit. |carry| must be zero or one. --#if OPENSSL_HAS_BUILTIN(__builtin_addc) -+#if OPENSSL_HAS_BUILTIN(__builtin_addc) && !defined(__cplusplus) - - #define CRYPTO_GENERIC_ADDC(x, y, carry, out_carry) \ - (_Generic((x), \ -@@ -1258,7 +1258,7 @@ static inline uint64_t CRYPTO_addc_u64(uint64_t x, uint64_t y, uint64_t carry, - - // CRYPTO_subc_* returns |x - y - borrow|, and sets |*out_borrow| to the borrow - // bit. |borrow| must be zero or one. --#if OPENSSL_HAS_BUILTIN(__builtin_subc) -+#if OPENSSL_HAS_BUILTIN(__builtin_subc) && !defined(__cplusplus) - - #define CRYPTO_GENERIC_SUBC(x, y, borrow, out_borrow) \ - (_Generic((x), \ diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch deleted file mode 100644 index 39f9fafba7..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e2c78c555ab3d9509c4ade511e2f711eb7188626 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 15 May 2024 16:55:09 +0800 -Subject: [PATCH] target.h: define proper macro for ppc/ppc64 - -Fix error: -third_party/boringssl-with-bazel/src/include/openssl/target.h:74:2: error: #error "Unknown target CPU" -third_party/boringssl-with-bazel/src/include/openssl/bn.h:172:2: error: #error "Must define either OPENSSL_32_BIT or OPENSSL_64_BIT" -third_party/boringssl-with-bazel/src/include/openssl/bn.h:230:44: error: 'BN_ULONG' has not been declared - -BN_ULONG will be defined after set proper OPENSSL_32_BIT or OPENSSL_64_BIT - -Upstream-Status: Pending - -Signed-off-by: Changqing Li ---- - third_party/boringssl-with-bazel/src/include/openssl/target.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/third_party/boringssl-with-bazel/src/include/openssl/target.h b/third_party/boringssl-with-bazel/src/include/openssl/target.h -index 2760f52..e743402 100644 ---- a/third_party/boringssl-with-bazel/src/include/openssl/target.h -+++ b/third_party/boringssl-with-bazel/src/include/openssl/target.h -@@ -54,6 +54,10 @@ - #define OPENSSL_32_BIT - #elif defined(__myriad2__) - #define OPENSSL_32_BIT -+#elif defined(__PPC64__) -+#define OPENSSL_64_BIT -+#elif defined(__PPC__) -+#define OPENSSL_32_BIT - #else - // The list above enumerates the platforms that BoringSSL supports. For these - // platforms we keep a reasonable bar of not breaking them: automated test diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb index 0265fc0adc..32d4fbc22a 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb @@ -4,14 +4,12 @@ SECTION = "devel/python" LICENSE = "Apache-2.0 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" -DEPENDS += "python3-protobuf" +DEPENDS += "openssl python3-protobuf" SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \ file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch \ file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \ - file://0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch;patchdir=third_party/boringssl-with-bazel/src/ \ - file://0001-target.h-define-proper-macro-for-ppc-ppc64.patch \ " SRC_URI[sha256sum] = "936fa44241b5379c5afc344e1260d467bee495747eaf478de825bab2791da6f5" @@ -22,18 +20,7 @@ inherit pypi CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" -BORING_SSL_PLATFORM:arm = "linux-arm" -BORING_SSL_PLATFORM:x86-64 = "linux-x86_64" -BORING_SSL_PLATFORM:aarch64 = "linux-aarch64" -BORING_SSL_PLATFORM ?= "unsupported" -export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" -export GRPC_BUILD_OVERRIDE_BORING_SSL_ASM_PLATFORM = "${BORING_SSL_PLATFORM}" - -BORING_SSL:arm = "1" -BORING_SSL:x86-64 = "1" -BORING_SSL:aarch64 = "1" -BORING_SSL ?= "0" -export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" +export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = "1" GRPC_CFLAGS ?= "" GRPC_CFLAGS:append:toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" From patchwork Thu Feb 6 19:18:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 56813 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 1E24BC02199 for ; Thu, 6 Feb 2025 19:20:17 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.web11.50829.1738869608125769224 for ; Thu, 06 Feb 2025 11:20:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=Yqo+jz9k; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-256628-202502061920054ad70ba483c7cdc5b8-enxenf@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202502061920054ad70ba483c7cdc5b8 for ; Thu, 06 Feb 2025 20:20:06 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=NIWcM3fcY6aRiNavZoLrXRK4Jv4/cPH1+UyDjmUCYyw=; b=Yqo+jz9kFizmVXA+8buwkrmKDij3M3zxggNx2ZZtDn3yR6WRcdpK0T3VX25Z/MrVsmjsjh vLfL0ZaWltOZQywVojnnMqRT6UglqJEgRVkNacw7tkMGQfxwfQyav2DFu5loJTTdtOT/YyCS aECgP8sNbvSuiIKVTdLNej+Z3GGdKCSeC5qlEwU+nlpwvNin+FOxKlLwS0QbEhD0gcu30w5j mC+eBU12d6A5wQmezJU91BSotQpjkkSfg8zwMspXySIRP5nl+utf+3tQ7gp4zJIiNKYwWVnK NLepjYPi6lg35eH518gRE9aY1xSKa7sULLjxJwocmC/C9Ee8XD/j8elw==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-python][PATCH 4/9] python3-grpcio: use system zlib Date: Thu, 6 Feb 2025 20:18:58 +0100 Message-Id: <20250206191903.2324783-4-peter.marko@siemens.com> In-Reply-To: <20250206191903.2324783-1-peter.marko@siemens.com> References: <20250206191903.2324783-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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 ; Thu, 06 Feb 2025 19:20:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115296 From: Peter Marko This also allows to remove a custom patch to maintain and corrects license, SPDX and CVE handling. Signed-off-by: Peter Marko --- ...clude-unistd.h-for-open-close-C-APIs.patch | 24 ------------------- .../python/python3-grpcio_1.69.0.bb | 4 ++-- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch deleted file mode 100644 index 584723e6d1..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f84421d8ee06890e2c98c0f7c9ec6c73f88e77c3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 12 Feb 2023 21:25:04 -0800 -Subject: [PATCH] zlib: Include unistd.h for open/close C APIs - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - third_party/zlib/gzguts.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/zlib/gzguts.h b/third_party/zlib/gzguts.h -index f937504..341a68d 100644 ---- a/third_party/zlib/gzguts.h -+++ b/third_party/zlib/gzguts.h -@@ -18,6 +18,7 @@ - #endif - - #include -+#include - #include "zlib.h" - #ifdef STDC - # include diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb index 32d4fbc22a..d621f840f1 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb @@ -4,12 +4,11 @@ SECTION = "devel/python" LICENSE = "Apache-2.0 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" -DEPENDS += "openssl python3-protobuf" +DEPENDS += "openssl python3-protobuf zlib" SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \ file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch \ - file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \ " SRC_URI[sha256sum] = "936fa44241b5379c5afc344e1260d467bee495747eaf478de825bab2791da6f5" @@ -21,6 +20,7 @@ inherit pypi CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = "1" +export GRPC_PYTHON_BUILD_SYSTEM_ZLIB = "1" GRPC_CFLAGS ?= "" GRPC_CFLAGS:append:toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" From patchwork Thu Feb 6 19:18:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 56812 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 1F8DAC3DA4A for ; Thu, 6 Feb 2025 19:20:17 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.web11.50829.1738869608125769224 for ; Thu, 06 Feb 2025 11:20:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=KX3QdXda; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-256628-20250206192009e297715aecbd3de99b-6o4nz4@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20250206192009e297715aecbd3de99b for ; Thu, 06 Feb 2025 20:20:09 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=l/+NpJZ2xy0GS+Yb+rvSJZu4wmVmSNQds52dXNjblHY=; b=KX3QdXdaLzTy+vrKn6kfj9T/W+M6TTq4w6WGku5xn/qeeM1Zr6NqzHdRvheYjVgyGhE71t uaNWCl/mEazBDad2nmPRlbPJYwb860cdUO1d+7LZoUv7emz1WoBLslmkrCMVo3PzxMxFUiaV wMCESHg4nYwAdIP3TMXZ9Tkcp14YuogPkZxxBDti2phePKPrkdfH5A8XPwbFAL9/JvJOFzsa QxAcCXafPfnYhOIDXHjmzmCkEJZusFhbE3Z8yXSrSRaxzi87HpFnv4ysn5kyGiqFVWC/obTY Dzg/k0Sb+ndZDqx0Y0CYJvoIk/ZhOdy/neXfQ2IRHVgq9aIw1HclXefQ==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-python][PATCH 5/9] python3-grpcio: use system c-ares Date: Thu, 6 Feb 2025 20:18:59 +0100 Message-Id: <20250206191903.2324783-5-peter.marko@siemens.com> In-Reply-To: <20250206191903.2324783-1-peter.marko@siemens.com> References: <20250206191903.2324783-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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 ; Thu, 06 Feb 2025 19:20:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115297 From: Peter Marko This also corrects license, SPDX and CVE handling. Signed-off-by: Peter Marko --- meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb index d621f840f1..ab615d38e5 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" -DEPENDS += "openssl python3-protobuf zlib" +DEPENDS += "c-ares openssl python3-protobuf zlib" SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \ file://0001-Include-missing-cstdint-header.patch \ @@ -19,6 +19,7 @@ inherit pypi CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" +export GRPC_PYTHON_BUILD_SYSTEM_CARES = "1" export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = "1" export GRPC_PYTHON_BUILD_SYSTEM_ZLIB = "1" From patchwork Thu Feb 6 19:19:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 56814 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 1E215C02194 for ; Thu, 6 Feb 2025 19:20:17 +0000 (UTC) Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by mx.groups.io with SMTP id smtpd.web11.50835.1738869615328023895 for ; Thu, 06 Feb 2025 11:20:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=BDVToBs+; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-256628-202502061920138e939f8833956e20ec-lbmz9k@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 202502061920138e939f8833956e20ec for ; Thu, 06 Feb 2025 20:20:13 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=oxDoTW6sPfDjFi1/yAqMdfNM1E/5LflhQAPFUVb+758=; b=BDVToBs+3Hq4nJCD+UsBBPO8R/7NQpUqitBR97SHcX7Z3qRllmVRAyn8G8JFIM4gQTi7Df gz3SmAwSZiMd+3uOD9G0ze8fMU2wR79dlKpMr4bQTDbN/9b1K3VPF2WJWqhfdZVWkMotEtlJ 0wDzuO6SwhBc4mkslKO0jEuxBCzivPOxsLIckMWJ93ofgmSr+QZenfAhFluaNvRxKwZ3nPYJ 5FePMUWcmln2e0nH1PyalVFMg6JmDnUa9+izH4uNjwvaS8Yg9lKv4TKxkBOX1okeZIktvin9 Ctdp02sI4BM+5LAkWfmjPjX3DfsOCIoa/dwEbzYUWLhtBQXM6esxlUsg==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-python][PATCH 6/9] python3-grpcio: use system re2 Date: Thu, 6 Feb 2025 20:19:00 +0100 Message-Id: <20250206191903.2324783-6-peter.marko@siemens.com> In-Reply-To: <20250206191903.2324783-1-peter.marko@siemens.com> References: <20250206191903.2324783-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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 ; Thu, 06 Feb 2025 19:20:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115298 From: Peter Marko This also allows to remove a custom patch to maintain and corrects license, SPDX and CVE handling. Signed-off-by: Peter Marko --- .../0001-Include-missing-cstdint-header.patch | 29 ------------------- .../python/python3-grpcio_1.69.0.bb | 4 +-- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch deleted file mode 100644 index a2bd294a01..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0760579b4890b48ea3ab36e48f1f6fb3e7ed05f5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 30 Jan 2023 10:31:10 -0800 -Subject: [PATCH] Include missing header - -gcc 13 moved some includes around and as a result is -no longer transitively included [1]. Explicitly include it for -int32_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Submitted [https://code-review.googlesource.com/c/re2/+/60970] -Signed-off-by: Khem Raj ---- - third_party/re2/util/pcre.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/re2/util/pcre.h b/third_party/re2/util/pcre.h -index 896b0bd..271a005 100644 ---- a/third_party/re2/util/pcre.h -+++ b/third_party/re2/util/pcre.h -@@ -163,6 +163,7 @@ - - #include "util/util.h" - #include "re2/stringpiece.h" -+#include - - #ifdef USEPCRE - #include diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb index ab615d38e5..f70582ea41 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb @@ -4,10 +4,9 @@ SECTION = "devel/python" LICENSE = "Apache-2.0 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" -DEPENDS += "c-ares openssl python3-protobuf zlib" +DEPENDS += "c-ares openssl python3-protobuf re2 zlib" SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \ - file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch \ " SRC_URI[sha256sum] = "936fa44241b5379c5afc344e1260d467bee495747eaf478de825bab2791da6f5" @@ -21,6 +20,7 @@ CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" export GRPC_PYTHON_BUILD_SYSTEM_CARES = "1" export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = "1" +export GRPC_PYTHON_BUILD_SYSTEM_RE2 = "1" export GRPC_PYTHON_BUILD_SYSTEM_ZLIB = "1" GRPC_CFLAGS ?= "" From patchwork Thu Feb 6 19:19:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 56817 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 1E57EC02199 for ; Thu, 6 Feb 2025 19:20:27 +0000 (UTC) Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by mx.groups.io with SMTP id smtpd.web10.50461.1738869618334894397 for ; Thu, 06 Feb 2025 11:20:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=G1niRmif; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-256628-2025020619201691e5ccb88a3889c789-zs9xoj@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2025020619201691e5ccb88a3889c789 for ; Thu, 06 Feb 2025 20:20:16 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=dZ6TE/mbttZ6t2uYQ/BmaoRRPrecX66R+QfqJTIWn+0=; b=G1niRmifsUXaMqsNv+u+0jlNuN+HpaZMq1aNXTV3okex9666CZTopEaMHV77nQAtGsPUdA XG2KDwfNuuWpPMqyjmW8Qw/P1ggEgFne1QHgXsqqCgFAGI/KUo3u/wbCjH2RoGyJ+uF0nJbM ikz81hCHa0vAgg+SY/cFd1d9tcLIr8aUGCJlQfvTdVKBWvRvmrAkHwZe5IzSbNNftWCn9fUe HdlSV3TkSluAvBVMW02RoV+4dQcHnPKSIdkocON+I1C58bCt62Vvy+GvZCjuHQcREKP1SdKT 4Q+UE4wj70pYuQQdJ6lkYF78n4V5BYzCdE5fa/1OAcrJtjukXBuL7vxQ==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-python][PATCH 7/9] python3-grpcio: use system abseil-cpp Date: Thu, 6 Feb 2025 20:19:01 +0100 Message-Id: <20250206191903.2324783-7-peter.marko@siemens.com> In-Reply-To: <20250206191903.2324783-1-peter.marko@siemens.com> References: <20250206191903.2324783-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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 ; Thu, 06 Feb 2025 19:20:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115299 From: Peter Marko This also allows to remove a custom patch to maintain and corrects license, SPDX and CVE handling. Signed-off-by: Peter Marko --- .../python3-grpcio/abseil-ppc-fixes.patch | 102 ------------------ .../python/python3-grpcio_1.69.0.bb | 7 +- 2 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch diff --git a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch deleted file mode 100644 index 69e06a7918..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch +++ /dev/null @@ -1,102 +0,0 @@ -From a2ec96a96ff7ba016e800212a942b9f29f255415 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 13 Mar 2021 10:26:25 -0800 -Subject: [PATCH] An all-in-one patch that fixes several issues: - -1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) -2) powerpc stacktrace implementation only works on glibc (disabled on musl) -3) powerpc stacktrace implementation has ppc64 assumptions (fixed) -4) examine_stack.cpp makes glibc assumptions on powerpc (fixed) - -Sourced from void linux - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Signed-off-by: Xu Huan -Signed-off-by: Wang Mingyu ---- - .../abseil-cpp/absl/base/internal/unscaledcycleclock.cc | 4 ++-- - .../absl/base/internal/unscaledcycleclock_config.h | 3 ++- - .../abseil-cpp/absl/debugging/internal/examine_stack.cc | 8 +++++++- - .../absl/debugging/internal/stacktrace_config.h | 2 +- - 4 files changed, 12 insertions(+), 5 deletions(-) - -diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -index a0bf3a6..103b4f6 100644 ---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -@@ -20,7 +20,7 @@ - #include - #endif - --#if defined(__powerpc__) || defined(__ppc__) -+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - #ifdef __GLIBC__ - #include - #elif defined(__FreeBSD__) -@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() { - return base_internal::NominalCPUFrequency(); - } - --#elif defined(__powerpc__) || defined(__ppc__) -+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - - int64_t UnscaledCycleClock::Now() { - #ifdef __GLIBC__ -diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h -index 43a3dab..196a853 100644 ---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h -+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h -@@ -21,7 +21,8 @@ - - // The following platforms have an implementation of a hardware counter. - #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ -- defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) || \ -+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ -+ defined(_M_IX86) || \ - (defined(_M_X64) && !defined(_M_ARM64EC)) - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 - #else -diff --git a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc -index 3dd6ba1..9f0601c 100644 ---- a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc -+++ b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc -@@ -36,6 +36,10 @@ - #include - #include - -+#if defined(__powerpc__) -+#include -+#endif -+ - #include "absl/base/attributes.h" - #include "absl/base/internal/raw_logging.h" - #include "absl/base/macros.h" -@@ -177,8 +181,10 @@ void* GetProgramCounter(void* const vuc) { - return reinterpret_cast(context->uc_mcontext.pc); - #elif defined(__powerpc64__) - return reinterpret_cast(context->uc_mcontext.gp_regs[32]); --#elif defined(__powerpc__) -+#elif defined(__powerpc__) && defined(__GLIBC__) - return reinterpret_cast(context->uc_mcontext.uc_regs->gregs[32]); -+#elif defined(__powerpc__) -+ return reinterpret_cast(((struct pt_regs *)context->uc_regs)->gregs[32]); - #elif defined(__riscv) - return reinterpret_cast(context->uc_mcontext.__gregs[REG_PC]); - #elif defined(__s390__) && !defined(__s390x__) -diff --git a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h -index 3929b1b..23d5e50 100644 ---- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h -+++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h -@@ -60,7 +60,7 @@ - #elif defined(__i386__) || defined(__x86_64__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_x86-inl.inc" --#elif defined(__ppc__) || defined(__PPC__) -+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_powerpc-inl.inc" - #elif defined(__aarch64__) --- -2.43.0 - diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb index f70582ea41..26d7564590 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb @@ -4,11 +4,9 @@ SECTION = "devel/python" LICENSE = "Apache-2.0 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" -DEPENDS += "c-ares openssl python3-protobuf re2 zlib" +DEPENDS += "abseil-cpp c-ares openssl python3-protobuf re2 zlib" -SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \ - file://abseil-ppc-fixes.patch \ - " +SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch" SRC_URI[sha256sum] = "936fa44241b5379c5afc344e1260d467bee495747eaf478de825bab2791da6f5" RDEPENDS:${PN} = "python3-protobuf" @@ -18,6 +16,7 @@ inherit pypi CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" +export GRPC_PYTHON_BUILD_SYSTEM_ABSL = "1" export GRPC_PYTHON_BUILD_SYSTEM_CARES = "1" export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = "1" export GRPC_PYTHON_BUILD_SYSTEM_RE2 = "1" From patchwork Thu Feb 6 19:19:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 56815 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 23317C0219C for ; Thu, 6 Feb 2025 19:20:27 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.web10.50465.1738869622612584275 for ; Thu, 06 Feb 2025 11:20:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=VWBlymhI; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-256628-20250206192020659d648b291fbcea6e-uxkvdg@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20250206192020659d648b291fbcea6e for ; Thu, 06 Feb 2025 20:20:20 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=NkKDN16T82M9I4JcCJ16MI2rVFSRUD6JvuELgrnu38U=; b=VWBlymhI53yxKcZZpg3Vc0HTmntpDJ43dPVaV4DfduuZsZSEqyytRI8z1a4IgwaGh/zm65 CMrY8mjjObv4cCp6ABuJ37GumPk9SQO+/sTK9mIx7A6Y78SGws2TMqklIxAfEQc+jXjUlg5k ua90LGwYXjK6fIELmBOmHb27Otb95zc3brDQupNhF8KY1btm0PcKBVnnQ094J3kC4uFrPqT4 nhhn6U6zZIRYoX6t3sqAUawpzpeuDUbRlskj2JzEJQ1BVn8xfzC4KdyFQDxq20vBH9wxlhGx 2tm8+/XrV9Ua8qkEpZ28Dfp2tMbdbRRjL8KvQxHnY48n35Cp5R26W13A==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-python][PATCH 8/9] python3-grpcio: add missing license Date: Thu, 6 Feb 2025 20:19:02 +0100 Message-Id: <20250206191903.2324783-8-peter.marko@siemens.com> In-Reply-To: <20250206191903.2324783-1-peter.marko@siemens.com> References: <20250206191903.2324783-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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 ; Thu, 06 Feb 2025 19:20:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115300 From: Peter Marko LICENSE file contains 3 licenses, but recipe lists only 2. Add the missing "Mozilla Public License Version 2.0". License-Update: added missing license Signed-off-by: Peter Marko --- meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb index 26d7564590..8482240b68 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Google gRPC" HOMEPAGE = "http://www.grpc.io/" SECTION = "devel/python" -LICENSE = "Apache-2.0 & BSD-3-Clause" +LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" DEPENDS += "abseil-cpp c-ares openssl python3-protobuf re2 zlib" From patchwork Thu Feb 6 19:19:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Marko X-Patchwork-Id: 56816 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 1E536C02194 for ; Thu, 6 Feb 2025 19:20:27 +0000 (UTC) Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net [185.136.65.225]) by mx.groups.io with SMTP id smtpd.web10.50467.1738869625929561627 for ; Thu, 06 Feb 2025 11:20:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm2 header.b=JF4Ypa04; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.225, mailfrom: fm-256628-20250206192023f007527db17e1e907d-mrfpsi@rts-flowmailer.siemens.com) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20250206192023f007527db17e1e907d for ; Thu, 06 Feb 2025 20:20:24 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=bc8grW1TTsHogQxrWHbc8qNUxVn1/XgpppfIR4+sfwc=; b=JF4Ypa04cSQZG+oh/E6R7C/JUFZ0EyQs+v2LzeGWM034EOqUg+cFI7g2aGyonl7/vc2w6y FjdfWHUR1ywexTHbUTtjG/ll8TP1cdjoPgxPkX4D6VtmTZvpm36PTfXS/o0KLiWZWHlN+zis HiFutBBVb+XqcNz7XuaMHW6N1D//R8qaWnpmPjSMHziJiZXZJe1iSU3isMHtzPjnRQh8E9v9 JYYUO9LwZ62pi/DXZAeCT9ftr+fGQnpf1WMBaAIgyhzgTTvDTHRMDfmlvTYT3J7GtyvBamP/ 8ZtTcgcBj+rJ6Wve1SfvWHViMcBLgTzRCsEeBkjqBxWY90cd2QNNNXmQ==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-python][PATCH 9/9] python3-grpcio: add licenses from third party components Date: Thu, 6 Feb 2025 20:19:03 +0100 Message-Id: <20250206191903.2324783-9-peter.marko@siemens.com> In-Reply-To: <20250206191903.2324783-1-peter.marko@siemens.com> References: <20250206191903.2324783-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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 ; Thu, 06 Feb 2025 19:20:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115301 From: Peter Marko After switching to unbundled build, there are still 4 components in third_party directory which are used. Add their licenses. * address_sorting - BSD-3-Clause (already present in main LICENSE) https://github.com/grpc/grpc/blob/master/third_party/address_sorting/LICENSE * upb - BSD-3-Clause (already present in main LICENSE) there is a note in all files * utf8_range - MIT https://github.com/grpc/grpc/blob/master/third_party/utf8_range/LICENSE * xxhash - BSD-2-Clause https://github.com/grpc/grpc/blob/master/third_party/xxhash/LICENSE License-Update: added missing licenses Signed-off-by: Peter Marko --- .../recipes-devtools/python/python3-grpcio_1.69.0.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb index 8482240b68..b076298fef 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb @@ -1,8 +1,12 @@ DESCRIPTION = "Google gRPC" HOMEPAGE = "http://www.grpc.io/" SECTION = "devel/python" -LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" +LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0 & MIT & BSD-2-Clause" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906 \ + file://third_party/utf8_range/utf8_validity.h;beginline=1;endline=5;md5=db08ddb5817e660489678e7c3653805a \ + file://third_party/xxhash/xxhash.h;beginline=1;endline=34;md5=d41d564db2353fc80a713956d85b1690 \ +" DEPENDS += "abseil-cpp c-ares openssl python3-protobuf re2 zlib"