diff mbox series

[meta-python,19/26] python3-grpcio(-tools): upgrade 1.60.1 -> 1.62.0

Message ID 1709714608-19296-19-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-oe,01/26] abseil-cpp: upgrade 20230802.1 -> 20240116.1 | expand

Commit Message

Mingyu Wang (Fujitsu) March 6, 2024, 8:43 a.m. UTC
From: Wang Mingyu <wangmy@fujitsu.com>

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 <wangmy@fujitsu.com>
---
 ...tools_1.60.1.bb => python3-grpcio-tools_1.62.0.bb} |  2 +-
 ...-zlib-Include-unistd.h-for-open-close-C-APIs.patch |  7 +++----
 .../python/python3-grpcio/abseil-ppc-fixes.patch      | 11 +++++------
 ...hon3-grpcio_1.60.1.bb => python3-grpcio_1.62.0.bb} |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-grpcio-tools_1.60.1.bb => python3-grpcio-tools_1.62.0.bb} (85%)
 rename meta-python/recipes-devtools/python/{python3-grpcio_1.60.1.bb => python3-grpcio_1.62.0.bb} (93%)
diff mbox series

Patch

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.62.0.bb
similarity index 85%
rename from meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb
rename to meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.0.bb
index 07f5fe4c2..a8c0ad91f 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.62.0.bb
@@ -12,7 +12,7 @@  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"
+SRC_URI[sha256sum] = "7fca6ecfbbf0549058bb29dcc6e435d885b878d07701e77ac58e1e1f591736dc"
 
 RDEPENDS:${PN} = "python3-grpcio"
 
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 a5e767029..34ef7874e 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 <raj.khem@gmail.com>
 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 <raj.khem@gmail.com>
-
 ---
  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 <stdio.h>
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 4bb60b6e2..f39a9616d 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 <raj.khem@gmail.com>
 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 <raj.khem@gmail.com>
 Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com>
-
 ---
  .../abseil-cpp/absl/base/internal/unscaledcycleclock.cc   | 4 ++--
  .../absl/base/internal/unscaledcycleclock_config.h        | 3 ++-
@@ -22,7 +21,7 @@  Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com>
  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 <csignal>
  #include <cstdio>
  
@@ -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<void*>(context->uc_mcontext.pc);
  #elif defined(__powerpc64__)
      return reinterpret_cast<void*>(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.62.0.bb
similarity index 93%
rename from meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb
rename to meta-python/recipes-devtools/python/python3-grpcio_1.62.0.bb
index b00f8681c..ceb22f0e2 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio_1.62.0.bb
@@ -10,7 +10,7 @@  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"
+SRC_URI[sha256sum] = "748496af9238ac78dcd98cce65421f1adce28c3979393e3609683fcd7f3880d7"
 
 RDEPENDS:${PN} = "python3-protobuf \
                   python3-setuptools \