From b0fe89d31bf2b27c77d46c59b10db333328b260e Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 9 Sep 2018 11:14:53 -0600 Subject: [PATCH] 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 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/coreboot/+/28544 Reviewed-by: Paul Menzel Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- util/docker/coreboot-sdk/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 && \