<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21582">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/docker: Update coreboot-sdk dockerfile<br><br>- Fix typo in comment<br>- Aphabetize package list and put each package on a single line<br>- Add environment variables into coreboot user's .bashrc file<br>- Add openssl, qemu, and shellcheck to installed packages<br><br>Change-Id: I37771be5d3ecaa61d76d99e689b422144a6d7dc6<br>Signed-off-by: Martin Roth <gaumless@gmail.com><br>---<br>M util/docker/coreboot-sdk/Dockerfile<br>1 file changed, 55 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/21582/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile<br>index 8345c18..512db06 100644<br>--- a/util/docker/coreboot-sdk/Dockerfile<br>+++ b/util/docker/coreboot-sdk/Dockerfile<br>@@ -1,5 +1,5 @@<br> # This dockerfile is not meant to be used directly by docker. The<br>-# {{}} varibles are replaced with values by the makefile. Please generate<br>+# {{}} variables are replaced with values by the makefile. Please generate<br> # the docker image for this file by running:<br> #<br> # make coreboot-sdk<br>@@ -18,15 +18,55 @@<br> RUN \<br> useradd -p locked -m coreboot && \<br> apt-get -qq update && \<br>- apt-get -qqy install gcc g++ gnat-6 make patch python diffutils bison \<br>- flex git doxygen ccache subversion p7zip-full unrar-free \<br>- m4 wget curl bzip2 vim-common cmake xz-utils pkg-config \<br>- dh-autoreconf unifont \<br>- libssl1.0-dev libgmp-dev zlib1g-dev libpci-dev liblzma-dev \<br>- libyaml-dev libncurses5-dev uuid-dev libusb-dev libftdi-dev \<br>- libusb-1.0-0-dev libreadline-dev libglib2.0-dev libgmp-dev \<br>- libelf-dev libxml2-dev libfreetype6-dev libisl-dev && \<br>- apt-get clean<br>+ apt-get -qqy install \<br>+ bison \<br>+ bzip2 \<br>+ ccache \<br>+ cmake \<br>+ curl \<br>+ dh-autoreconf \<br>+ diffutils \<br>+ doxygen \<br>+ flex \<br>+ g++ \<br>+ gawk \<br>+ gcc \<br>+ git \<br>+ gnat-6 \<br>+ libelf-dev \<br>+ libfreetype6-dev \<br>+ libftdi-dev \<br>+ libglib2.0-dev \<br>+ libgmp-dev \<br>+ libgmp-dev \<br>+ libisl-dev \<br>+ liblzma-dev \<br>+ libncurses5-dev \<br>+ libpci-dev \<br>+ libreadline-dev \<br>+ libssl1.0-dev \<br>+ libusb-1.0-0-dev \<br>+ libusb-dev \<br>+ libxml2-dev \<br>+ libyaml-dev \<br>+ m4 \<br>+ make \<br>+ openssl \<br>+ p7zip-full \<br>+ patch \<br>+ pkg-config \<br>+ python \<br>+ qemu \<br>+ shellcheck \<br>+ subversion \<br>+ unifont \<br>+ unrar-free \<br>+ uuid-dev \<br>+ vim-common \<br>+ wget \<br>+ xz-utils \<br>+ zlib1g-dev \<br>+ && apt-get clean<br> <br> RUN \<br> cd /root && \<br>@@ -41,7 +81,11 @@<br> RUN mkdir /home/coreboot/.ccache && \<br> chown coreboot:coreboot /home/coreboot/.ccache && \<br> mkdir /home/coreboot/cb_build && \<br>- chown coreboot:coreboot /home/coreboot/cb_build<br>+ chown coreboot:coreboot /home/coreboot/cb_build && \<br>+ echo "export PATH=$PATH:/opt/xgcc/bin" >> /home/coreboot/.bashrc && \<br>+ echo "export SDK_VERSION={{SDK_VERSION}}" >> /home/coreboot/.bashrc && \<br>+ echo "export SDK_COMMIT={{DOCKER_COMMIT}}" >> /home/coreboot/.bashrc<br>+<br> VOLUME /home/coreboot/.ccache<br> <br> ENV PATH $PATH:/opt/xgcc/bin<br></pre><p>To view, visit <a href="https://review.coreboot.org/21582">change 21582</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/21582"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I37771be5d3ecaa61d76d99e689b422144a6d7dc6 </div>
<div style="display:none"> Gerrit-Change-Number: 21582 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>