From: Bobby R. Bruce Date: Mon, 26 Oct 2020 16:14:48 +0000 (-0700) Subject: util: Updated the Dockerfiles for Python3 X-Git-Tag: develop-gem5-snapshot~505 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45a38b53529f5aae335e1faeb7011b71effdd8cd;p=gem5.git util: Updated the Dockerfiles for Python3 For the next release of gem5, we are dropping support for Python2. The Ubuntu 18.04 Docker images were running with Python2. This has been updated. It should be noted that there is, at present, no eligant solution to the issue that older versions of Scons (such as that obtainable via APT in Ubuntu 18.04) use Python2. Those wishing to compile with these Docker Images should use `/usr/bin/env python3 $(which scons) build/X86/gem5.op5` Change-Id: Ic36ecc7196688daff21af2bb3a76381966f38f60 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36595 Maintainer: Gabe Black Tested-by: kokoro Reviewed-by: Jason Lowe-Power --- diff --git a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile index 1259f2e53..2403a5002 100644 --- a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile +++ b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile @@ -30,5 +30,5 @@ RUN apt -y update RUN apt -y upgrade RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ - python-dev python python-six doxygen libboost-all-dev libhdf5-serial-dev \ - python-pydot libpng-dev libelf-dev pkg-config + python3-dev python3 python3-six doxygen libboost-all-dev \ + libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config diff --git a/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile b/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile index 428bd0291..97f3dbc3e 100644 --- a/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile +++ b/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile @@ -40,7 +40,7 @@ RUN apt -y update RUN apt -y upgrade RUN apt -y install git m4 scons zlib1g zlib1g-dev clang-${version} \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ - python-dev python python-six doxygen + python3-dev python3 python3-six doxygen RUN apt-get --purge -y remove gcc diff --git a/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile b/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile index 902e4a014..9f3da370c 100644 --- a/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile +++ b/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile @@ -37,7 +37,8 @@ RUN apt -y update RUN apt -y upgrade RUN apt -y install git m4 scons zlib1g zlib1g-dev gcc-multilib \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ - python-dev python python-six doxygen wget zip gcc-${version} g++-${version} + python3-dev python3 python3-six doxygen wget zip gcc-${version} \ + g++-${version} RUN update-alternatives --install \ /usr/bin/g++ g++ /usr/bin/g++-${version} 100 diff --git a/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile b/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile index 986b2b62b..5ec6784e3 100644 --- a/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile +++ b/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile @@ -28,5 +28,5 @@ FROM ubuntu:18.04 RUN apt -y update RUN apt -y upgrade -RUN apt -y install build-essential scons zlib1g-dev m4 python-dev python \ - python-six +RUN apt -y install build-essential scons zlib1g-dev m4 python3-dev python3 \ + python3-six