From 0cf67fb36281b17956d4dc10f05054bf711b4ba3 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 27 Aug 2020 13:56:10 -0700 Subject: [PATCH] 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 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- util/dockerfiles/gcn-gpu/Dockerfile | 3 ++- util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile | 2 +- util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile | 2 +- util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile | 3 ++- util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile | 2 +- util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile | 2 +- util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/util/dockerfiles/gcn-gpu/Dockerfile b/util/dockerfiles/gcn-gpu/Dockerfile index 2e1f5915d..4c17b4208 100644 --- a/util/dockerfiles/gcn-gpu/Dockerfile +++ b/util/dockerfiles/gcn-gpu/Dockerfile @@ -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 diff --git a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile index 95511a8a8..282805dfa 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 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 diff --git a/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile b/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile index 428bd0291..b98af8818 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 + 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 902e4a014..5eb40b1b3 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} + 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 986b2b62b..f55ea2d08 100644 --- a/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile +++ b/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile @@ -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 diff --git a/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile b/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile index 814ef75d6..283d3568a 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 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 diff --git a/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile b/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile index d2008b603..d9521831a 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 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 -- 2.30.2