diff mbox series

[meta-python,10/18] python3-grpcio: upgrade 1.68.1 -> 1.69.0

Message ID 1736240504-5315-10-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-oe,01/18] ctags: upgrade 6.1.20241229.0 -> 6.1.20250105.0 | expand

Commit Message

Mingyu Wang (Fujitsu) Jan. 7, 2025, 9:01 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-protobuf-Disable-musttail-attribute-on-mips.patch
refreshed for 1.69.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-protobuf-Disable-musttail-attribute-on-mips.patch  | 6 +++---
 ...rpcio-tools_1.68.1.bb => python3-grpcio-tools_1.69.0.bb} | 2 +-
 .../{python3-grpcio_1.68.1.bb => python3-grpcio_1.69.0.bb}  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-grpcio-tools_1.68.1.bb => python3-grpcio-tools_1.69.0.bb} (86%)
 rename meta-python/recipes-devtools/python/{python3-grpcio_1.68.1.bb => python3-grpcio_1.69.0.bb} (94%)
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch
index 0f6844df57..cb12fb4983 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch
@@ -1,4 +1,4 @@ 
-From 7d2d5d39b7dcf9b6336d78b9e977b0550f7afe9e Mon Sep 17 00:00:00 2001
+From ded393c799d4d970d69a75c458f3672b03099aeb Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 16 Sep 2022 19:09:15 -0700
 Subject: [PATCH] protobuf: Disable musttail attribute on mips
@@ -13,10 +13,10 @@  Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/third_party/protobuf/src/google/protobuf/port_def.inc b/third_party/protobuf/src/google/protobuf/port_def.inc
-index 37d80e5..c136654 100644
+index 56f995e..4d36c2f 100644
 --- a/third_party/protobuf/src/google/protobuf/port_def.inc
 +++ b/third_party/protobuf/src/google/protobuf/port_def.inc
-@@ -222,6 +222,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
+@@ -227,6 +227,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
  #error PROTOBUF_TAILCALL was previously defined
  #endif
  #if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) &&  \
diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.68.1.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.69.0.bb
similarity index 86%
rename from meta-python/recipes-devtools/python/python3-grpcio-tools_1.68.1.bb
rename to meta-python/recipes-devtools/python/python3-grpcio-tools_1.69.0.bb
index 88183189a3..76f5739f95 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.68.1.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.69.0.bb
@@ -15,7 +15,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] = "2413a17ad16c9c821b36e4a67fc64c37b9e4636ab1c3a07778018801378739ba"
+SRC_URI[sha256sum] = "3e1a98f4d9decb84979e1ddd3deb09c0a33a84b6e3c0776d5bde4097e3ab66dd"
 
 RDEPENDS:${PN} = "python3-grpcio"
 
diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.68.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb
similarity index 94%
rename from meta-python/recipes-devtools/python/python3-grpcio_1.68.1.bb
rename to meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb
index 6967483ace..617e982382 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio_1.68.1.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb
@@ -12,7 +12,7 @@  SRC_URI += "file://0001-Include-missing-cstdint-header.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] = "44a8502dd5de653ae6a73e2de50a401d84184f0331d0ac3daeb044e66d5c5054"
+SRC_URI[sha256sum] = "936fa44241b5379c5afc344e1260d467bee495747eaf478de825bab2791da6f5"
 
 RDEPENDS:${PN} = "python3-protobuf"