X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-connectivity%2Fkuksa-val%2Fkuksa-val%2F0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch;fp=recipes-connectivity%2Fkuksa-val%2Fkuksa-val%2F0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch;h=a7eaf10041eba9c8c61699d6fb30bd6ea4d2b4b7;hb=08c147c6ae6532088a9753ae0272653cfbd8879b;hp=6569f8b5dda0c0a96978028ffc9c0e062643790a;hpb=9aa37897cdf3bcd7f4d5650c11bc2b679a6b9099;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-connectivity/kuksa-val/kuksa-val/0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch b/recipes-connectivity/kuksa-val/kuksa-val/0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch
index 6569f8b5d..a7eaf1004 100644
--- a/recipes-connectivity/kuksa-val/kuksa-val/0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch
+++ b/recipes-connectivity/kuksa-val/kuksa-val/0002-Fix-gRPC-configuration-for-OE-cross-compiling.patch
@@ -1,7 +1,7 @@
-From f6c8584e181d3591b08e1f05a4f685912d7a94ce Mon Sep 17 00:00:00 2001
+From 09eba6eef270a3f75add5c54b5455399aecceaf6 Mon Sep 17 00:00:00 2001
 From: Scott Murray <scott.murray@konsulko.com>
-Date: Mon, 23 May 2022 15:00:37 -0400
-Subject: [PATCH 2/4] Fix gRPC configuration for OE cross-compiling
+Date: Thu, 6 Oct 2022 11:56:57 -0400
+Subject: [PATCH 2/3] Fix gRPC configuration for OE cross-compiling
 
 The gRPC CMake package that kuksa.val pulls in is problematic with
 respect to cross-compiling with OpenEmbedded's split native and
@@ -10,27 +10,21 @@ match the (somewhat ill-advised) assumptions in the original
 upstream gRPC configuration.  To work around this, a patch to
 gRPC is separately applied to split the plugins into their own
 optional package, and the logic in grpc.cmake here tweaked to
-explicitly take cross-compilation into account.  Additionally, the
-explicit version requirement for gRPC is tweaked to 1.24.3 to allow
-building with Yocto Project 3.1 aka dunfell or newer.
+explicitly take cross-compilation into account.
 
 Upstream-Status: Pending
 
 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
 ---
- grpc.cmake | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
+ kuksa-val-server/grpc.cmake | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
 
-diff --git a/grpc.cmake b/grpc.cmake
-index c0228a0..30b3757 100644
---- a/grpc.cmake
-+++ b/grpc.cmake
-@@ -11,17 +11,24 @@
- # *****************************************************************************
- 
- set(gRPC_SSL_PROVIDER "package" CACHE STRING "Provider of ssl library")
--set(GRPC_VER 1.44.0)
-+set(GRPC_VER 1.24.3)
+diff --git a/kuksa-val-server/grpc.cmake b/kuksa-val-server/grpc.cmake
+index 4d90f1d..d097a69 100644
+--- a/kuksa-val-server/grpc.cmake
++++ b/kuksa-val-server/grpc.cmake
+@@ -14,14 +14,21 @@ set(gRPC_SSL_PROVIDER "package" CACHE STRING "Provider of ssl library")
+ set(GRPC_VER 1.44.0)
  
  find_package(Protobuf)
 -find_package(gRPC ${GRPC_VER} EXACT CONFIG)
@@ -55,5 +49,5 @@ index c0228a0..30b3757 100644
      set(_PROTOBUF_PROTOC $<TARGET_FILE:protobuf::protoc>)
  
 -- 
-2.35.1
+2.37.3