Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/33596 )
Change subject: util: Updated Dockfiles with the libelf-dev dep
......................................................................
util: Updated Dockfiles with the libelf-dev dep
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 <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
---
M util/dockerfiles/gcn-gpu/Dockerfile
M util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
M util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
M util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
M util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
M util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile
M util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
7 files changed, 9 insertions(+), 7 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Gabe Black: Looks good to me, but someone else must approve
kokoro: Regressions pass
diff --git a/util/dockerfiles/gcn-gpu/Dockerfile
b/util/dockerfiles/gcn-gpu/Dockerfile
index 2e1f591..4c17b42 100644
--- a/util/dockerfiles/gcn-gpu/Dockerfile
+++ b/util/dockerfiles/gcn-gpu/Dockerfile
@@ -34,7 +34,8 @@
libboost-filesystem-dev \
libboost-system-dev \
libboost-dev \
- libpng12-dev
+ libpng12-dev \
+ libelf-dev
ARG gem5_dist=http://dist.gem5.org/dist/develop
diff --git a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
index 95511a8..282805d 100644
--- a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
+++ b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
@@ -31,4 +31,4 @@
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
diff --git a/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
b/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
index 428bd02..b98af88 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 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
diff --git a/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
b/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
index 902e4a0..5eb40b1 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 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
diff --git a/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
b/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
index 986b2b6..f55ea2d 100644
--- a/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
+++ b/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
@@ -29,4 +29,4 @@
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
diff --git a/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile
b/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile
index 814ef75..283d356 100644
--- a/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile
+++ b/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile
@@ -32,4 +32,4 @@
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
diff --git a/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
b/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
index d2008b6..d952183 100644
--- a/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
+++ b/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
@@ -38,7 +38,7 @@
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
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33596
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I1bd069dfb968b56eac4c4da33929b5ff895eaa6f
Gerrit-Change-Number: 33596
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Kyle Roarty <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-CC: Matt Sinclair <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
