github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3355 from rn/wg-0.0.20190406

Browse Source 
Update to WireGuard  0.0.20190406
This commit is contained in:
Rolf Neugebauer 2019-05-25 09:23:15 -07:00 committed by GitHub
commit d3b28c951e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/Dockerfile
View File

@ -36,8 +36,8 @@ ARG KERNEL_SERIES
ARG EXTRA ARG EXTRA
ARG DEBUG ARG DEBUG
ENV WIREGUARD_VERSION=0.0.20190227 ENV WIREGUARD_VERSION=0.0.20190406
ENV WIREGUARD_SHA256="fcdb26fd2692d9e1dee54d14418603c38fbb973a06ce89d08fbe45292ff37f79" ENV WIREGUARD_SHA256="2f06f3adf70b95e74a7736a22dcf6e9ef623b311a15b7d55b5474e57c3d0415b"
ENV WIREGUARD_URL=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${WIREGUARD_VERSION}.tar.xz ENV WIREGUARD_URL=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${WIREGUARD_VERSION}.tar.xz
# We copy the entire directory. This copies some unneeded files, but # We copy the entire directory. This copies some unneeded files, but
@ -131,14 +131,11 @@ RUN make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="-fno-pie" && \
([ -n "${DEBUG}" ] && cp vmlinux /out || true) ([ -n "${DEBUG}" ] && cp vmlinux /out || true)
# WireGuard # WireGuard
RUN set -e && \ RUN curl -fsSL -o /wireguard.tar.xz "${WIREGUARD_URL}" && \
if [ "$KERNEL_SERIES" != "5.1.x" ]; then \ echo "${WIREGUARD_SHA256} /wireguard.tar.xz" | sha256sum -c - && \
curl -fsSL -o /wireguard.tar.xz "${WIREGUARD_URL}" && \ cp /wireguard.tar.xz /out/src/ && \
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" && \
cp /wireguard.tar.xz /out/src/ && \ make -j "$(getconf _NPROCESSORS_ONLN)" M="/wireguard" modules
tar -C / --one-top-level=wireguard --strip-components=2 -xJf /wireguard.tar.xz "WireGuard-${WIREGUARD_VERSION}/src" && \
make -j "$(getconf _NPROCESSORS_ONLN)" M="/wireguard" modules; \
fi
# Modules and Device Tree binaries # Modules and Device Tree binaries
RUN make INSTALL_MOD_PATH=/tmp/kernel-modules modules_install && \ RUN make INSTALL_MOD_PATH=/tmp/kernel-modules modules_install && \