From 2c1fdc7b471632412d86ae58826c27fdd63008c1 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 20 Nov 2017 16:53:38 +0000 Subject: [PATCH] kernel: Use latest linuxkit/alpine and install mpc1-dev/mpfr-dev The GCC_PLUGINS config options enabled in the next commits require mpc1-dev/mpfr-dev Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 4 +++- kernel/Dockerfile.kconfig | 2 +- kernel/Dockerfile.zfs | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 988eaf450..7d3edf0b2 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS kernel-build +FROM linuxkit/alpine:585174df463ba33e6c0e2050a29a0d9e942d56cb AS kernel-build RUN apk add \ argp-standalone \ automake \ @@ -18,6 +18,8 @@ RUN apk add \ libelf-dev \ libressl-dev \ linux-headers \ + mpc1-dev \ + mpfr-dev \ ncurses-dev \ sed \ squashfs-tools \ diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig index 182bbe092..2abd5d84f 100644 --- a/kernel/Dockerfile.kconfig +++ b/kernel/Dockerfile.kconfig @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS kernel-build +FROM linuxkit/alpine:585174df463ba33e6c0e2050a29a0d9e942d56cb AS kernel-build RUN apk add \ argp-standalone \ build-base \ diff --git a/kernel/Dockerfile.zfs b/kernel/Dockerfile.zfs index 1f392ec30..cce8896cc 100644 --- a/kernel/Dockerfile.zfs +++ b/kernel/Dockerfile.zfs @@ -1,6 +1,6 @@ ARG IMAGE FROM ${IMAGE} AS ksrc -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build +FROM linuxkit/alpine:585174df463ba33e6c0e2050a29a0d9e942d56cb AS build RUN apk add \ attr-dev \ autoconf \ @@ -10,6 +10,8 @@ RUN apk add \ git \ libtirpc-dev \ libtool \ + mpc1-dev \ + mpfr-dev \ util-linux-dev \ zlib-dev