meta-openembedded: subtree update:7206f7f5bc..98175fd0cc

Adam Miartus (4):
      libcereal: update to newer version
      libcereal: pick up additional licenses of cereal components
      libcereal: add dev package that can be included into toolchain sdk
      cereal: Remove

Alejandro Hernandez Samaniego (2):
      freerdp: Upgrade 2.2.0 -> 2.3.0
      remmina: Upgrade 1.4.10 -> 1.4.11

Anatol Belski (2):
      abseil-cpp: Relax build requirements
      grpc: Upgrade 1.24.3 -> 1.35.0

Andrei Gherzan (1):
      nss: Fix warnings generated by getcwd

Bartosz Golaszewski (1):
      pydbus-manager: new package

Carlos Rafael Giani (2):
      pipewire: Move to meta-multimedia
      pipewire: Rework 0.3 recipe and upgrade to 0.3.22

Christian B. Sørensen (1):
      libgpiod: packageqa problem => static python lib to ${PN}-staticdev

Clément Péron (2):
      grpc: Add PackageConfig to build only required plugins
      grpc: remove gflags dependency

Diego Santa Cruz (1):
      php: split out phpdbg into a separate package

Enrico Jörns (1):
      python3-aiohttp: add missing RDEPENDS on python3-typing-extensions

Gianfranco (1):
      mosquitto: Upgrade 2.0.7 -> 2.0.8

Hongxu Jia (1):
      lvm2/libdevmapper: 2.03.06 -> 2.03.11

Kai Kang (2):
      xfsprogs: 5.9.0 -> 5.10.0
      libinih: install header files without prefix dir inih

Khem Raj (39):
      yelp-xsl: Mark native libxml2 in rdeps
      liburing: Do not build examples on risc/musl
      aom: Disable neon on arm when not present in TUNE_FEATURES
      python3-grpcio: Upgrade to 1.35.0
      python3-grpcio-tools: Upgrade to 1.35.0
      recipes: Update common-licenses references to match new names
      openldap: Refresh patches to remove fuzz
      abseil-cpp: Remove libexecinfo band-aid for musl
      nss: Add powerpc64 little endian support
      luajit: Upgrade to latest on v2.1 release
      influxdb: Generate checksums for term module
      libauthen-sasl-perl,libhtml-tree-perl: allow PERL_USE_UNSAFE_INC
      dvb-apps: Allow insecure inc paths
      glog: Upgrade to 0.4.0
      mpd: Upgrade to 0.22 series
      mbedtls: Fix gcc11 stringop-overflow warning
      v4l-utils: Package systemd fragment for systemd-udevd.service.d
      mpich: Upgrade to 3.4.1
      srt: Backport fix for missing <limits> header
      gerbera: Update to 1.7.0
      nautilus: Drop use of volatile
      vlc: Fix build with gcc 11
      squid: Include <limits> for using std::numeric_limits
      minifi-cpp: include limits header for numeric_limits definition
      opencv: Upgrade to 4.5.1
      mozjs: Drop using JS_VOLATILE_ARM
      opengl-es-cts: Disable -Wuninitialized for external/amber
      grpc: Upgrade to 1.36.1
      mongodb: Include <optional> c++ header
      libyui,libyui-ncurses: Upgrade to 4.0.0
      libyui-ncurses: Disable Werror
      libyui: Adopt to new cmake option to disable Werror
      libyui-ncurses: Pass -DNCURSES_WIDECHAR in CXXFLAGS
      gimp: Add missing dependencies
      gimp: Disable svg icons on arm
      libcamera: Update to latest
      abseil-cpp: Ask for C++14 std explicitly
      opencv: Add packageconfig for building tests
      opencv: Remove duplicate patch

