Merge pull request linuxkit#3520 from rn/kern-up

Update kernels, re-enable -perf, disable -rt kernels, bump wireguard
stevefan1999-personal · May 9, 2020 · 5843427 · 5843427
2 parents 3ae7fb4 + 13dd8a7
commit 5843427
Show file tree

Hide file tree

Showing 142 changed files with 194 additions and 198 deletions.
diff --git a/examples/aws.yml b/examples/aws.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/azure.yml b/examples/azure.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml
@@ -1,6 +1,6 @@
 # This is an example for building the open source components of Docker for Mac
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=ttyS0 page_poison=1"
 init:
   - linuxkit/vpnkit-expose-port:3fd88b7025065843792484b1ad83ddd5c4b28684 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host

diff --git a/examples/docker.yml b/examples/docker.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/gcp.yml b/examples/gcp.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/getty.yml b/examples/getty.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/hetzner.yml b/examples/hetzner.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: console=ttyS1
   ucode: intel-ucode.cpio
 init:

diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/logging.yml b/examples/logging.yml
@@ -1,6 +1,6 @@
 # Simple example of using an external logging service
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/minimal.yml b/examples/minimal.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/openstack.yml b/examples/openstack.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/packet.arm64.yml b/examples/packet.arm64.yml
@@ -5,7 +5,7 @@
 # for arm64 then the 'ucode' line in the kernel section can be left
 # out.
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=ttyAMA0"
   ucode: ""
 onboot:

diff --git a/examples/packet.yml b/examples/packet.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: console=ttyS1
   ucode: intel-ucode.cpio
 init:

diff --git a/examples/redis-os.yml b/examples/redis-os.yml
@@ -1,7 +1,7 @@
 # Minimal YAML to run a redis server (used at DockerCon'17)
 # connect: nc localhost 6379
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/scaleway.yml b/examples/scaleway.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/sshd.yml b/examples/sshd.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/static-ip.yml b/examples/static-ip.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/swap.yml b/examples/swap.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/tpm.yml b/examples/tpm.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/vmware.yml b/examples/vmware.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/vultr.yml b/examples/vultr.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/examples/wireguard.yml b/examples/wireguard.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.30
+  image: linuxkit/kernel:5.4.39
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c

diff --git a/kernel/Dockerfile b/kernel/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS kernel-build
+FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS kernel-build
 RUN apk add \
     argp-standalone \
     automake \
@@ -38,8 +38,8 @@ ARG KERNEL_SERIES
 ARG EXTRA
 ARG DEBUG
 
-ENV WIREGUARD_VERSION=1.0.20200401
-ENV WIREGUARD_SHA256="7dfb4a8315e1d6ae406ff32d01c496175df558dd65968a19e5222d02c7cfb77a"
+ENV WIREGUARD_VERSION=1.0.20200506
+ENV WIREGUARD_SHA256="98a99f2b825a82d57a7213e666f1ee4f7cc02bddb09bf4908b4b09447a8f121e"
 ENV WIREGUARD_URL=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${WIREGUARD_VERSION}.tar.xz
 
 # We copy the entire directory. This copies some unneeded files, but

diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc
@@ -1,7 +1,7 @@
 ARG IMAGE
 FROM ${IMAGE} as ksrc
 
-FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build
+FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
 RUN apk update && apk upgrade -a && \
   apk add --no-cache \
   argp-standalone \
@@ -102,7 +102,7 @@ RUN mkdir -p /out/usr/bin && \
 RUN mkdir -p /out/usr/local/share/ && \
     cp -a /usr/local/share/lua /out/usr/local/share/
 
-FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 as mirror
+FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 as mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk update && apk upgrade -a && \
   apk add --no-cache --initdb -p /out \

diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS kernel-build
+FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS kernel-build
 RUN apk add \
     argp-standalone \
     bison \

diff --git a/kernel/Dockerfile.perf b/kernel/Dockerfile.perf
@@ -3,7 +3,7 @@
 ARG IMAGE
 FROM ${IMAGE} AS ksrc
 
-FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build
+FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
 RUN apk add \
     argp-standalone \
     bash \
@@ -20,11 +20,13 @@ RUN apk add \
     findutils \
     mpc1-dev \
     mpfr-dev \
+    python3 \
     sed \
     tar \
     xz \
     xz-dev \
-    zlib-dev
+    zlib-dev \
+    zlib-static
 
 COPY --from=ksrc /linux.tar.xz /kernel-headers.tar /
 RUN tar xf linux.tar.xz && \

diff --git a/kernel/Dockerfile.zfs b/kernel/Dockerfile.zfs
@@ -1,6 +1,6 @@
 ARG IMAGE
 FROM ${IMAGE} AS ksrc
-FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build
+FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
 RUN apk add \
     attr-dev \
     autoconf \

diff --git a/kernel/Makefile b/kernel/Makefile
@@ -150,8 +150,7 @@ show-tags: show-tag_$(2)$(3)$(4)
 # with DOCKER_CONTENT_TRUST explicitly set to 0
 
 # Only build perf on x86 and latest LTS and stable kernels
-# Temporarily disable perf build: https://github.com/linuxkit/linuxkit/issues/3498
-ifeq ($(ARCH),disabled)
+ifeq ($(ARCH),x86_64)
 ifeq ($(2), $(filter $(2),5.6.x 5.4.x))
 build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4)
 	docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
@@ -253,21 +252,21 @@ endef
 # Debug targets only for latest stable and LTS stable
 #
 ifeq ($(ARCH),x86_64)
-$(eval $(call kernel,5.6.2,5.6.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.4.30,5.4.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.4.30,5.4.x,,-dbg))
-$(eval $(call kernel,5.4.28,5.4.x,-rt,))
-$(eval $(call kernel,4.19.114,4.19.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,4.14.175,4.14.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.6.11,5.6.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.4.39,5.4.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.4.39,5.4.x,,-dbg))
+#$(eval $(call kernel,5.4.28,5.4.x,-rt,))
+$(eval $(call kernel,4.19.121,4.19.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.14.179,4.14.x,$(EXTRA),$(DEBUG)))
 
 else ifeq ($(ARCH),aarch64)
-$(eval $(call kernel,5.6.2,5.6.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.4.30,5.4.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.4.28,5.4.x,-rt,))
+$(eval $(call kernel,5.6.11,5.6.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.4.39,5.4.x,$(EXTRA),$(DEBUG)))
+#$(eval $(call kernel,5.4.28,5.4.x,-rt,))
 
 else ifeq ($(ARCH),s390x)
-$(eval $(call kernel,5.6.2,5.6.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.4.30,5.4.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.6.11,5.6.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.4.39,5.4.x,$(EXTRA),$(DEBUG)))
 endif
 
 # Target for kernel config

diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.175 Kernel Configuration
+# Linux/x86 4.14.179 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y

diff --git a/kernel/config-4.19.x-x86_64 b/kernel/config-4.19.x-x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.114 Kernel Configuration
+# Linux/x86 4.19.121 Kernel Configuration
 #
 
 #

diff --git a/kernel/config-5.4.x-aarch64 b/kernel/config-5.4.x-aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.30 Kernel Configuration
+# Linux/arm64 5.4.39 Kernel Configuration
 #
 
 #
@@ -314,6 +314,7 @@ CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_1463225=y
+CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
@@ -4703,7 +4704,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_SPLIT=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024

diff --git a/kernel/config-5.4.x-s390x b/kernel/config-5.4.x-s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.4.30 Kernel Configuration
+# Linux/s390 5.4.39 Kernel Configuration
 #
 
 #
@@ -3482,7 +3482,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_SPLIT=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024

diff --git a/kernel/config-5.4.x-x86_64 b/kernel/config-5.4.x-x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.30 Kernel Configuration
+# Linux/x86 5.4.39 Kernel Configuration
 #
 
 #
@@ -4390,7 +4390,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_SPLIT=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024