Kyle Roarty has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/34075 )
Change subject: util: Install scons 3.1 from pip in gcn-gpu dockerfile
......................................................................
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 <mattdsincl...@gmail.com>
Reviewed-by: Daniel Gerzhoy <daniel.gerz...@gmail.com>
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Reviewed-by: Matthew Poremba <matthew.pore...@amd.com>
Maintainer: Matt Sinclair <mattdsincl...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M util/dockerfiles/gcn-gpu/Dockerfile
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Matthew Poremba: Looks good to me, approved
Matt Sinclair: Looks good to me, but someone else must approve; Looks
good to me, approved
Daniel Gerzhoy: Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/dockerfiles/gcn-gpu/Dockerfile
b/util/dockerfiles/gcn-gpu/Dockerfile
index 4c17b42..065dad6 100644
--- a/util/dockerfiles/gcn-gpu/Dockerfile
+++ b/util/dockerfiles/gcn-gpu/Dockerfile
@@ -13,7 +13,6 @@
git \
ca-certificates \
m4 \
- scons \
zlib1g \
zlib1g-dev \
libprotobuf-dev \
@@ -24,6 +23,7 @@
python \
python-yaml \
python-six \
+ python-pip \
wget \
libpci3 \
libelf1 \
@@ -37,6 +37,9 @@
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
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/34075
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: I4f731b301f97e25c730df26afde20ae1cdfaa1b3
Gerrit-Change-Number: 34075
Gerrit-PatchSet: 2
Gerrit-Owner: Kyle Roarty <kyleroarty1...@gmail.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Gerzhoy <daniel.gerz...@gmail.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Kyle Roarty <kyleroarty1...@gmail.com>
Gerrit-Reviewer: Matt Sinclair <mattdsincl...@gmail.com>
Gerrit-Reviewer: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
