From 7fc8087c65370b9a7ca73dc4fbd2f1621c2aed94 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 6 Mar 2024 16:43:21 +0800 Subject: python3-grpcio(-tools): upgrade 1.60.1 -> 1.62.0 0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch abseil-ppc-fixes.patch refreshed for 1.62.0 Changelog: ========== -[metadata] Allow non application/grpc content-type values. -[BoringSSL] Update third_party/boringssl-with-bazel. -[GPR] Removed GPR_BACKWARDS_COMPATIBILITY_MODE. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../python/python3-grpcio-tools_1.60.1.bb | 19 --------- .../python/python3-grpcio-tools_1.62.0.bb | 19 +++++++++ ...ib-Include-unistd.h-for-open-close-C-APIs.patch | 7 ++-- .../python/python3-grpcio/abseil-ppc-fixes.patch | 11 +++-- .../python/python3-grpcio_1.60.1.bb | 48 ---------------------- .../python/python3-grpcio_1.62.0.bb | 48 ++++++++++++++++++++++ 6 files changed, 75 insertions(+), 77 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb create mode 100644 meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.0.bb delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb create mode 100644 meta-python/recipes-devtools/python/python3-grpcio_1.62.0.bb (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb deleted file mode 100644 index 07f5fe4c2a..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Google gRPC tools" -HOMEPAGE = "http://www.grpc.io/" -SECTION = "devel/python" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" - -inherit pypi setuptools3 - -DEPENDS += "python3-grpcio" - -SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ - file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \ - " -SRC_URI[sha256sum] = "da08224ab8675c6d464b988bd8ca02cccd2bf0275bceefe8f6219bfd4a4f5e85" - -RDEPENDS:${PN} = "python3-grpcio" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.0.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.0.bb new file mode 100644 index 0000000000..a8c0ad91f2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Google gRPC tools" +HOMEPAGE = "http://www.grpc.io/" +SECTION = "devel/python" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" + +inherit pypi setuptools3 + +DEPENDS += "python3-grpcio" + +SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ + file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \ + " +SRC_URI[sha256sum] = "7fca6ecfbbf0549058bb29dcc6e435d885b878d07701e77ac58e1e1f591736dc" + +RDEPENDS:${PN} = "python3-grpcio" + +BBCLASSEXTEND = "native nativesdk" 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 index a5e767029e..34ef7874e8 100644 --- 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 @@ -1,4 +1,4 @@ -From 6ede7d01b18a4d9eeaccd25f5c1ab9985cb65307 Mon Sep 17 00:00:00 2001 +From 671618df3e48619f0c7a5a3acd8982374a5e43db 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 @@ -6,16 +6,15 @@ 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 57faf37..3c700c2 100644 +index f937504..341a68d 100644 --- a/third_party/zlib/gzguts.h +++ b/third_party/zlib/gzguts.h -@@ -19,6 +19,7 @@ +@@ -18,6 +18,7 @@ #endif #include 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 index 4bb60b6e2c..f39a9616d9 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch @@ -1,4 +1,4 @@ -From 9cec6297effa9fab6f0c71e342046daceecd7d4d Mon Sep 17 00:00:00 2001 +From 102dcce6610e6606fffd3a4986f84eb52177f8c8 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: @@ -13,7 +13,6 @@ Sourced from void linux Upstream-Status: Pending Signed-off-by: Khem Raj Signed-off-by: Xu Huan - --- .../abseil-cpp/absl/base/internal/unscaledcycleclock.cc | 4 ++-- .../absl/base/internal/unscaledcycleclock_config.h | 3 ++- @@ -22,7 +21,7 @@ Signed-off-by: Xu Huan 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 b1c396c..d62bfd6 100644 +index 05e0e7b..f11fecb 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 @@ @@ -58,10 +57,10 @@ index 24b324a..5e232c1 100644 #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 5786322..72c7c46 100644 +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 -@@ -33,6 +33,10 @@ +@@ -36,6 +36,10 @@ #include #include @@ -72,7 +71,7 @@ index 5786322..72c7c46 100644 #include "absl/base/attributes.h" #include "absl/base/internal/raw_logging.h" #include "absl/base/macros.h" -@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) { +@@ -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]); diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb deleted file mode 100644 index b00f8681c5..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "Google gRPC" -HOMEPAGE = "http://www.grpc.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" - -DEPENDS += "python3-protobuf" - -SRC_URI += "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] = "dd1d3a8d1d2e50ad9b59e10aa7f07c7d1be2b367f3f2d33c5fade96ed5460962" - -RDEPENDS:${PN} = "python3-protobuf \ - python3-setuptools \ - python3-six \ -" - -inherit setuptools3 -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" -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}" - -GRPC_CFLAGS ?= "" -GRPC_CFLAGS:append:toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" -export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" - -CLEANBROKEN = "1" - -BBCLASSEXTEND = "native nativesdk" - -CCACHE_DISABLE = "1" diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.62.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.62.0.bb new file mode 100644 index 0000000000..ceb22f0e29 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.62.0.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "Google gRPC" +HOMEPAGE = "http://www.grpc.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" + +DEPENDS += "python3-protobuf" + +SRC_URI += "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] = "748496af9238ac78dcd98cce65421f1adce28c3979393e3609683fcd7f3880d7" + +RDEPENDS:${PN} = "python3-protobuf \ + python3-setuptools \ + python3-six \ +" + +inherit setuptools3 +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" +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}" + +GRPC_CFLAGS ?= "" +GRPC_CFLAGS:append:toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" +export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" + +CLEANBROKEN = "1" + +BBCLASSEXTEND = "native nativesdk" + +CCACHE_DISABLE = "1" -- cgit v1.2.3-54-g00ecf