Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/28544 )
Change subject: util/docker: work around toolchain autotools issue ......................................................................
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 --- M util/docker/coreboot-sdk/Dockerfile 1 file changed, 3 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Nico Huber: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve
diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile index 739e0d1..3f39627 100644 --- a/util/docker/coreboot-sdk/Dockerfile +++ b/util/docker/coreboot-sdk/Dockerfile @@ -69,7 +69,9 @@ 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 && \