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

util: Updated Dockfiles with the libelf-dev dep

Browse Source 
This is required if we eventually remove `ext/libelf` (
https://gem5.atlassian.net/browse/GEM5-752), otherwise our tests will
fail.

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

Change-Id: I1bd069dfb968b56eac4c4da33929b5ff895eaa6f
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33596
Reviewed-by: Gabe Black <gabeblack@google.com>
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-08-27 13:56:10 -07:00
parent 35997b28e3
commit 0cf67fb362
7 changed files with 9 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,7 +34,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libboost-filesystem-dev \
libboost-system-dev \
libboost-dev \
libpng12-dev
libpng12-dev \
libelf-dev
ARG gem5_dist=http://dist.gem5.org/dist/develop

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

@@ -31,4 +31,4 @@ 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
python-pydot libpng-dev libelf-dev

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

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

@@ -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}
python-dev python python-six doxygen wget zip gcc-${version} \
g++-${version} libelf-dev
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
python-six libelf-dev

2
util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile
View File

@@ -32,4 +32,4 @@ 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 \
python3-dev python3-six python-is-python3 doxygen libboost-all-dev \
libhdf5-serial-dev python3-pydot libpng-dev
libhdf5-serial-dev python3-pydot libpng-dev libelf-dev

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}
python3-pydot libpng-dev gcc-${version} g++-${version} libelf-dev
RUN update-alternatives --install \
/usr/bin/g++ g++ /usr/bin/g++-${version} 100