From cb7699ee5a8d27fe54ee32f04e9dfe5025c3b68e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 2 Nov 2017 16:09:27 +0000 Subject: [PATCH] kernel: Temporarily patch wireguard Version 0.0.20171101 errors out when compiled for debug kernels. This will be fixed in the next release. In the meantime pull in the patch which fixes the compile error. Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 68d274898..8fa129aef 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -40,6 +40,8 @@ ENV KERNEL_PGP2_SIGN=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL ENV WIREGUARD_VERSION=0.0.20171101 ENV WIREGUARD_SHA256=096b6482a65e566c7bf8c059f5ee6aadb2de565b04b6d810c685f1c377540325 ENV WIREGUARD_URL=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${WIREGUARD_VERSION}.tar.xz +# XXX REMOVE FOR NEXT RELEASE +ENV WIREGUARD_PATCH=https://git.zx2c4.com/WireGuard/patch/?id=cc310a5dd1899417971e993d61d1230b14fe4f87 # We copy the entire directory. This copies some unneeded files, but # allows us to check for the existence /patches-${KERNEL_SERIES} to @@ -109,6 +111,8 @@ RUN make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="-fno-pie" && \ RUN curl -sSL -o /wireguard.tar.xz "${WIREGUARD_URL}" && \ echo "${WIREGUARD_SHA256} /wireguard.tar.xz" | sha256sum -c - && \ tar -C / --one-top-level=wireguard --strip-components=2 -xJf /wireguard.tar.xz "WireGuard-${WIREGUARD_VERSION}/src" && \ + curl -sSL -o /wireguard.patch "${WIREGUARD_PATCH}" && \ + (cd /wireguard && patch -p 2 < /wireguard.patch) && \ make -j "$(getconf _NPROCESSORS_ONLN)" M="/wireguard" modules # Modules and Device Tree binaries