diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2016-06-27 16:30:41 +0100 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2016-06-27 16:30:41 +0100 |
| commit | 4f4d0a8487306aaebb2c761f948868a0391d51a4 (patch) | |
| tree | 7ad2be997d0f7539091db65c7b02444654490a64 /trusty-i386-tcwg | |
| parent | 0fbd868a30025fdf3d1c494daa34ceefe6015ad3 (diff) | |
trusty-*-tcwg: Remove hard-coded make 3.81 install
Change-Id: I193fe26c24f5e09772f0ab7ea4db7a888d035db7
Diffstat (limited to 'trusty-i386-tcwg')
| -rw-r--r-- | trusty-i386-tcwg/Dockerfile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/trusty-i386-tcwg/Dockerfile b/trusty-i386-tcwg/Dockerfile index 65f7f55..d988e4e 100644 --- a/trusty-i386-tcwg/Dockerfile +++ b/trusty-i386-tcwg/Dockerfile @@ -40,6 +40,7 @@ RUN apt-key add /etc/apt/sources.list.d/*.key \ libpython2.7-dev \ libreadline-dev \ libtool \ + make \ mingw-w64 \ mingw32 \ net-tools \ @@ -58,17 +59,12 @@ RUN apt-key add /etc/apt/sources.list.d/*.key \ wine \ xz-utils \ zlib1g-dev \ - && wget -q \ - http://de.archive.ubuntu.com/ubuntu/pool/main/m/make-dfsg/make_3.81-8.2ubuntu3_i386.deb \ - && dpkg -i --force-all *.deb \ - && apt-mark hold make \ && apt-get clean \ && rm -rf \ /etc/apt/sources.list.d/*.key \ /var/lib/apt/lists/* \ /tmp/* \ - /var/tmp/* \ - *.deb + /var/tmp/* RUN groupadd -g 9000 tcwg-infra \ && useradd -m -g tcwg-infra -u 11827 tcwg-buildslave \ |