util: Remove python3-six package from dockerfiles

python six package is not used in gem5 as we don't support
python2 anymore

Change-Id: I25a682842ad00c0b5e09c9cb4ea6efac5114da6d
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/57969
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Giacomo Travaglini
2022-03-18 14:45:34 +00:00
parent 36618ad057
commit d1ba94ac41
10 changed files with 11 additions and 11 deletions

View File

@@ -63,7 +63,7 @@ The following are steps to compile gem5 in Python 3 environment,
*Step 1*: ensure Python 3 is installed. On Ubuntu like systems, you can try \ *Step 1*: ensure Python 3 is installed. On Ubuntu like systems, you can try \
this command: this command:
sudo apt-get install python3 python3-six python-is-python3 python3-pydot sudo apt-get install python3 python-is-python3 python3-pydot
To run Python 3 from a container, you can try the Docker files in \ To run Python 3 from a container, you can try the Docker files in \
util/dockerfiles folder. util/dockerfiles folder.

View File

@@ -29,7 +29,7 @@ RUN apt -y update
RUN apt -y upgrade RUN apt -y upgrade
RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \ RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \
libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \
python3-dev python3-six python-is-python3 doxygen libboost-all-dev \ python3-dev python-is-python3 doxygen libboost-all-dev \
libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config
# Requirements for ROCm # Requirements for ROCm

View File

@@ -31,7 +31,7 @@ RUN apt -y update
RUN apt -y upgrade RUN apt -y upgrade
RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \ RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \
libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \
python3-dev python3-six python-is-python3 doxygen libboost-all-dev \ python3-dev python-is-python3 doxygen libboost-all-dev \
libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config pip \ libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config pip \
python3-venv wget python3-venv wget

View File

@@ -30,7 +30,7 @@ RUN apt -y update
RUN apt -y upgrade RUN apt -y upgrade
RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \ RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \
libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \
python3-dev python3 python3-six doxygen libboost-all-dev \ python3-dev python3 doxygen libboost-all-dev \
libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config \ libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config \
python3-pip python3-venv python3-pip python3-venv

View File

@@ -40,7 +40,7 @@ RUN apt -y update
RUN apt -y upgrade RUN apt -y upgrade
RUN apt -y install git m4 scons zlib1g zlib1g-dev clang-${version} \ RUN apt -y install git m4 scons zlib1g zlib1g-dev clang-${version} \
libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \
python3-dev python3 python3-six doxygen make python3-dev python3 doxygen make
RUN apt-get --purge -y remove gcc RUN apt-get --purge -y remove gcc

View File

@@ -37,7 +37,7 @@ RUN apt -y update
RUN apt -y upgrade RUN apt -y upgrade
RUN apt -y install git m4 scons zlib1g zlib1g-dev gcc-multilib \ RUN apt -y install git m4 scons zlib1g zlib1g-dev gcc-multilib \
libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \
python3-dev python3 python3-six doxygen wget zip gcc-${version} \ python3-dev python3 doxygen wget zip gcc-${version} \
g++-${version} make g++-${version} make
RUN update-alternatives --install \ RUN update-alternatives --install \

View File

@@ -31,8 +31,8 @@ RUN apt -y update
RUN apt -y upgrade RUN apt -y upgrade
RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \ RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \
libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \
python3-dev python3-six python-is-python3 doxygen libboost-all-dev \ python3-dev python-is-python3 doxygen libboost-all-dev \
libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config pip \ libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config pip \
python3-venv python3-venv
RUN pip install mypy RUN pip install mypy

View File

@@ -40,7 +40,7 @@ RUN apt -y update
RUN apt -y upgrade RUN apt -y upgrade
RUN apt -y install git m4 scons zlib1g zlib1g-dev libprotobuf-dev \ RUN apt -y install git m4 scons zlib1g zlib1g-dev libprotobuf-dev \
protobuf-compiler libprotoc-dev libgoogle-perftools-dev python3-dev \ protobuf-compiler libprotoc-dev libgoogle-perftools-dev python3-dev \
python3-six python-is-python3 doxygen libboost-all-dev libhdf5-serial-dev \ python-is-python3 doxygen libboost-all-dev libhdf5-serial-dev \
python3-pydot libpng-dev clang-${version} make python3-pydot libpng-dev clang-${version} make
RUN apt-get --purge -y remove gcc RUN apt-get --purge -y remove gcc

View File

@@ -35,7 +35,7 @@ RUN apt -y update
RUN apt -y upgrade RUN apt -y upgrade
RUN apt -y install git m4 scons zlib1g zlib1g-dev libprotobuf-dev \ RUN apt -y install git m4 scons zlib1g zlib1g-dev libprotobuf-dev \
protobuf-compiler libprotoc-dev libgoogle-perftools-dev python3-dev \ protobuf-compiler libprotoc-dev libgoogle-perftools-dev python3-dev \
python3-six python-is-python3 doxygen libboost-all-dev libhdf5-serial-dev \ python-is-python3 doxygen libboost-all-dev libhdf5-serial-dev \
python3-pydot libpng-dev make software-properties-common python3-pydot libpng-dev make software-properties-common
RUN add-apt-repository \ RUN add-apt-repository \

View File

@@ -37,7 +37,7 @@ RUN apt -y update
RUN apt -y upgrade RUN apt -y upgrade
RUN apt -y install git m4 scons zlib1g zlib1g-dev libprotobuf-dev \ RUN apt -y install git m4 scons zlib1g zlib1g-dev libprotobuf-dev \
protobuf-compiler libprotoc-dev libgoogle-perftools-dev python3-dev \ protobuf-compiler libprotoc-dev libgoogle-perftools-dev python3-dev \
python3-six python-is-python3 doxygen libboost-all-dev libhdf5-serial-dev \ python-is-python3 doxygen libboost-all-dev libhdf5-serial-dev \
python3-pydot libpng-dev gcc-${version} g++-${version} make python3-pydot libpng-dev gcc-${version} g++-${version} make
RUN update-alternatives --install \ RUN update-alternatives --install \