From 1c5e79978290152db5abbf08e482a51a2eb6ec15 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 8 May 2020 12:01:13 +0100 Subject: [PATCH 1/9] kernel: Update kernel build to latest alpine base Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 2 +- kernel/Dockerfile.bcc | 4 ++-- kernel/Dockerfile.kconfig | 2 +- kernel/Dockerfile.perf | 2 +- kernel/Dockerfile.zfs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 272271600..af8a22c3c 100644 --- 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 \ diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc index 0ff845ca5..1b32c2189 100644 --- 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 index 8e47f82f9..22ad9fc81 100644 --- 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 index 0bfe22645..9e847c88a 100644 --- 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 \ diff --git a/kernel/Dockerfile.zfs b/kernel/Dockerfile.zfs index be818d587..216fac0c0 100644 --- 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 \ From 26f1c75950826df8219c3b0887f450e1827a39ea Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 8 May 2020 12:01:48 +0100 Subject: [PATCH 2/9] test: Update kernel tests to latest alpine base Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/102_kmod_4.14.x/Dockerfile | 2 +- test/cases/020_kernel/105_kmod_4.19.x/Dockerfile | 2 +- test/cases/020_kernel/111_kmod_5.4.x/Dockerfile | 2 +- test/cases/020_kernel/112_kmod_5.6.x/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile index 6d34efa7e..b6ae05031 100644 --- a/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.14.175 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile b/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile index e3159ca80..85ce127e2 100644 --- a/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile +++ b/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:4.19.114 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile index dd6f0ed7a..93b3516ba 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile +++ b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:5.4.30 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile b/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile index 73f17880d..5375e89ca 100644 --- a/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile +++ b/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile @@ -6,7 +6,7 @@ FROM linuxkit/kernel:5.6.2 AS ksrc # Extract headers and compile module -FROM linuxkit/alpine:bc528cf9d4065d2e09aa44ff76909b94cfe8d867 AS build +FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / From 019b4274ead72f71cacc633f169cd54838ae9d62 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 8 May 2020 12:18:06 +0100 Subject: [PATCH 3/9] kernel: Update to 5.6.11/5.4.39/4.19.121/4.14.179 Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 18 +++++++++--------- kernel/config-4.14.x-x86_64 | 2 +- kernel/config-4.19.x-x86_64 | 2 +- kernel/config-5.4.x-aarch64 | 2 +- kernel/config-5.4.x-s390x | 2 +- kernel/config-5.4.x-x86_64 | 2 +- kernel/config-5.6.x-aarch64 | 2 +- kernel/config-5.6.x-s390x | 2 +- kernel/config-5.6.x-x86_64 | 2 +- ...-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch | 4 ++-- .../0002-hyper-v-trace-vmbus_on_msg_dpc.patch | 4 ++-- .../0003-hyper-v-trace-vmbus_on_message.patch | 4 ++-- .../0004-hyper-v-trace-vmbus_onoffer.patch | 4 ++-- ...5-hyper-v-trace-vmbus_onoffer_rescind.patch | 4 ++-- ...006-hyper-v-trace-vmbus_onopen_result.patch | 4 ++-- ...7-hyper-v-trace-vmbus_ongpadl_created.patch | 4 ++-- ...-hyper-v-trace-vmbus_ongpadl_torndown.patch | 4 ++-- ...yper-v-trace-vmbus_onversion_response.patch | 4 ++-- ...10-hyper-v-trace-vmbus_request_offers.patch | 4 ++-- .../0011-hyper-v-trace-vmbus_open.patch | 4 ++-- ...12-hyper-v-trace-vmbus_close_internal.patch | 4 ++-- ...3-hyper-v-trace-vmbus_establish_gpadl.patch | 4 ++-- ...14-hyper-v-trace-vmbus_teardown_gpadl.patch | 4 ++-- ...hyper-v-trace-vmbus_negotiate_version.patch | 4 ++-- ...016-hyper-v-trace-vmbus_release_relid.patch | 4 ++-- ...v-trace-vmbus_send_tl_connect_request.patch | 4 ++-- .../0018-hyper-v-trace-channel-events.patch | 4 ++-- .../0019-serial-forbid-8250-on-s390.patch | 4 ++-- ...low-only-one-remove-lun-work-item-to-.patch | 4 ++-- ...oid-excessive-host-scan-on-controller.patch | 4 ++-- ...d-fallback-definitions-for-GELF_ST_VI.patch | 4 ++-- ...nux-swab-Fix-potentially-missing-__al.patch | 8 ++++---- ...nux-swab-Fix-potentially-missing-__al.patch | 8 ++++---- ...nux-swab-Fix-potentially-missing-__al.patch | 4 ++-- 34 files changed, 71 insertions(+), 71 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 65445e1c5..213ea53f4 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -253,21 +253,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.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.114,4.19.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,4.14.175,4.14.x,$(EXTRA),$(DEBUG))) +$(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.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 index 8a2ada79c..3ac7a695f 100644 --- 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 index d14490b46..b50f460d1 100644 --- 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 index d9f23db83..885521295 100644 --- 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 # # diff --git a/kernel/config-5.4.x-s390x b/kernel/config-5.4.x-s390x index f2e525871..e6d46f3b0 100644 --- 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 # # diff --git a/kernel/config-5.4.x-x86_64 b/kernel/config-5.4.x-x86_64 index 0955837ef..3cdfe6e82 100644 --- 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 # # diff --git a/kernel/config-5.6.x-aarch64 b/kernel/config-5.6.x-aarch64 index 7af62ecb9..fa7063f68 100644 --- a/kernel/config-5.6.x-aarch64 +++ b/kernel/config-5.6.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.6.2 Kernel Configuration +# Linux/arm64 5.6.11 Kernel Configuration # # diff --git a/kernel/config-5.6.x-s390x b/kernel/config-5.6.x-s390x index 9a18ab481..1f2f86eda 100644 --- a/kernel/config-5.6.x-s390x +++ b/kernel/config-5.6.x-s390x @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 5.6.2 Kernel Configuration +# Linux/s390 5.6.11 Kernel Configuration # # diff --git a/kernel/config-5.6.x-x86_64 b/kernel/config-5.6.x-x86_64 index 77c2c45ad..8c88db627 100644 --- a/kernel/config-5.6.x-x86_64 +++ b/kernel/config-5.6.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.6.2 Kernel Configuration +# Linux/x86 5.6.11 Kernel Configuration # # diff --git a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch index 495d2e28d..7a0e9ae14 100644 --- a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch +++ b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch @@ -1,4 +1,4 @@ -From 24796cb1c1993f1d90742d39eda9cbec7ba9f93f Mon Sep 17 00:00:00 2001 +From 333f5bbf9097beda89c22a4d55aadba6cd1cf14e Mon Sep 17 00:00:00 2001 From: Cheng-mean Liu Date: Tue, 11 Jul 2017 16:58:26 -0700 Subject: [PATCH 01/21] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB @@ -24,5 +24,5 @@ index 145f242c7c90..e360610911f3 100644 enum ars_masks { -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch b/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch index 36438387e..496e658f8 100644 --- a/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch +++ b/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch @@ -1,4 +1,4 @@ -From b438267e99a254b7429bbfba070ab6a10d7aa6aa Mon Sep 17 00:00:00 2001 +From c4d562dd53c8f0b202f04364f2586f5017d40fb1 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:00 -0700 Subject: [PATCH 02/21] hyper-v: trace vmbus_on_msg_dpc() @@ -107,5 +107,5 @@ index 1fd812ed679b..70f857441399 100644 WARN_ONCE(1, "unknown msgtype=%d\n", hdr->msgtype); goto msg_handled; -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch b/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch index dbfe256c8..6bedf85ff 100644 --- a/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch +++ b/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch @@ -1,4 +1,4 @@ -From 72a91023eeacb8a23aa133ec2eb990fa03b32bc5 Mon Sep 17 00:00:00 2001 +From b61d2eff742b292fecfb942f89c4e1aeb029e7b0 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:01 -0700 Subject: [PATCH 03/21] hyper-v: trace vmbus_on_message() @@ -45,5 +45,5 @@ index 9c2772922c76..d432aba5df8a 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch b/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch index 290c187e8..795cf8689 100644 --- a/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch +++ b/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch @@ -1,4 +1,4 @@ -From b4005dadd829aed2039d665cee1881f49a8b63a1 Mon Sep 17 00:00:00 2001 +From 0a30366ac57372d2011aa6767f08ef731a1a9168 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:02 -0700 Subject: [PATCH 04/21] hyper-v: trace vmbus_onoffer() @@ -76,5 +76,5 @@ index d432aba5df8a..488b873b563e 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch b/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch index 30927b4b4..fc43dabb6 100644 --- a/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch +++ b/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch @@ -1,4 +1,4 @@ -From 80655cdbb7c8af7ac4e81fe714a58316d0c73d39 Mon Sep 17 00:00:00 2001 +From 8e09b1485b89f84edeb6fc8955ce4c83d7a910e7 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:03 -0700 Subject: [PATCH 05/21] hyper-v: trace vmbus_onoffer_rescind() @@ -47,5 +47,5 @@ index 488b873b563e..dbbed1d1f327 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch b/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch index c9a8e3a82..f18858b82 100644 --- a/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch +++ b/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch @@ -1,4 +1,4 @@ -From 0c0455f95486b47ff302b04bfcb9d218b615d3f9 Mon Sep 17 00:00:00 2001 +From c0d6624139c592afd2f59bd89205367a17ac92f2 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:04 -0700 Subject: [PATCH 06/21] hyper-v: trace vmbus_onopen_result() @@ -56,5 +56,5 @@ index dbbed1d1f327..9757c19d1c08 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch b/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch index 76a35c11d..09cc3e6a3 100644 --- a/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch +++ b/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch @@ -1,4 +1,4 @@ -From 6e88aa6f249cc7f482feb19a00810a9a6022ab25 Mon Sep 17 00:00:00 2001 +From d2b780d10394f57e587c4d651c9654cbffa8c7d3 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:05 -0700 Subject: [PATCH 07/21] hyper-v: trace vmbus_ongpadl_created() @@ -56,5 +56,5 @@ index 9757c19d1c08..20734b7b341b 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch b/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch index efe3a43fa..41740943f 100644 --- a/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch +++ b/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch @@ -1,4 +1,4 @@ -From ec55daf877edc19269dd16f0ae0ae926bafeed89 Mon Sep 17 00:00:00 2001 +From 962937432231380e0a30e8d5f031c76adb90cb70 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:06 -0700 Subject: [PATCH 08/21] hyper-v: trace vmbus_ongpadl_torndown() @@ -47,5 +47,5 @@ index 20734b7b341b..84c08cdf7235 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch b/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch index 75b78a33c..f6adafb73 100644 --- a/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch +++ b/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch @@ -1,4 +1,4 @@ -From afa9cce6947186ec0b17b0b9172c9d8a5c2d4b14 Mon Sep 17 00:00:00 2001 +From f756c507992e113fa0ea1a9471d22c523677e160 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:07 -0700 Subject: [PATCH 09/21] hyper-v: trace vmbus_onversion_response() @@ -51,5 +51,5 @@ index 84c08cdf7235..2a046547107f 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch b/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch index 69b7ae525..8beaa48cd 100644 --- a/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch +++ b/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch @@ -1,4 +1,4 @@ -From ee0128fbee6aa73c5f832990c86a62f95d3fb5f9 Mon Sep 17 00:00:00 2001 +From aecd20aa882d80ddd3e0b74ebdffd12359d9ec72 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:08 -0700 Subject: [PATCH 10/21] hyper-v: trace vmbus_request_offers() @@ -51,5 +51,5 @@ index 2a046547107f..566ac0f2fe56 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch b/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch index 132a4ba04..1c8b9c4f3 100644 --- a/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch +++ b/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch @@ -1,4 +1,4 @@ -From 6a6c0474ea0640be0f79390c83b42ce0197e08bf Mon Sep 17 00:00:00 2001 +From 75faa50818868fa4c55b0f0c27e5fb409264026f Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:09 -0700 Subject: [PATCH 11/21] hyper-v: trace vmbus_open() @@ -66,5 +66,5 @@ index 566ac0f2fe56..38fedb803bd8 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch b/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch index e447098c4..146f8d968 100644 --- a/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch +++ b/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch @@ -1,4 +1,4 @@ -From 5df7a692eacbe0b42f593bda2b81b1d9e9d154c8 Mon Sep 17 00:00:00 2001 +From decec8b295fd5149da9b3d2cd448f1259048d325 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:10 -0700 Subject: [PATCH 12/21] hyper-v: trace vmbus_close_internal() @@ -54,5 +54,5 @@ index 38fedb803bd8..302bd4e964f0 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch b/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch index fd8303336..9e9f7dbdd 100644 --- a/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch +++ b/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch @@ -1,4 +1,4 @@ -From 733fc90ecf658625cf227ee85a242dc54ee165d8 Mon Sep 17 00:00:00 2001 +From f070979217fbb19c35319c6867fa8c2ae28cad00 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:11 -0700 Subject: [PATCH 13/21] hyper-v: trace vmbus_establish_gpadl() @@ -92,5 +92,5 @@ index 302bd4e964f0..978e70bdc7c5 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch b/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch index a19252c59..45684b455 100644 --- a/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch +++ b/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch @@ -1,4 +1,4 @@ -From 514148f54891b8e9bdcf65bc06087f2992e2e1c6 Mon Sep 17 00:00:00 2001 +From a82075db6979247b0a7e999e5a88936b518a93f0 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:12 -0700 Subject: [PATCH 14/21] hyper-v: trace vmbus_teardown_gpadl() @@ -57,5 +57,5 @@ index 978e70bdc7c5..cd33a52ef27f 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch b/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch index 74c4a9f0e..73e9ca6da 100644 --- a/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch +++ b/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch @@ -1,4 +1,4 @@ -From 7aa5e1d4543decdf2d210df981b9a12d430fed60 Mon Sep 17 00:00:00 2001 +From 447c8b1e0ab65c15ca6551018c5950012a11877d Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:13 -0700 Subject: [PATCH 15/21] hyper-v: trace vmbus_negotiate_version() @@ -66,5 +66,5 @@ index cd33a52ef27f..f06284d64a8c 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch b/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch index b7608086d..74f2b7249 100644 --- a/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch +++ b/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch @@ -1,4 +1,4 @@ -From 68fe2679ce069ae3dee035f398d56a98979203c9 Mon Sep 17 00:00:00 2001 +From 9e242661dd727b82f49740eaa8a8cdd1ee644d7a Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:14 -0700 Subject: [PATCH 16/21] hyper-v: trace vmbus_release_relid() @@ -64,5 +64,5 @@ index f06284d64a8c..f0e437c3522f 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch b/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch index 7741ddb91..c03d018bd 100644 --- a/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch +++ b/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch @@ -1,4 +1,4 @@ -From dda4828610e0a1900af6b7c22c5fb99c73b14305 Mon Sep 17 00:00:00 2001 +From bc7760edd08f073b7a83ce5abdf17b6d1cd4b2e6 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:15 -0700 Subject: [PATCH 17/21] hyper-v: trace vmbus_send_tl_connect_request() @@ -70,5 +70,5 @@ index f0e437c3522f..5382d9630306 100644 #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch b/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch index 6c54fb3c7..db96ab671 100644 --- a/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch +++ b/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch @@ -1,4 +1,4 @@ -From 5d99bb75cf678b865f7d7f4befa78a7565711830 Mon Sep 17 00:00:00 2001 +From 4b4897b070cab0d37051afa01b6044e19b207a1d Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:16 -0700 Subject: [PATCH 18/21] hyper-v: trace channel events @@ -97,5 +97,5 @@ index 70f857441399..14288a2958d0 100644 case HV_CALL_ISR: vmbus_channel_isr(channel); -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0019-serial-forbid-8250-on-s390.patch b/kernel/patches-4.14.x/0019-serial-forbid-8250-on-s390.patch index 45324f3cf..07e7c0fa4 100644 --- a/kernel/patches-4.14.x/0019-serial-forbid-8250-on-s390.patch +++ b/kernel/patches-4.14.x/0019-serial-forbid-8250-on-s390.patch @@ -1,4 +1,4 @@ -From ac3a5d331cbb4ab7551b63a72797b35a5b7e6b3f Mon Sep 17 00:00:00 2001 +From 287ff0902ddd374515a8a57119c786ece09840b2 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Tue, 12 Dec 2017 09:08:35 +0100 Subject: [PATCH 19/21] serial: forbid 8250 on s390 @@ -31,5 +31,5 @@ index a5c0ef1e7695..16b1496e6105 100644 ---help--- This selects whether you want to include the driver for the standard -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0020-scsi-storvsc-Allow-only-one-remove-lun-work-item-to-.patch b/kernel/patches-4.14.x/0020-scsi-storvsc-Allow-only-one-remove-lun-work-item-to-.patch index 164509cc1..3a5c141c0 100644 --- a/kernel/patches-4.14.x/0020-scsi-storvsc-Allow-only-one-remove-lun-work-item-to-.patch +++ b/kernel/patches-4.14.x/0020-scsi-storvsc-Allow-only-one-remove-lun-work-item-to-.patch @@ -1,4 +1,4 @@ -From 8d79ab8e5806f8b7a8f2dc8fd6857780c8fb79f5 Mon Sep 17 00:00:00 2001 +From a8536b61d61bbc7c7b08e02127b289878a324a89 Mon Sep 17 00:00:00 2001 From: Cathy Avery Date: Tue, 31 Oct 2017 08:52:06 -0400 Subject: [PATCH 20/21] scsi: storvsc: Allow only one remove lun work item to @@ -128,5 +128,5 @@ index 5adeb1e4b186..405b5da45fa1 100644 storvsc_dev_remove(dev); scsi_host_put(host); -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.14.x/0021-scsi-storvsc-Avoid-excessive-host-scan-on-controller.patch b/kernel/patches-4.14.x/0021-scsi-storvsc-Avoid-excessive-host-scan-on-controller.patch index a80cc562e..61bf3f329 100644 --- a/kernel/patches-4.14.x/0021-scsi-storvsc-Avoid-excessive-host-scan-on-controller.patch +++ b/kernel/patches-4.14.x/0021-scsi-storvsc-Avoid-excessive-host-scan-on-controller.patch @@ -1,4 +1,4 @@ -From fe24c8d1c22e600fc8eaa1ea2ae9a8c0091fc0d5 Mon Sep 17 00:00:00 2001 +From 3e8f53a68377bfcbc335226b251e9939b46d388f Mon Sep 17 00:00:00 2001 From: Long Li Date: Tue, 31 Oct 2017 14:58:08 -0700 Subject: [PATCH 21/21] scsi: storvsc: Avoid excessive host scan on controller @@ -106,5 +106,5 @@ index 405b5da45fa1..7b9173eebdd7 100644 ret = scsi_add_host(host, &device->device); if (ret != 0) -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.19.x/0001-perf-symbols-Add-fallback-definitions-for-GELF_ST_VI.patch b/kernel/patches-4.19.x/0001-perf-symbols-Add-fallback-definitions-for-GELF_ST_VI.patch index 01b54e2fa..528139aed 100644 --- a/kernel/patches-4.19.x/0001-perf-symbols-Add-fallback-definitions-for-GELF_ST_VI.patch +++ b/kernel/patches-4.19.x/0001-perf-symbols-Add-fallback-definitions-for-GELF_ST_VI.patch @@ -1,4 +1,4 @@ -From 5f86d3c6c5e6e3e3ea93cef6a76a85cffd9a6372 Mon Sep 17 00:00:00 2001 +From 1732ff11640d5fefb35083ad0d6bc016f2fd407c Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Mon, 4 Feb 2019 15:48:03 -0300 Subject: [PATCH 1/2] perf symbols: Add fallback definitions for @@ -49,5 +49,5 @@ index a701a8a48f00..dc3fbcbb0e79 100644 #ifdef HAVE_CPLUS_DEMANGLE_SUPPORT -- -2.24.0 +2.26.2 diff --git a/kernel/patches-4.19.x/0002-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/kernel/patches-4.19.x/0002-include-uapi-linux-swab-Fix-potentially-missing-__al.patch index a553d88b3..a7c1529a9 100644 --- a/kernel/patches-4.19.x/0002-include-uapi-linux-swab-Fix-potentially-missing-__al.patch +++ b/kernel/patches-4.19.x/0002-include-uapi-linux-swab-Fix-potentially-missing-__al.patch @@ -1,4 +1,4 @@ -From 8ca0e7b06f5c0a48f434e50e09ae91372e686235 Mon Sep 17 00:00:00 2001 +From d5f2496c154d54f8760aa273384f49c4adfd8704 Mon Sep 17 00:00:00 2001 From: Matt Redfearn Date: Wed, 3 Jan 2018 09:57:30 +0000 Subject: [PATCH 2/2] include/uapi/linux/swab: Fix potentially missing @@ -38,7 +38,7 @@ Signed-off-by: Matt Redfearn 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h -index 23cd84868cc3..f6a8cf737abf 100644 +index 7272f85d6d6a..3736f2fe1541 100644 --- a/include/uapi/linux/swab.h +++ b/include/uapi/linux/swab.h @@ -3,7 +3,7 @@ @@ -47,9 +47,9 @@ index 23cd84868cc3..f6a8cf737abf 100644 #include -#include +#include + #include #include - /* -- -2.24.0 +2.26.2 diff --git a/kernel/patches-5.4.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/kernel/patches-5.4.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch index 6b1d27e70..9307744a8 100644 --- a/kernel/patches-5.4.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch +++ b/kernel/patches-5.4.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch @@ -1,4 +1,4 @@ -From 194853f9b9fe9fcf424410cf5c455390caf91385 Mon Sep 17 00:00:00 2001 +From 3635a8090f2271103511b68a5853b1d7e0a925b5 Mon Sep 17 00:00:00 2001 From: Matt Redfearn Date: Wed, 3 Jan 2018 09:57:30 +0000 Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing @@ -38,7 +38,7 @@ Signed-off-by: Matt Redfearn 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h -index 23cd84868cc3..f6a8cf737abf 100644 +index 7272f85d6d6a..3736f2fe1541 100644 --- a/include/uapi/linux/swab.h +++ b/include/uapi/linux/swab.h @@ -3,7 +3,7 @@ @@ -47,9 +47,9 @@ index 23cd84868cc3..f6a8cf737abf 100644 #include -#include +#include + #include #include - /* -- -2.24.0 +2.26.2 diff --git a/kernel/patches-5.6.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/kernel/patches-5.6.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch index 8fe10ddf8..844716186 100644 --- a/kernel/patches-5.6.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch +++ b/kernel/patches-5.6.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch @@ -1,4 +1,4 @@ -From 26ed515a9a0fa1c65c4ddada44e803ab67970bae Mon Sep 17 00:00:00 2001 +From 654a742e0c19c817e31443fc95f01aabaf2ee034 Mon Sep 17 00:00:00 2001 From: Matt Redfearn Date: Wed, 3 Jan 2018 09:57:30 +0000 Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing @@ -51,5 +51,5 @@ index 7272f85d6d6a..3736f2fe1541 100644 #include -- -2.24.0 +2.26.2 From c1f4c392cc344b21a1e946a28b155a79c860e8c3 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 8 May 2020 12:47:49 +0100 Subject: [PATCH 4/9] kernel: Disable -rt kernel temporarily The patch we carry for 5.4 and 5.6 does not apply to 5.4.28. Disable the -rt kernel until the version has been bumped. Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 213ea53f4..11c4ab33a 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -256,14 +256,14 @@ ifeq ($(ARCH),x86_64) $(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,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.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,)) +#$(eval $(call kernel,5.4.28,5.4.x,-rt,)) else ifeq ($(ARCH),s390x) $(eval $(call kernel,5.6.11,5.6.x,$(EXTRA),$(DEBUG))) From 6a92e2292bcd6c0f471281640458dc7e9c15806e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 8 May 2020 12:59:14 +0100 Subject: [PATCH 5/9] kernel: Adjust config files Signed-off-by: Rolf Neugebauer --- kernel/config-5.4.x-aarch64 | 2 +- kernel/config-5.4.x-s390x | 1 - kernel/config-5.4.x-x86_64 | 1 - kernel/config-5.6.x-aarch64 | 1 - kernel/config-5.6.x-s390x | 1 - kernel/config-5.6.x-x86_64 | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/config-5.4.x-aarch64 b/kernel/config-5.4.x-aarch64 index 885521295..aff2992d7 100644 --- a/kernel/config-5.4.x-aarch64 +++ b/kernel/config-5.4.x-aarch64 @@ -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 index e6d46f3b0..f9c504203 100644 --- a/kernel/config-5.4.x-s390x +++ b/kernel/config-5.4.x-s390x @@ -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 index 3cdfe6e82..08175a070 100644 --- a/kernel/config-5.4.x-x86_64 +++ b/kernel/config-5.4.x-x86_64 @@ -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 diff --git a/kernel/config-5.6.x-aarch64 b/kernel/config-5.6.x-aarch64 index fa7063f68..49a2a3339 100644 --- a/kernel/config-5.6.x-aarch64 +++ b/kernel/config-5.6.x-aarch64 @@ -4758,7 +4758,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.6.x-s390x b/kernel/config-5.6.x-s390x index 1f2f86eda..cf1f17981 100644 --- a/kernel/config-5.6.x-s390x +++ b/kernel/config-5.6.x-s390x @@ -3494,7 +3494,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.6.x-x86_64 b/kernel/config-5.6.x-x86_64 index 8c88db627..dfa00a792 100644 --- a/kernel/config-5.6.x-x86_64 +++ b/kernel/config-5.6.x-x86_64 @@ -4408,7 +4408,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 From f3a0d1c4d89a477aad3b1791132bd0c213b85f9f Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 8 May 2020 12:04:07 +0100 Subject: [PATCH 6/9] kernel: Fix perf build - add static zlib - add python Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile.perf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/Dockerfile.perf b/kernel/Dockerfile.perf index 9e847c88a..0f5c3c0f3 100644 --- a/kernel/Dockerfile.perf +++ b/kernel/Dockerfile.perf @@ -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 && \ From 2959fc52c555f7559b3bb25ff7dc9ed60614d62b Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 8 May 2020 12:05:14 +0100 Subject: [PATCH 7/9] kernel: Re-enable perf build resolves #3498 Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 11c4ab33a..65da92e35 100644 --- 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) || \ From a9516a346c313d137a2897db09ae09cfec5554dc Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 8 May 2020 23:07:14 +0100 Subject: [PATCH 8/9] kernel: Vump wireguard to 1.0.20200506 Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index af8a22c3c..ab59c9ead 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -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 From 13dd8a7e9ea96939a2a9f1669f28d97a53b33fcf Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 9 May 2020 11:52:10 +0100 Subject: [PATCH 9/9] Update YAMLs to latest kernels Signed-off-by: Rolf Neugebauer --- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/cadvisor.yml | 2 +- examples/dm-crypt-loop.yml | 2 +- examples/dm-crypt.yml | 2 +- examples/docker-for-mac.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/hetzner.yml | 2 +- examples/hostmount-writeable-overlay.yml | 2 +- examples/influxdb-os.yml | 2 +- examples/logging.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/openstack.yml | 2 +- examples/packet.arm64.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/scaleway.yml | 2 +- examples/sshd.yml | 2 +- examples/static-ip.yml | 2 +- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd-containerd.yml | 2 +- examples/vultr.yml | 2 +- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- test/cases/000_build/000_formats/test.yml | 2 +- test/cases/000_build/010_reproducible/test.yml | 2 +- .../010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/000_qemu/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- .../010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml | 2 +- .../010_hyperkit/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- test/cases/010_platforms/110_gcp/000_run/test.yml | 2 +- test/cases/020_kernel/002_config_4.14.x/test.yml | 2 +- test/cases/020_kernel/005_config_4.19.x/test.yml | 2 +- test/cases/020_kernel/011_config_5.4.x/test.yml | 2 +- test/cases/020_kernel/012_config_5.6.x/test.yml | 2 +- test/cases/020_kernel/102_kmod_4.14.x/Dockerfile | 2 +- test/cases/020_kernel/102_kmod_4.14.x/test.sh | 2 +- test/cases/020_kernel/102_kmod_4.14.x/test.yml | 2 +- test/cases/020_kernel/105_kmod_4.19.x/Dockerfile | 2 +- test/cases/020_kernel/105_kmod_4.19.x/test.sh | 2 +- test/cases/020_kernel/105_kmod_4.19.x/test.yml | 2 +- test/cases/020_kernel/111_kmod_5.4.x/Dockerfile | 2 +- test/cases/020_kernel/111_kmod_5.4.x/test.sh | 2 +- test/cases/020_kernel/111_kmod_5.4.x/test.yml | 2 +- test/cases/020_kernel/112_kmod_5.6.x/Dockerfile | 2 +- test/cases/020_kernel/112_kmod_5.6.x/test.sh | 2 +- test/cases/020_kernel/112_kmod_5.6.x/test.yml | 2 +- test/cases/020_kernel/200_namespace/common.yml | 2 +- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/002_bpftrace/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/000_simple/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/001_luks/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/002_key/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test-create.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- .../cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../006_format_mount/005_by_device_force/test.yml | 2 +- test/cases/040_packages/006_format_mount/006_gpt/test.yml | 2 +- .../cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 2 +- test/cases/040_packages/008_metadata/000_cidata/test.yml | 2 +- test/cases/040_packages/012_losetup/test.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 2 +- test/cases/040_packages/030_logwrite/test.yml | 2 +- test/cases/040_packages/031_kmsg/test.yml | 2 +- test/cases/040_packages/032_bcc/test.yml | 4 ++-- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- test/pkg/ns/template.yml | 2 +- 103 files changed, 104 insertions(+), 104 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index f749d5d84..c05ad906c 100644 --- 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 index 5a5e37cac..bd2ca6caf 100644 --- 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 index 437a686f8..e63f6cd86 100644 --- 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 index 2f419dc02..273268869 100644 --- 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 index 97c1ad093..ee7e3c271 100644 --- 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 index 75932c1be..7da111ad1 100644 --- 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 index eb7efa965..32a8b5c87 100644 --- 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 index ef6d95ff8..1cc3b07c4 100644 --- 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 index efbe80e28..82032d492 100644 --- 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 index 07631489c..402f2ea70 100644 --- 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 index 81387aff0..839e00fc0 100644 --- 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 index 9dc1164ad..21f732f41 100644 --- 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 index 2fcdc81ca..dbc1aec1e 100644 --- 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 index 2fb57b22d..9c7fb1edb 100644 --- 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 index aa5ea27b4..c9372a8fc 100644 --- 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 index c12bd5018..06d996b4b 100644 --- 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 index 005e359b6..dad851549 100644 --- 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 index d345df711..43ffd2b6b 100644 --- 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 index 4b55b7edf..a1691d36c 100644 --- 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 index 5255be88d..a64d42b38 100644 --- 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 index b94d725ce..124e53eaa 100644 --- 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 index 22cef1448..2814b6f9d 100644 --- 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 index 386193738..c221d2848 100644 --- 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 index 4c854ef36..779c2754e 100644 --- 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 index f4098c180..23937cd0c 100644 --- 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 index 05715b151..91fd8b93d 100644 --- 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 index 341f9fb67..baec4ca9f 100644 --- 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 index 8a87cf34e..fc079887f 100644 --- 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 index dd1f200e9..9a350917c 100644 --- 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/linuxkit.yml b/linuxkit.yml index 62e1dcdb1..384c22211 100644 --- a/linuxkit.yml +++ b/linuxkit.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/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index d6e3fe5dd..2e527522d 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index b2f78c672..4102583b9 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 7111d07ad..d4ef5f9c5 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 3f4faefff..d8ad925e3 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.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/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index da6fdfd71..01877ab0c 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -1,6 +1,6 @@ # NOTE: Images build from this file likely do not run kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index 96fa1a216..0eea3afbe 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index 96fa1a216..0eea3afbe 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index df1fe67cc..d0fcf832f 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.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/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 09000ea12..7ee7664a2 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.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/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 09000ea12..7ee7664a2 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.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/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 09000ea12..7ee7664a2 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.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/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 09000ea12..7ee7664a2 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.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/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 8d22f661c..0fb17876b 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.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/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 09000ea12..7ee7664a2 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.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/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 09000ea12..7ee7664a2 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.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/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index 66cf783a0..41faad9ee 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.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/test/cases/010_platforms/110_gcp/000_run/test.yml b/test/cases/010_platforms/110_gcp/000_run/test.yml index 09000ea12..7ee7664a2 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/test/cases/010_platforms/110_gcp/000_run/test.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/test/cases/020_kernel/002_config_4.14.x/test.yml b/test/cases/020_kernel/002_config_4.14.x/test.yml index 32d626fc3..f3ac64e47 100644 --- a/test/cases/020_kernel/002_config_4.14.x/test.yml +++ b/test/cases/020_kernel/002_config_4.14.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.14.175 + image: linuxkit/kernel:4.14.179 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/020_kernel/005_config_4.19.x/test.yml b/test/cases/020_kernel/005_config_4.19.x/test.yml index c8e47b1de..333db67bd 100644 --- a/test/cases/020_kernel/005_config_4.19.x/test.yml +++ b/test/cases/020_kernel/005_config_4.19.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.19.114 + image: linuxkit/kernel:4.19.121 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/020_kernel/011_config_5.4.x/test.yml b/test/cases/020_kernel/011_config_5.4.x/test.yml index 82027c9e2..842245d1d 100644 --- a/test/cases/020_kernel/011_config_5.4.x/test.yml +++ b/test/cases/020_kernel/011_config_5.4.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/020_kernel/012_config_5.6.x/test.yml b/test/cases/020_kernel/012_config_5.6.x/test.yml index 03e0e0730..3895beeda 100644 --- a/test/cases/020_kernel/012_config_5.6.x/test.yml +++ b/test/cases/020_kernel/012_config_5.6.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.6.2 + image: linuxkit/kernel:5.6.11 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile index b6ae05031..879ff536a 100644 --- a/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/102_kmod_4.14.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:4.14.175 AS ksrc +FROM linuxkit/kernel:4.14.179 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build diff --git a/test/cases/020_kernel/102_kmod_4.14.x/test.sh b/test/cases/020_kernel/102_kmod_4.14.x/test.sh index b79378b5a..3534d23a6 100644 --- a/test/cases/020_kernel/102_kmod_4.14.x/test.sh +++ b/test/cases/020_kernel/102_kmod_4.14.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.14.175 +docker pull linuxkit/kernel:4.14.179 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/102_kmod_4.14.x/test.yml b/test/cases/020_kernel/102_kmod_4.14.x/test.yml index 32f1035ce..b4e9f48a4 100644 --- a/test/cases/020_kernel/102_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/102_kmod_4.14.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.14.175 + image: linuxkit/kernel:4.14.179 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile b/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile index 85ce127e2..0c04811dc 100644 --- a/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile +++ b/test/cases/020_kernel/105_kmod_4.19.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:4.19.114 AS ksrc +FROM linuxkit/kernel:4.19.121 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build diff --git a/test/cases/020_kernel/105_kmod_4.19.x/test.sh b/test/cases/020_kernel/105_kmod_4.19.x/test.sh index ea51c912a..5263d1ab4 100644 --- a/test/cases/020_kernel/105_kmod_4.19.x/test.sh +++ b/test/cases/020_kernel/105_kmod_4.19.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.19.114 +docker pull linuxkit/kernel:4.19.121 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/105_kmod_4.19.x/test.yml b/test/cases/020_kernel/105_kmod_4.19.x/test.yml index f60dc16f1..7387c4fb8 100644 --- a/test/cases/020_kernel/105_kmod_4.19.x/test.yml +++ b/test/cases/020_kernel/105_kmod_4.19.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.19.114 + image: linuxkit/kernel:4.19.121 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile index 93b3516ba..06a6c7cd9 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile +++ b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:5.4.30 AS ksrc +FROM linuxkit/kernel:5.4.39 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.sh b/test/cases/020_kernel/111_kmod_5.4.x/test.sh index 0babc8144..5d5242545 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.sh +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:5.4.30 +docker pull linuxkit/kernel:5.4.39 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.yml b/test/cases/020_kernel/111_kmod_5.4.x/test.yml index b93b4c556..99307676e 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.yml +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile b/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile index 5375e89ca..4aff64e83 100644 --- a/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile +++ b/test/cases/020_kernel/112_kmod_5.6.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:5.6.2 AS ksrc +FROM linuxkit/kernel:5.6.11 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build diff --git a/test/cases/020_kernel/112_kmod_5.6.x/test.sh b/test/cases/020_kernel/112_kmod_5.6.x/test.sh index c9788a75b..fa89887b0 100644 --- a/test/cases/020_kernel/112_kmod_5.6.x/test.sh +++ b/test/cases/020_kernel/112_kmod_5.6.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:5.6.2 +docker pull linuxkit/kernel:5.6.11 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/112_kmod_5.6.x/test.yml b/test/cases/020_kernel/112_kmod_5.6.x/test.yml index 6857777bf..ac5e7d19f 100644 --- a/test/cases/020_kernel/112_kmod_5.6.x/test.yml +++ b/test/cases/020_kernel/112_kmod_5.6.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.6.2 + image: linuxkit/kernel:5.6.11 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index 56d79c928..57e986c8f 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 74f37bff5..1c32358fa 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.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/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 6d095427a..1514f75b7 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 4450388bb..7bf239c9c 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index df90507d3..d61b878dd 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index d153e3e85..02a116e44 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 3635dee7c..1ec3b6422 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 44aef8f9c..ab0c3050d 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index da67a139f..8cf44ac64 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index c935811e6..972621421 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index ee349b2d9..da2f577e6 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 1b6556d44..e73056437 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index 306152b81..87a16d06e 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 4d608b8fc..04dddf23c 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 1095ebf03..febde7157 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index bdd6eeaa6..7d84022d7 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 8573fb898..ea62da728 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/005_extend/003_gpt/test-create.yml b/test/cases/040_packages/005_extend/003_gpt/test-create.yml index 9244d855b..7ecadb075 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test-create.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/005_extend/003_gpt/test.yml b/test/cases/040_packages/005_extend/003_gpt/test.yml index 306152b81..87a16d06e 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index 9f0d0bfc6..6e7196693 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index f110532e3..ac8a92fe4 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 85dbe877c..e39694cd1 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index fdc96787b..7b106da9b 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index ad3a18e02..faac0d21d 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index ae3f17cd6..ea9856875 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/006_format_mount/006_gpt/test.yml b/test/cases/040_packages/006_format_mount/006_gpt/test.yml index 5562bda3e..1cf0a3302 100644 --- a/test/cases/040_packages/006_format_mount/006_gpt/test.yml +++ b/test/cases/040_packages/006_format_mount/006_gpt/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index fab7d1f41..8472feb92 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index dfa869ffd..81dbad892 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/008_metadata/000_cidata/test.yml b/test/cases/040_packages/008_metadata/000_cidata/test.yml index 8849f1acf..adb003596 100644 --- a/test/cases/040_packages/008_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/008_metadata/000_cidata/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index 59b198e5f..5c4e6587b 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index d0d62fc43..ae468a7e2 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index f87d5d960..5988df0e0 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 0882d5786..b328a452f 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 28f38f550..4ac4f828b 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index 6e80d228d..893b37109 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 4ce720602..0eb9d4df7 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index 8fe888252..21bdf4416 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -1,10 +1,10 @@ kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878 - - linuxkit/kernel-bcc:5.4.30 + - linuxkit/kernel-bcc:5.4.39 onboot: - name: check-bcc image: alpine:3.11 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index cbb1c3b54..a5a7a9aac 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.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/test/hack/test.yml b/test/hack/test.yml index 475a336d4..8914ead59 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -1,7 +1,7 @@ # FIXME: This should use the minimal example # We continue to use the kernel-config-test as CI is currently expecting to see a success message kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 4b2ae5177..08e4d9790 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -1,6 +1,6 @@ # Sample YAML file for manual testing kernel: - image: linuxkit/kernel:5.4.30 + image: linuxkit/kernel:5.4.39 cmdline: "console=ttyS0" init: - linuxkit/init:e93b0bf37b030238d33e04b98e90d087637f3d2c