summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinr@coreboot.org>2018-09-09 11:14:53 -0600
committerMartin Roth <martinroth@google.com>2019-04-04 14:56:24 +0000
commitb0fe89d31bf2b27c77d46c59b10db333328b260e (patch)
tree26c8d9663db882d5065e34de71df4fef149f46f5
parentb866610156f88fdb0cbe96887d6ee84567aa521c (diff)
downloadcoreboot-b0fe89d31bf2b27c77d46c59b10db333328b260e.tar.xz
util/docker: work around toolchain autotools issue
The patches added to `make` require that we use automake & aclocal to rebuild the configuration, but version 1.15 of autotools is expected. After debian sid updated to autotools 1.16, the tools can't be located. We'll just pretend to have version 1.15 with symbolic links. This doesn't seem to be a good solution but gets the job done. Change-Id: I9f616b96e728106e7adf321325caa06808e064c2 Signed-off-by: Martin Roth <martinr@coreboot.org> Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/28544 Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--util/docker/coreboot-sdk/Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile
index 739e0d1149..3f396274ea 100644
--- a/util/docker/coreboot-sdk/Dockerfile
+++ b/util/docker/coreboot-sdk/Dockerfile
@@ -69,7 +69,9 @@ RUN \
wget \
xz-utils \
zlib1g-dev \
- && apt-get clean
+ && apt-get clean \
+ && ln -s /usr/bin/automake /usr/bin/automake-1.15 \
+ && ln -s /usr/bin/aclocal /usr/bin/aclocal-1.15
RUN \
cd /root && \