diff options
| author | Petteri Aimonen <jpa@github.mail.kapsi.fi> | 2020-04-27 17:33:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 07:33:27 -0700 |
| commit | e0613217357a722e9a3bbccd57a92bbcb60b1ebb (patch) | |
| tree | a33abec002a0d1182f144fb4304ea8ac4855378b /projects/nanopb | |
| parent | 06b6d9c8b334766112c3b462ea26124b2a5c04ea (diff) | |
| download | oss-fuzz-e0613217357a722e9a3bbccd57a92bbcb60b1ebb.tar.gz | |
nanopb: Fix build error, remove anaconda dependency (#3717)
This remaps /usr/bin/python as python3, because grpcio-tools support
for Python 2 has ended. Nanopb generator still uses #!/usr/bin/env python
so it would pick Python 2 by default otherwise.
Anaconda was used in a previous pull request to attempt installing a working
combination of libraries, but it is unnecessary once the version conflict was
fixed.
Diffstat (limited to 'projects/nanopb')
| -rw-r--r-- | projects/nanopb/Dockerfile | 8 | ||||
| -rwxr-xr-x | projects/nanopb/build.sh | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/projects/nanopb/Dockerfile b/projects/nanopb/Dockerfile index 3bd421074..fccb1ba1b 100644 --- a/projects/nanopb/Dockerfile +++ b/projects/nanopb/Dockerfile @@ -16,12 +16,10 @@ FROM gcr.io/oss-fuzz-base/base-builder MAINTAINER jpa@npb.mail.kapsi.fi -RUN apt-get update && apt-get install -y python3-pip git scons wget +RUN apt-get update && apt-get install -y python3-pip git wget RUN python3 -m pip install --upgrade pip +RUN pip3 install protobuf grpcio-tools scons +RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 100 RUN git clone --depth 1 https://github.com/nanopb/nanopb $SRC/nanopb - -RUN wget "https://repo.anaconda.com/archive/Anaconda3-2020.02-Linux-x86_64.sh" -RUN bash "Anaconda3-2020.02-Linux-x86_64.sh" -b - COPY build.sh $SRC/ diff --git a/projects/nanopb/build.sh b/projects/nanopb/build.sh index c73d32f66..f9fc81cd3 100755 --- a/projects/nanopb/build.sh +++ b/projects/nanopb/build.sh @@ -15,10 +15,6 @@ # ################################################################################ -export PATH=~/anaconda3/bin:$PATH -conda install protobuf -y -pip3 install grpcio-tools - cd $SRC/nanopb/tests # Build seed corpus. |