From d1c6c96b0a13ec5d5214bae008f4a5946007de72 Mon Sep 17 00:00:00 2001 From: Kyle Roarty Date: Thu, 3 Sep 2020 13:30:05 -0500 Subject: [PATCH] util: Install scons 3.1 from pip in gcn-gpu dockerfile A previous commit updated the minimum required version of scons to 3.0 The gcn Dockerfile previously installed scons from apt, which installed scons 2.4, as the Dockerfile is based on Ubuntu 16 This patch installs scons through pip, which installs scons 3.1 Change-Id: I4f731b301f97e25c730df26afde20ae1cdfaa1b3 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34075 Reviewed-by: Matt Sinclair Reviewed-by: Daniel Gerzhoy Reviewed-by: Jason Lowe-Power Reviewed-by: Matthew Poremba Maintainer: Matt Sinclair Maintainer: Jason Lowe-Power Tested-by: kokoro --- util/dockerfiles/gcn-gpu/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util/dockerfiles/gcn-gpu/Dockerfile b/util/dockerfiles/gcn-gpu/Dockerfile index 4c17b4208..065dad63d 100644 --- a/util/dockerfiles/gcn-gpu/Dockerfile +++ b/util/dockerfiles/gcn-gpu/Dockerfile @@ -13,7 +13,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ git \ ca-certificates \ m4 \ - scons \ zlib1g \ zlib1g-dev \ libprotobuf-dev \ @@ -24,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ python \ python-yaml \ python-six \ + python-pip \ wget \ libpci3 \ libelf1 \ @@ -37,6 +37,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libpng12-dev \ libelf-dev +RUN python -m pip install -U pip && \ + python -m pip install -U setuptools scons + ARG gem5_dist=http://dist.gem5.org/dist/develop # Install ROCm 1.6 binaries -- 2.30.2