From 071f98e5028fda119f43335a7d5ede4ece6d0b64 Mon Sep 17 00:00:00 2001 From: Dongge Liu Date: Thu, 20 Oct 2022 16:04:44 +1100 Subject: [PATCH 1/2] Update python version --- docs/developing-fuzzbench/adding_a_new_benchmark.md | 2 +- docs/getting-started/prerequisites.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/developing-fuzzbench/adding_a_new_benchmark.md b/docs/developing-fuzzbench/adding_a_new_benchmark.md index bf10478a3..78a89825c 100755 --- a/docs/developing-fuzzbench/adding_a_new_benchmark.md +++ b/docs/developing-fuzzbench/adding_a_new_benchmark.md @@ -258,7 +258,7 @@ Building benchmarks and fuzzers entails the following process: image. This is the first image in this build process that is defined by the main FuzzBench code (e.g. not fuzzers, benchmarks, or OSS-Fuzz). Its first function is to copy the FuzzBench code and install packages needed to run - FuzzBench like Python3.7 For benchmarks that define a `commit` in their + FuzzBench like Python3.10. For benchmarks that define a `commit` in their `benchmark.yaml` (i.e. OSS-Fuzz benchmarks) the build process for this image checks out the source code of that project at the specified commit. Then the process defines the environment variables `CC`, `CXX`, `CXXFLAGS`, `CFLAGS` diff --git a/docs/getting-started/prerequisites.md b/docs/getting-started/prerequisites.md index 19e1d94c1..afb990c1d 100644 --- a/docs/getting-started/prerequisites.md +++ b/docs/getting-started/prerequisites.md @@ -57,18 +57,18 @@ sudo apt-get install build-essential ### Python programming language -[Download Python 3.8](https://www.python.org/downloads/release/python-386/), +[Download Python 3.10](https://www.python.org/downloads/release/python-3104/), then install it. If you already have Python installed, you can verify its version by running -`python3 --version`. The minimum required version is 3.8. +`python3 --version`. The minimum required version is 3.10.4. ### Python package dependencies Install the python dependencies by running the following command: ```bash -sudo apt-get install python3.8-dev python3.8-venv +sudo apt-get install python3.10-dev python3.10-venv make install-dependencies ``` From 8c07672a04e17b9620066c9ca70338533505b3e2 Mon Sep 17 00:00:00 2001 From: Dongge Liu Date: Thu, 20 Oct 2022 16:05:00 +1100 Subject: [PATCH 2/2] Update ubuntu version --- docs/getting-started/adding_a_new_fuzzer.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/getting-started/adding_a_new_fuzzer.md b/docs/getting-started/adding_a_new_fuzzer.md index ba8b8c218..74aed671a 100644 --- a/docs/getting-started/adding_a_new_fuzzer.md +++ b/docs/getting-started/adding_a_new_fuzzer.md @@ -41,7 +41,7 @@ with your fuzzer. For most projects, this will look like: ```dockerfile ARG parent_image -FROM $parent_image # Base builder image (Ubuntu 16.04, with latest Clang). +FROM $parent_image # Base builder image (Ubuntu 20.04, with latest Clang). RUN apt-get update && \ # Install any system dependencies to build your fuzzer. apt-get install -y pkg1 pkg2 @@ -65,7 +65,7 @@ This file defines the image that will be used to run benchmarks with your fuzzer. Making this lightweight allows trial instances to be spun up fast. ```dockerfile -FROM gcr.io/fuzzbench/base-image # Base image (Ubuntu 16.04). +FROM gcr.io/fuzzbench/base-image # Base image (Ubuntu 20.04). RUN apt-get update && \ # Install any runtime dependencies for your fuzzer. apt-get install pkg1 pkg2