Leon Anavi (30):
      python3-h5py: Upgrade 2.10.0 -> 3.1.0
      python3-transitions: Upgrade 0.8.6 -> 0.8.7
      python3-tabulate: Upgrade 0.8.7 -> 0.8.9
      python3-pyperclip: Upgrade 1.8.1 -> 1.8.2
      python3-elementpath: Upgrade 2.1.3 -> 2.1.4
      python3-mpmath: Upgrade 1.1.0 -> 1.2.1
      python3-prompt-toolkit: Upgrade 3.0.14 -> 3.0.16
      python3-pkgconfig: Upgrade 1.5.1 -> 1.5.2
      python3-mypy: Upgrade 0.800 -> 0.812
      python3-typeguard: Upgrade 2.11.0 -> 2.11.1
      python3-httplib2: Upgrade 0.18.1 -> 0.19.0
      python3-autobahn: Upgrade 20.12.3 -> 21.2.1
      python3-iso8601: Upgrade 0.1.13 -> 0.1.14
      python3-alembic: Upgrade 1.5.4 -> 1.5.5
      python3-txaio: Upgrade 20.12.1 -> 21.2.1
      python3-watchdog: Upgrade 2.0.0 -> 2.0.2
      python3-rsa: Upgrade 4.7 -> 4.7.1
      python3-pandas: Upgrade 1.2.1 -> 1.2.2
      python3-cffi: Upgrade 1.14.4 -> 1.14.5
      python3-pymisp: Upgrade 2.4.137.3 -> 2.4.138
      python3-pytest-runner: Upgrade 5.2 -> 5.3.0
      python3-markdown: Upgrade 3.3.3 -> 3.3.4
      python3-pulsectl: Upgrade 20.5.1 -> 21.2.0
      python3-cvxopt: Upgrade 1.2.5 -> 1.2.6
      python3-rsa: Upgrade 4.7.1 -> 4.7.2
      python3-pyzmq: Upgrade 22.0.2 -> 22.0.3
      python3-tqdm: Upgrade 4.57.0 -> 4.58.0
      python3-autobahn: Upgrade 21.2.1 -> 21.2.2
      python3-aiohttp: Upgrade 3.7.3 -> 3.7.4
      python3-semantic-version: Add recipe

Matteo Croce (1):
      recipes-kernel: add libbpf

Michael Vetter (1):
      jasper: upgrade 2.0.24 -> 2.0.25

Mingli Yu (3):
      crash: add support for lockless ringbuffer
      gtkmm3: use relative path
      mcelog: Upgrade to 175

Oleksandr Kravchuk (21):
      rfkill: update to 1.0
      python3-idna: update to 3.1
      python3-pika: update to 1.2.0
      python3-protobuf: update to 3.14.0
      python3-pychromecast: update to 8.1.0
      python3-pykickstart: update to 3.32
      python3-watchdog: update to 2.0.0
      wolfssl: updae to 4.7.0
      ncmpc: update to 0.45
      rocksdb: update to 6.15.5
      stm32flash: update to 0.6
      python3-astroid: update to 2.5
      python3-configargparse: update to 1.3
      python3-cryptography-vectors: update to 3.4.6
      python3-periphery: update to 2.3.0
      python3-sentry-sdk: update to 0.20.3
      python3-soupsieve: update to 2.2
      python3-supervisor: update to 4.2.1
      python3-tqdm: update 4.57.0
      python3-typeguard: update to 2.11.0
      python3-xmlschema: update to 1.5.1

Oleksiy Obitotskyy (2):
      wireshark-src: improve reproducibility
      smartmontools: Improve reproducibility

Patrick Williams (2):
      boost-url: update to latest
      catch2: upgrade to 2.13.4

Peter Kjellerstedt (1):
      librcereal: A couple of improvements

Randy MacLeod (2):
      libssh2: remove the recipe since it moved to oe-core
      libgit2: remove the recipe since it moved to oe-core

Ross Burton (1):
      python3-intelhex: add recipe for the intelhex package

Sean Nyekjaer (3):
      nodejs: 12.20.1 -> 12.20.2
      zstd: split bin into separate package
      can-utils: split into more packages

Ulrich ?lmann (1):
      v4l-utils: update to 1.20.0

Wang Mingyu (7):
      stunnel: upgrade 5.57 -> 5.58
      iwd: upgrade 1.11 -> 1.12
      protobuf: upgrade 3.14.0 -> 3.15.2
      redis-plus-plus: upgrade 1.2.1 -> 1.2.2
      tesseract-lang: upgrade 4.0.0 -> 4.1.0
      gphoto2: upgrade 2.5.26 -> 2.5.27
      libgphoto2: upgrade 2.5.26 -> 2.5.27

Yanfei Xu (1):
      lmbench: Install cache command and fix typos in manual page

Yi Fan Yu (4):
      rsyslog: upgrade 8.2006.0->8.2012.0
      tcpdump: update 4.9.3 -> 4.99.0
      rsyslog: Add imhttp to packageconfig
      rsyslog: Update 8.2012.0 -> 8.2102.0

Yi Zhao (1):
      vsftpd: allow newfstatat and pselect6 syscalls in the seccomp sandbox

akuster (1):
      softhsm: update to 2.6.1 and align

zangrc (11):
      fuse3: upgrade 3.10.1 -> 3.10.2
      enca: upgrade 1.9 -> 1.19
      gensio: upgrade 2.2.3 -> 2.2.4
      lcms: upgrade 2.11 -> 2.12
      libburn: upgrade 1.5.2 -> 1.5.4
      opensaf: upgrade 5.20.11 -> 5.21.03
      openvpn: upgrade 2.5.0 -> 2.5.1
      strongswan: upgrade 5.9.1 -> 5.9.2
      wireguard-tools: upgrade 1.0.20200827 -> 1.0.20210223
      hwdata: upgrade 0.343 -> 0.345
      mailcap: upgrade 2.1.49 -> 2.1.52

zhengruoqin (7):
      libjcat: upgrade 0.1.4 -> 0.1.6
      postgresql: upgrade 13.1 -> 13.2
      ser2net: upgrade 4.3.0 -> 4.3.3
      Fix do_package error when enable multilib.
      nano: upgrade 5.5 -> 5.6
      qpdf: upgrade 10.0.4 -> 10.2.0
      sigrok-cli: upgrade 0.7.1 -> 0.7.2

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ibbbafaa846b1dcc3c03ac585e7d5075826e4ee37

3 files changed, 19 insertions, 233 deletions

diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
deleted file mode 100644
index 6cad533964..0000000000
--- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6d606f1101c1a172fb6d738d6f1865aa61849e68 Mon Sep 17 00:00:00 2001
-From: Alexey Firago <alexey_firago@mentor.com>
-Date: Fri, 20 Oct 2017 00:04:19 +0300
-Subject: [PATCH] CMakeLists.txt: Fix grpc_cpp_plugin path during cross-compiling or native build
-
-Signed-off-by: Alexey Firago <alexey_firago@mentor.com>
-Signed-off-by: Hiram Lew <lew@avast.com>
-Signed-off-by: Jan Kaisrlik <jan.kaisrlik@avast.com>
----
- CMakeLists.txt                    | 9 ++++++++-
- templates/CMakeLists.txt.template | 9 ++++++++-
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -193,6 +193,13 @@ function(protobuf_generate_grpc_cpp)
-     return()
-   endif()
- 
-+  #if cross-compiling or nativesdk, find host plugin
-+  if(CMAKE_CROSSCOMPILING)
-+      find_program(gRPC_CPP_PLUGIN grpc_cpp_plugin)
-+  else()
-+      set(gRPC_CPP_PLUGIN $<TARGET_FILE:grpc_cpp_plugin>)
-+  endif()
-+
-   set(_protobuf_include_path -I . -I ${_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR})
-   foreach(FIL ${ARGN})
-     get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
---- a/templates/CMakeLists.txt.template
-+++ b/templates/CMakeLists.txt.template
-@@ -233,6 +233,13 @@
-       return()
-     endif()
- 
-+    #if cross-compiling or nativesdk, find host plugin
-+    if(CMAKE_CROSSCOMPILING)
-+        find_program(gRPC_CPP_PLUGIN grpc_cpp_plugin)
-+    else()
-+        set(gRPC_CPP_PLUGIN $<TARGET_FILE:grpc_cpp_plugin>)
-+    endif()
-+
-     set(_protobuf_include_path -I . -I <%text>${_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR}</%text>)
-     foreach(FIL <%text>${ARGN}</%text>)
-       get_filename_component(ABS_FIL <%text>${FIL}</%text> ABSOLUTE)
diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
deleted file mode 100644
index e517355d34..0000000000
--- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 2279e30be5796e9b185545543ea54fe68633cbdd Mon Sep 17 00:00:00 2001
-From: Alexey Firago <alexey_firago@mentor.com>
-Date: Mon, 30 Oct 2017 23:24:49 +0300
-Subject: [PATCH] CMakeLists.txt: Fix libraries installation for Linux
-
-* Set libs versions as in Makefile
-
-Signed-off-by: Alexey Firago <alexey_firago@mentor.com>
-
----
- CMakeLists.txt | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 59 insertions(+)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,6 +30,15 @@ set(PACKAGE_TARNAME   "${PACKAGE_NAME}-$
- set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
- project(${PACKAGE_NAME} C CXX)
- 
-+set (CORE_VERSION_MAJOR "6")
-+set (CORE_VERSION "6.0.0")
-+
-+set (CPP_VERSION_MAJOR "1")
-+set (CPP_VERSION "${PACKAGE_VERSION}")
-+
-+set (CSHARP_VERSION_MAJOR "1")
-+set (CSHARP_VERSION "${PACKAGE_VERSION}")
-+
- set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables")
- set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries")
- set(gRPC_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for headers")
-@@ -777,6 +786,10 @@ if(WIN32 AND MSVC)
-   endif()
- endif()
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET address_sorting PROPERTY VERSION ${CORE_VERSION})
-+  set_property(TARGET address_sorting PROPERTY SOVERSION ${CORE_VERSION_MAJOR})
-+endif()
- 
- target_include_directories(address_sorting
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-@@ -903,6 +916,10 @@ if(WIN32 AND MSVC)
-   endif()
- endif()
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET gpr PROPERTY VERSION ${CORE_VERSION})
-+  set_property(TARGET gpr PROPERTY SOVERSION ${CORE_VERSION_MAJOR})
-+endif()
- 
- target_include_directories(gpr
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-@@ -1367,6 +1384,10 @@ if(WIN32 AND MSVC)
-   endif()
- endif()
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET grpc PROPERTY VERSION ${CORE_VERSION})
-+  set_property(TARGET grpc PROPERTY SOVERSION ${CORE_VERSION_MAJOR})
-+endif()
- 
- target_include_directories(grpc
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-@@ -1782,6 +1803,10 @@ if(WIN32 AND MSVC)
-   endif()
- endif()
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET grpc_cronet PROPERTY VERSION ${CORE_VERSION})
-+  set_property(TARGET grpc_cronet PROPERTY SOVERSION ${CORE_VERSION_MAJOR})
-+endif()
- 
- target_include_directories(grpc_cronet
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-@@ -2869,6 +2894,10 @@ if(WIN32 AND MSVC)
-   endif()
- endif()
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET grpc_unsecure PROPERTY VERSION ${CORE_VERSION})
-+  set_property(TARGET grpc_unsecure PROPERTY SOVERSION ${CORE_VERSION_MAJOR})
-+endif()
- 
- target_include_directories(grpc_unsecure
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-@@ -3206,6 +3235,10 @@ if(WIN32 AND MSVC)
-   endif()
- endif()
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET grpc++ PROPERTY VERSION ${CPP_VERSION})
-+  set_property(TARGET grpc++ PROPERTY SOVERSION ${CPP_VERSION_MAJOR})
-+endif()
- 
- target_include_directories(grpc++
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-@@ -3589,6 +3622,11 @@ protobuf_generate_grpc_cpp(
-   src/proto/grpc/status/status.proto
- )
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET grpc++_error_details PROPERTY VERSION ${CPP_VERSION})
-+  set_property(TARGET grpc++_error_details PROPERTY SOVERSION ${CPP_VERSION_MAJOR})
-+endif()
-+
- target_include_directories(grpc++_error_details
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -3727,6 +3765,11 @@ protobuf_generate_grpc_cpp(
-   src/proto/grpc/reflection/v1alpha/reflection.proto
- )
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET grpc++_reflection PROPERTY VERSION ${CPP_VERSION})
-+  set_property(TARGET grpc++_reflection PROPERTY SOVERSION ${CPP_VERSION_MAJOR})
-+endif()
-+
- target_include_directories(grpc++_reflection
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -3816,6 +3859,10 @@ target_link_libraries(grpc++_test_config
-   ${_gRPC_GFLAGS_LIBRARIES}
- )
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION})
-+  set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR})
-+endif()
- 
- endif (gRPC_BUILD_TESTS)
- if (gRPC_BUILD_TESTS)
-@@ -4307,6 +4354,10 @@ if(WIN32 AND MSVC)
-   endif()
- endif()
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET grpc++_unsecure PROPERTY VERSION ${CPP_VERSION})
-+  set_property(TARGET grpc++_unsecure PROPERTY SOVERSION ${CPP_VERSION_MAJOR})
-+endif()
- 
- target_include_directories(grpc++_unsecure
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-@@ -4745,6 +4796,10 @@ if(WIN32 AND MSVC)
-   endif()
- endif()
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET grpc_plugin_support PROPERTY VERSION ${CORE_VERSION})
-+  set_property(TARGET grpc_plugin_support PROPERTY SOVERSION ${CORE_VERSION_MAJOR})
-+endif()
- 
- target_include_directories(grpc_plugin_support
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-@@ -4813,6 +4868,11 @@ protobuf_generate_grpc_cpp(
-   src/proto/grpc/channelz/channelz.proto
- )
- 
-+if(_gRPC_PLATFORM_LINUX)
-+	set_property(TARGET grpcpp_channelz PROPERTY VERSION ${CPP_VERSION})
-+  set_property(TARGET grpcpp_channelz PROPERTY SOVERSION ${CPP_VERSION_MAJOR})
-+endif()
-+
- target_include_directories(grpcpp_channelz
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -5367,6 +5427,10 @@ if(WIN32 AND MSVC)
-   endif()
- endif()
- 
-+if(_gRPC_PLATFORM_LINUX)
-+  set_property(TARGET grpc_csharp_ext PROPERTY VERSION ${CSHARP_VERSION})
-+  set_property(TARGET grpc_csharp_ext PROPERTY SOVERSION ${CSHARP_VERSION_MAJOR})
-+endif()
- 
- target_include_directories(grpc_csharp_ext
-   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.36.1.bb
index c25ce360e7..358ec80e87 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.36.1.bb
@@ -6,22 +6,15 @@ SECTION = "libs"
 LICENSE = "Apache-2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-DEPENDS = "gflags c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2"
+DEPENDS = "c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2 abseil-cpp re2"
 DEPENDS_append_class-target = " googletest grpc-native "
 DEPENDS_append_class-nativesdk = " grpc-native "
 
 S = "${WORKDIR}/git"
-SRCREV_grpc = "2de2e8dd8921e1f7d043e01faf7fe8a291fbb072"
-SRCREV_upb = "9effcbcb27f0a665f9f345030188c0b291e32482"
-BRANCH = "v1.24.x"
+SRCREV_grpc = "3b7f86e3516746c5f0db1947e0d65e94159bcb12"
+BRANCH = "v1.36.x"
 SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \
-           git://github.com/protocolbuffers/upb;name=upb;destsuffix=git/third_party/upb \
-           file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \
            "
-SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch \
-                               "
-SRC_URI_append_class-nativesdk = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch"
-
 # Fixes build with older compilers 4.8 especially on ubuntu 14.04
 CXXFLAGS_append_class-native = " -Wl,--no-as-needed"
 
@@ -32,7 +25,8 @@ EXTRA_OECMAKE = " \
     -DgRPC_ZLIB_PROVIDER=package \
     -DgRPC_SSL_PROVIDER=package \
     -DgRPC_PROTOBUF_PROVIDER=package \
-    -DgRPC_GFLAGS_PROVIDER=package \
+    -DgRPC_ABSL_PROVIDER=package \
+    -DgRPC_RE2_PROVIDER=package \
     -DgRPC_INSTALL=ON \
     -DCMAKE_CROSSCOMPILING=ON \
     -DBUILD_SHARED_LIBS=ON \
@@ -40,6 +34,20 @@ EXTRA_OECMAKE = " \
     -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \
     "
 
+PACKAGECONFIG ??= "cpp"
+PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF"
+PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF"
+PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF"
+PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF"
+PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF"
+PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF"
+PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF"
+PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF,protobuf-lite"
+
+do_configure_prepend() {
+    sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt
+}
+
 do_configure_prepend_mipsarch() {
     sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
 }