derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: Removed libelf-dev dep from Dockerfiles

Browse Source 
The libelf-dev dependency is no longer required in our Dockerfiles.

This reverts commit 0cf67fb362,
https://gem5-review.googlesource.com/c/public/gem5/+/33596.

The libelf-dev dependency has been kept for the "all_dependencies"
Dockerfiles.

The corresponding Docker images have been built and uploaded to:
https://gcr.io/gem5-test.

Change-Id: Iacbd8240f69d476ad3a649baaccb6b85fec2487c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34676
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Bobby R. Bruce
2020-09-16 09:45:13 -07:00
parent 914d6af8a8
commit 5a20525e75
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
util/dockerfiles/gcn-gpu/Dockerfile
View File

@@ -34,8 +34,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libboost-filesystem-dev \
libboost-system-dev \
libboost-dev \
libpng12-dev \
libelf-dev
libpng12-dev
RUN python -m pip install -U pip && \
python -m pip install -U setuptools scons

2
util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
View File

@@ -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 libelf-dev
python-dev python python-six doxygen
RUN apt-get --purge -y remove gcc

3
util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
View File

@@ -37,8 +37,7 @@ 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} libelf-dev
python-dev python python-six doxygen wget zip gcc-${version} g++-${version}
RUN update-alternatives --install \
/usr/bin/g++ g++ /usr/bin/g++-${version} 100

2
util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
View File

@@ -29,4 +29,4 @@ 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 libelf-dev
python-six

2
util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
View File

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