diff options
| author | Martin Roth <martinroth@google.com> | 2016-05-16 11:27:56 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-08-18 06:15:26 +0200 |
| commit | 2d97cb1be50acdf7e7604dd666d52cb9765de018 (patch) | |
| tree | 9a99274743b686d4519012492d88f7fa0fa06f8b /util/docker/coreboot-sdk | |
| parent | f75d1dfad3691562110a70523ad892b8fa480064 (diff) | |
util/docker: Update docker files for coreboot-sdk & jenkins builders
- Check out the specific toolchain version we want before building
the toolchain (This version uses 1.42).
- Add additional libraries and tools needed to build coreboot related
packages.
- Move everything required to build any of the coreboot or related
packages into the coreboot-sdk from coreboot-jenkins-node Dockerfile.
- Separate the text of the commands in the Dockerfiles.
- Use nproc to get the number of processors for building the toolchain
- Add some additional comments about why things are done the way that
they are to the README
- Update the version of coreboot-sdk that coreboot-jenkins-node uses to
1.42. (This matches the toolchain version)
- Move ccache setup from jenkins-node to coreboot-sdk.
- Update the maintainer.
Change-Id: I293285ef72e3e70259355d924d425fea98ee773d
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/16239
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'util/docker/coreboot-sdk')
| -rw-r--r-- | util/docker/coreboot-sdk/Dockerfile | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile index 18c165db78..cb0023c063 100644 --- a/util/docker/coreboot-sdk/Dockerfile +++ b/util/docker/coreboot-sdk/Dockerfile @@ -1,15 +1,34 @@ FROM debian:sid -MAINTAINER Patrick Georgi <patrick@georgi-clan.de> +MAINTAINER Martin Roth <gaumless@gmail.com> + RUN \ useradd -p locked -m coreboot && \ apt-get -qq update && \ - apt-get -qqy install git gcc g++ make patch python diffutils bison flex m4 wget bzip2 libssl-dev libgmp-dev vim-common cmake xz-utils zlib1g-dev && \ - apt-get clean && \ + apt-get -qq upgrade && \ + apt-get -qqy install gcc g++ make patch python diffutils bison flex \ + git doxygen ccache subversion p7zip-full unrar-free \ + m4 wget curl bzip2 vim-common cmake xz-utils pkg-config \ + dh-autoreconf unifont \ + libssl-dev libgmp-dev zlib1g-dev libpci-dev liblzma-dev \ + libyaml-dev libncurses5-dev uuid-dev libusb-dev libftdi-dev \ + libusb-1.0-0-dev libreadline-dev libglib2.0-dev libgmp-dev \ + libelf-dev libxml2-dev libfreetype6-dev && \ + apt-get clean + +RUN \ cd /root && \ git clone http://review.coreboot.org/coreboot && \ cd coreboot/util/crossgcc && \ - make all_without_gdb CPUS=$(grep -c "^processor\>" /proc/cpuinfo) DEST=/opt/xgcc && \ + git checkout 589ef9de8fa && \ + make all_without_gdb CPUS=$(nproc) DEST=/opt/xgcc && \ cd /root && \ rm -rf coreboot + +RUN mkdir /home/coreboot/.ccache && \ + chown coreboot:coreboot /home/coreboot/.ccache && \ + mkdir /home/coreboot/cb_build && \ + chown coreboot:coreboot /home/coreboot/cb_build +VOLUME /home/coreboot/.ccache + ENV PATH $PATH:/opt/xgcc/bin USER coreboot |