Skip to content

Conversation

@amstewart
Copy link

The python3-grpcio package is a dependency of the ni-grpc-device ptests. Its recipe was added to OE/upstream starting in the dunfell branch. This patchset cherry-picks all commits which touch that recipe family, such that python3-grpcio is now build-able.

This patchset involved dropping some unrelated parts from the following commits.

  • Remove bogus COMMON_LICENSE_DIR usage in LIC_FILES_CHKSUM
  • meta-python: remove python2 recipes from layer

Testing

  • Built the recipe locally and verified that it works in the context of the grpc-device ptests.

@ni/rtos

rehsack and others added 13 commits May 6, 2021 15:30
Align recipe for python protobuf code generator for gRPC with
grpc itself and python-grpcio.

Signed-off-by: Jens Rehsack <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
Update python-grpcio and add related python3-grpcio recipe
for recent features and bug-fixes.

Signed-off-by: Jens Rehsack <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
Patch to fix ppc build

Signed-off-by: Khem Raj <[email protected]>
Cc: Tim "moto-timo" Orling <[email protected]>
Cc: Derek Straka <[email protected]>
Refresh patch to apply cleanly
Fix build for RISC-V

Signed-off-by: Khem Raj <[email protected]>
Using COMMON_LICENSE_DIR in LIC_FILES_CHKSUM of downloaded
code is never the right thing to do, there must be some
license information and that has to be checked instead.

In several cases the claimed LICENSE was also incorrect.

Signed-off-by: Adrian Bunk <[email protected]>
Signed-off-by: Khem Raj <[email protected]>

Dropped parts of the commit which did not touch the python*-grpcio*
recipes. When rebasing upon OE upstream, upstream's version of this
commit should always be preferred.

Rebased-by: Alex Stewart <[email protected]>
Remove recipes which require python2 from the layer. Those recipes are
moved to meta-python2 and are not required here any longer.

Signed-off-by: Andrey Zhizhikin <[email protected]>
Signed-off-by: Khem Raj <[email protected]>

Dropped parts of the commit which did not touch the python*-grpcio*
recipes. When rebasing upon OE upstream, upstream's version of this
commit should always be preferred.

Rebased-by: Alex Stewart <[email protected]>
Merge inc file into bb, there are no other users of it
Delete gettid patch, fixed differenty upstream
Add code to use cross compiler in setup.py

Define GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY so it does not use
SYS_clock_gettime syscalls since it does not work when 64bit time_t is
used on 32bit arches

Signed-off-by: Khem Raj <[email protected]>
When building python3-grpcio-native, we will meet do_compile error
because of no 'cc'.

In fact, 'cc' is not in our hosttools. So fix to use gcc and make
the patch also apply to native.

Signed-off-by: Chen Qi <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
1. Keep '-std=c++11' and '-std=gnu99' to fix native build error
with old gcc (such as gcc 5.4.0 on ubuntu 16.04); for clang, remove
them through setting GRPC_PYTHON_CFLAGS at do_compile in bb recipe

2. While export CC="gcc ", cc_args is empty, it will
cause subprocess.Popen always return 1. On centos 8, if you don't
install package libatomic, there will be a native build error
`cannot find /usr/lib64/libatomic.so.1.2.0'.

Add no harm '-g' to cc_args if cc_args is empty.

Signed-off-by: Hongxu Jia <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
While enabling ccache, build python3-grpcio-native failed:
...
|error: can't copy 'tmp-glibc/work/x86_64-linux/python3-grpcio-native/
1.27.1-r0/build/lib.linux-x86_64-3.8/grpc/_cython/
cygrpc.cpython-38-x86_64-linux-gnu.so': doesn't exist or not a regular file
|ERROR: 'python3 setup.py build ' execution failed.
...

So disable ccache to workaround the failure.

Signed-off-by: Hongxu Jia <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
Ensure libseil-cpp can build for rv32 and boringssl riscv patch
considers rv32 separate from rv64

Signed-off-by: Khem Raj <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
Acked-by: Trevor Gamblin <[email protected]>
(cherry picked from commit 6b3e3bd)
Signed-off-by: Armin Kuster <[email protected]>
(cherry picked from commit c3a9e5b)
Signed-off-by: Armin Kuster <[email protected]>
@amstewart amstewart requested a review from billpittman May 6, 2021 21:04
@billpittman
Copy link

Knowledge share video of this set of commits being cherry-picked from Dunfell->sumo

https://nio365-my.sharepoint.com/:v:/g/personal/james_minor_ni_com/ERc5Ce_1eTdNsutPUhOsxpEBQcmVw6Zuw5JSZgTNvTpULw\

@amstewart amstewart merged commit e8041f5 into ni:nilrt/master/sumo May 7, 2021
@amstewart amstewart deleted the dev/sumo/grpc branch May 7, 2021 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants