diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-networking/recipes-devtools/grpc | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-devtools/grpc')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch | 33 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | 61 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch | 42 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.14.1.bb (renamed from meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb) | 26 |
4 files changed, 67 insertions, 95 deletions
diff --git a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch index 5774e62eb..54e0b99a4 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch +++ b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch @@ -1,34 +1,36 @@ -From cc6dbabea0e452ebc93682df860a79ed9a45722e Mon Sep 17 00:00:00 2001 +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-compilation + 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(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9cd630..9663934 100644 +index a59fd81..cd90424 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -328,6 +328,13 @@ function(protobuf_generate_grpc_cpp) +@@ -160,6 +160,13 @@ function(protobuf_generate_grpc_cpp) return() endif() - -+ #if cross-compiling, find host plugin + ++ #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 ${PROTOBUF_WELLKNOWN_IMPORT_DIR}) + set(_protobuf_include_path -I . -I ${_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR}) foreach(FIL ${ARGN}) get_filename_component(ABS_FIL ${FIL} ABSOLUTE) -@@ -345,7 +352,7 @@ function(protobuf_generate_grpc_cpp) +@@ -177,7 +184,7 @@ function(protobuf_generate_grpc_cpp) COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE} ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} --cpp_out=${_gRPC_PROTO_GENS_DIR} @@ -38,24 +40,24 @@ index f9cd630..9663934 100644 ${REL_FIL} DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template -index 64daf04..a7e8629 100644 +index de13d02..b22bd5c 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template -@@ -373,6 +373,13 @@ +@@ -209,6 +209,13 @@ return() endif() - -+ #if cross-compiling, find host plugin + ++ #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>${PROTOBUF_WELLKNOWN_IMPORT_DIR}</%text>) + 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) -@@ -390,7 +397,7 @@ +@@ -226,7 +233,7 @@ COMMAND <%text>${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}</%text> ARGS --grpc_out=<%text>generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}</%text> --cpp_out=<%text>${_gRPC_PROTO_GENS_DIR}</%text> @@ -64,5 +66,6 @@ index 64daf04..a7e8629 100644 <%text>${_protobuf_include_path}</%text> <%text>${REL_FIL}</%text> DEPENDS <%text>${ABS_FIL}</%text> <%text>${_gRPC_PROTOBUF_PROTOC}</%text> grpc_cpp_plugin --- +-- 2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch index f8d965294..459dc45a4 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch +++ b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch @@ -1,7 +1,7 @@ -From 8e9bf962a45a82f1c2eb5858e29fa89a3a60b564 Mon Sep 17 00:00:00 2001 +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 1/4] CMakeLists.txt: Fix libraries installation for Linux +Subject: [PATCH] CMakeLists.txt: Fix libraries installation for Linux * Set libs versions as in Makefile @@ -9,21 +9,19 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> %% original patch: 0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch --- - CMakeLists.txt | 55 +++++++++++++++++++++++++++++++++++ - CMakeLists.txt => CMakeLists.txt.orig | 0 - 2 files changed, 55 insertions(+) - copy CMakeLists.txt => CMakeLists.txt.orig (100%) + CMakeLists.txt | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1a49df..13e64ac 100644 +index a59fd818e3..5066f44a32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,15 @@ set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") project(${PACKAGE_NAME} C CXX) -+set (CORE_VERSION_MAJOR "4") -+set (CORE_VERSION "4.0.0") ++set (CORE_VERSION_MAJOR "6") ++set (CORE_VERSION "6.0.0") + +set (CPP_VERSION_MAJOR "1") +set (CPP_VERSION "${PACKAGE_VERSION}") @@ -31,10 +29,21 @@ index b1a49df..13e64ac 100644 +set (CSHARP_VERSION_MAJOR "1") +set (CSHARP_VERSION "${PACKAGE_VERSION}") + - set(gRPC_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") - set(gRPC_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") - set(gRPC_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") -@@ -841,6 +850,10 @@ if(WIN32 AND MSVC) + 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") +@@ -702,6 +711,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> +@@ -825,6 +838,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -45,7 +54,7 @@ index b1a49df..13e64ac 100644 target_include_directories(gpr PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -1221,6 +1234,10 @@ if(WIN32 AND MSVC) +@@ -1259,6 +1276,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -56,7 +65,7 @@ index b1a49df..13e64ac 100644 target_include_directories(grpc PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -1535,6 +1552,10 @@ if(WIN32 AND MSVC) +@@ -1633,6 +1654,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -67,7 +76,7 @@ index b1a49df..13e64ac 100644 target_include_directories(grpc_cronet PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -2377,6 +2398,10 @@ if(WIN32 AND MSVC) +@@ -2575,6 +2600,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -78,7 +87,7 @@ index b1a49df..13e64ac 100644 target_include_directories(grpc_unsecure PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -2592,6 +2617,10 @@ if(WIN32 AND MSVC) +@@ -2791,6 +2820,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -89,7 +98,7 @@ index b1a49df..13e64ac 100644 target_include_directories(grpc++ PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -3078,6 +3107,10 @@ if(WIN32 AND MSVC) +@@ -3357,6 +3390,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -100,7 +109,7 @@ index b1a49df..13e64ac 100644 target_include_directories(grpc++_cronet PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -3282,6 +3315,11 @@ protobuf_generate_grpc_cpp( +@@ -3630,6 +3667,11 @@ protobuf_generate_grpc_cpp( src/proto/grpc/status/status.proto ) @@ -112,7 +121,7 @@ index b1a49df..13e64ac 100644 target_include_directories(grpc++_error_details PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -3408,6 +3446,11 @@ protobuf_generate_grpc_cpp( +@@ -3762,6 +3804,11 @@ protobuf_generate_grpc_cpp( src/proto/grpc/reflection/v1alpha/reflection.proto ) @@ -124,7 +133,7 @@ index b1a49df..13e64ac 100644 target_include_directories(grpc++_reflection PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -3827,6 +3870,10 @@ if(WIN32 AND MSVC) +@@ -4265,6 +4312,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -135,7 +144,7 @@ index b1a49df..13e64ac 100644 target_include_directories(grpc++_unsecure PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -4140,6 +4187,10 @@ if(WIN32 AND MSVC) +@@ -4649,6 +4700,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -146,7 +155,7 @@ index b1a49df..13e64ac 100644 target_include_directories(grpc_plugin_support PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -@@ -4649,6 +4700,10 @@ if(WIN32 AND MSVC) +@@ -5184,6 +5239,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -157,10 +166,6 @@ index b1a49df..13e64ac 100644 target_include_directories(grpc_csharp_ext PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -diff --git a/CMakeLists.txt b/CMakeLists.txt.orig -similarity index 100% -copy from CMakeLists.txt -copy to CMakeLists.txt.orig -- -2.16.1 +2.17.1 diff --git a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch deleted file mode 100644 index 8985022fa..000000000 --- a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a498b56ba96948015f0f2784b2ab8296946716ee Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 1 Feb 2018 23:28:17 -0800 -Subject: [PATCH 4/4] CMakeLists.txt: Find c-ares in target sysroot alone - -Current code lets it look into native sysroot as well -which is then preferred during cross compile and it adds -absolute path to libcares into linker flags -on heterogenous architectures linker complains and build -fails - -| /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/grpc/1.8.5-r0/recipe-sysroot-native/usr/lib/lib -cares.so.2.2.0: file not recognized: File format not recognized -| collect2: error: ld returned 1 exit status - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1d7eef1..058423d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -153,10 +153,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "module") - set(gRPC_INSTALL FALSE) - endif() - elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package") -- find_package(c-ares REQUIRED CONFIG) -- if(TARGET c-ares::cares) -- set(_gRPC_CARES_LIBRARIES c-ares::cares) -- endif() -+ find_package(c-ares REQUIRED) -+ set(_gRPC_CARES_LIBRARIES cares) - set(_gRPC_FIND_CARES "if(NOT c-ares_FOUND)\n find_package(c-ares CONFIG)\nendif()") - endif() - --- -2.16.1 - diff --git a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.14.1.bb index 0883ec176..d23671432 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.8.5.bb +++ b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc_1.14.1.bb @@ -4,20 +4,23 @@ Provides gRPC libraries for multiple languages written on top of shared C core l HOMEPAGE = "https://github.com/grpc/grpc" 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" DEPENDS_append_class-target = " gtest grpc-native " +DEPENDS_append_class-nativesdk = " grpc-native " -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "https://github.com/grpc/grpc/archive/v${PV}.tar.gz \ +S = "${WORKDIR}/git" +SRCREV = "d8020cb6daa87f1a3bb3b0c299bc081c4a3de1e8" +BRANCH = "v1.14.x" +SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH} \ file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ - file://0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch \ " -SRC_URI[md5sum] = "b565fa6787e42f4969395870c2ad436e" -SRC_URI[sha256sum] = "df9168da760fd2ee970c74c9d1b63377e0024be248deaa844e784d0df47599de" - 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" inherit cmake @@ -27,10 +30,13 @@ EXTRA_OECMAKE = " \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_PROTOBUF_PROVIDER=package \ -DgRPC_GFLAGS_PROVIDER=package \ - -DgRPC_INSTALL=1 \ + -DgRPC_INSTALL=ON \ + -DCMAKE_CROSSCOMPILING=ON \ -DBUILD_SHARED_LIBS=ON \ " -FILES_${PN}-dev += "${libdir}/cmake" +BBCLASSEXTEND = "native nativesdk" + +SYSROOT_DIRS_BLACKLIST_append_class-target = "${libdir}/cmake/grpc" -BBCLASSEXTEND = "native" +FILES_${PN}-dev += "${bindir}" |