From 6a52516be9b707362014efcaf57e1f414ec0cd8b Mon Sep 17 00:00:00 2001 From: leigh capili Date: Mon, 29 Mar 2021 12:34:24 -0600 Subject: [PATCH] Bump kernel versions Co-authored-by: Juan Calderon-Perez <835733+gaby@users.noreply.github.com> --- .github/workflows/release-kernel-images.yml | 2 +- images/kernel/Makefile | 2 +- .../generated/{config-amd64-4.14.223 => config-amd64-4.14.227} | 2 +- .../generated/{config-amd64-4.19.178 => config-amd64-4.19.183} | 2 +- .../generated/{config-amd64-5.10.21 => config-amd64-5.10.25} | 2 +- .../generated/{config-amd64-5.4.102 => config-amd64-5.4.108} | 3 ++- .../generated/{config-arm64-4.14.223 => config-arm64-4.14.227} | 2 +- .../generated/{config-arm64-4.19.178 => config-arm64-4.19.183} | 2 +- .../generated/{config-arm64-5.10.21 => config-arm64-5.10.25} | 2 +- .../generated/{config-arm64-5.4.102 => config-arm64-5.4.108} | 2 +- .../versioned/{config-amd64-4.14.223 => config-amd64-4.14.227} | 2 +- .../versioned/{config-amd64-4.19.178 => config-amd64-4.19.183} | 2 +- .../versioned/{config-amd64-5.10.21 => config-amd64-5.10.25} | 2 +- .../versioned/{config-amd64-5.4.102 => config-amd64-5.4.108} | 3 ++- .../versioned/{config-arm64-4.14.223 => config-arm64-4.14.227} | 2 +- .../versioned/{config-arm64-4.19.178 => config-arm64-4.19.183} | 2 +- .../versioned/{config-arm64-5.10.21 => config-arm64-5.10.25} | 2 +- .../versioned/{config-arm64-5.4.102 => config-arm64-5.4.108} | 2 +- 18 files changed, 20 insertions(+), 18 deletions(-) rename images/kernel/generated/{config-amd64-4.14.223 => config-amd64-4.14.227} (99%) rename images/kernel/generated/{config-amd64-4.19.178 => config-amd64-4.19.183} (99%) rename images/kernel/generated/{config-amd64-5.10.21 => config-amd64-5.10.25} (99%) rename images/kernel/generated/{config-amd64-5.4.102 => config-amd64-5.4.108} (99%) rename images/kernel/generated/{config-arm64-4.14.223 => config-arm64-4.14.227} (99%) rename images/kernel/generated/{config-arm64-4.19.178 => config-arm64-4.19.183} (99%) rename images/kernel/generated/{config-arm64-5.10.21 => config-arm64-5.10.25} (99%) rename images/kernel/generated/{config-arm64-5.4.102 => config-arm64-5.4.108} (99%) rename images/kernel/versioned/{config-amd64-4.14.223 => config-amd64-4.14.227} (99%) rename images/kernel/versioned/{config-amd64-4.19.178 => config-amd64-4.19.183} (99%) rename images/kernel/versioned/{config-amd64-5.10.21 => config-amd64-5.10.25} (99%) rename images/kernel/versioned/{config-amd64-5.4.102 => config-amd64-5.4.108} (99%) rename images/kernel/versioned/{config-arm64-4.14.223 => config-arm64-4.14.227} (99%) rename images/kernel/versioned/{config-arm64-4.19.178 => config-arm64-4.19.183} (99%) rename images/kernel/versioned/{config-arm64-5.10.21 => config-arm64-5.10.25} (99%) rename images/kernel/versioned/{config-arm64-5.4.102 => config-arm64-5.4.108} (99%) diff --git a/.github/workflows/release-kernel-images.yml b/.github/workflows/release-kernel-images.yml index 85b95817e..c0caf6e2d 100644 --- a/.github/workflows/release-kernel-images.yml +++ b/.github/workflows/release-kernel-images.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - version: [ 4.14.223, 4.19.178, 5.4.102, 5.10.21 ] + version: [ 4.14.227, 4.19.183, 5.4.108, 5.10.25 ] env: KERNEL_VERSIONS: ${{ matrix.version }} steps: diff --git a/images/kernel/Makefile b/images/kernel/Makefile index 7e632c244..ba2e3135a 100644 --- a/images/kernel/Makefile +++ b/images/kernel/Makefile @@ -29,7 +29,7 @@ REGISTRY?=weaveworks IMAGE_NAME?=${REGISTRY}/ignite-kernel KERNEL_BUILDER_NAME=${REGISTRY}/ignite-kernel-builder # Check https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/refs/ for updates -KERNEL_VERSIONS ?= 4.14.223 4.19.178 5.4.102, 5.10.21 # If you update this, please keep the .github/workflows/release-kernel-images.yml matrix up to date +KERNEL_VERSIONS ?= 4.14.227 4.19.183 5.4.108 5.10.25 # If you update this, please keep the .github/workflows/release-kernel-images.yml matrix up to date GOARCH?=amd64 GOARCH_LIST = amd64 arm64 diff --git a/images/kernel/generated/config-amd64-4.14.223 b/images/kernel/generated/config-amd64-4.14.227 similarity index 99% rename from images/kernel/generated/config-amd64-4.14.223 rename to images/kernel/generated/config-amd64-4.14.227 index 83cf0a4e3..fb7c5a7a8 100644 --- a/images/kernel/generated/config-amd64-4.14.223 +++ b/images/kernel/generated/config-amd64-4.14.227 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.223 Kernel Configuration +# Linux/x86 4.14.227 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/images/kernel/generated/config-amd64-4.19.178 b/images/kernel/generated/config-amd64-4.19.183 similarity index 99% rename from images/kernel/generated/config-amd64-4.19.178 rename to images/kernel/generated/config-amd64-4.19.183 index 8527ad255..72d98373f 100644 --- a/images/kernel/generated/config-amd64-4.19.178 +++ b/images/kernel/generated/config-amd64-4.19.183 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.178 Kernel Configuration +# Linux/x86 4.19.183 Kernel Configuration # # diff --git a/images/kernel/generated/config-amd64-5.10.21 b/images/kernel/generated/config-amd64-5.10.25 similarity index 99% rename from images/kernel/generated/config-amd64-5.10.21 rename to images/kernel/generated/config-amd64-5.10.25 index 758a9690d..2f01bd888 100644 --- a/images/kernel/generated/config-amd64-5.10.21 +++ b/images/kernel/generated/config-amd64-5.10.25 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.21 Kernel Configuration +# Linux/x86 5.10.25 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0" CONFIG_CC_IS_GCC=y diff --git a/images/kernel/generated/config-amd64-5.4.102 b/images/kernel/generated/config-amd64-5.4.108 similarity index 99% rename from images/kernel/generated/config-amd64-5.4.102 rename to images/kernel/generated/config-amd64-5.4.108 index 6d6e3d9a7..cb61b8cf7 100644 --- a/images/kernel/generated/config-amd64-5.4.102 +++ b/images/kernel/generated/config-amd64-5.4.108 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.102 Kernel Configuration +# Linux/x86 5.4.108 Kernel Configuration # # @@ -2548,6 +2548,7 @@ CONFIG_UIO=m CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_DMEM_GENIRQ=m # CONFIG_UIO_PRUSS is not set +# CONFIG_VFIO is not set CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO=y CONFIG_VIRTIO_MENU=y diff --git a/images/kernel/generated/config-arm64-4.14.223 b/images/kernel/generated/config-arm64-4.14.227 similarity index 99% rename from images/kernel/generated/config-arm64-4.14.223 rename to images/kernel/generated/config-arm64-4.14.227 index a967daca0..acfd3a323 100644 --- a/images/kernel/generated/config-arm64-4.14.223 +++ b/images/kernel/generated/config-arm64-4.14.227 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.223 Kernel Configuration +# Linux/arm64 4.14.227 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/images/kernel/generated/config-arm64-4.19.178 b/images/kernel/generated/config-arm64-4.19.183 similarity index 99% rename from images/kernel/generated/config-arm64-4.19.178 rename to images/kernel/generated/config-arm64-4.19.183 index 107aa37bf..86dd64027 100644 --- a/images/kernel/generated/config-arm64-4.19.178 +++ b/images/kernel/generated/config-arm64-4.19.183 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.178 Kernel Configuration +# Linux/arm64 4.19.183 Kernel Configuration # # diff --git a/images/kernel/generated/config-arm64-5.10.21 b/images/kernel/generated/config-arm64-5.10.25 similarity index 99% rename from images/kernel/generated/config-arm64-5.10.21 rename to images/kernel/generated/config-arm64-5.10.25 index 952870c82..61d780042 100644 --- a/images/kernel/generated/config-arm64-5.10.21 +++ b/images/kernel/generated/config-arm64-5.10.25 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.21 Kernel Configuration +# Linux/arm64 5.10.25 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0" CONFIG_CC_IS_GCC=y diff --git a/images/kernel/generated/config-arm64-5.4.102 b/images/kernel/generated/config-arm64-5.4.108 similarity index 99% rename from images/kernel/generated/config-arm64-5.4.102 rename to images/kernel/generated/config-arm64-5.4.108 index a53ac48fa..cff2d58d0 100644 --- a/images/kernel/generated/config-arm64-5.4.102 +++ b/images/kernel/generated/config-arm64-5.4.108 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.4.102 Kernel Configuration +# Linux/arm64 5.4.108 Kernel Configuration # # diff --git a/images/kernel/versioned/config-amd64-4.14.223 b/images/kernel/versioned/config-amd64-4.14.227 similarity index 99% rename from images/kernel/versioned/config-amd64-4.14.223 rename to images/kernel/versioned/config-amd64-4.14.227 index e72003d28..73697e6f3 100644 --- a/images/kernel/versioned/config-amd64-4.14.223 +++ b/images/kernel/versioned/config-amd64-4.14.227 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.223 Kernel Configuration +# Linux/x86 4.14.227 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/images/kernel/versioned/config-amd64-4.19.178 b/images/kernel/versioned/config-amd64-4.19.183 similarity index 99% rename from images/kernel/versioned/config-amd64-4.19.178 rename to images/kernel/versioned/config-amd64-4.19.183 index 363429314..c782227dd 100644 --- a/images/kernel/versioned/config-amd64-4.19.178 +++ b/images/kernel/versioned/config-amd64-4.19.183 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.178 Kernel Configuration +# Linux/x86 4.19.183 Kernel Configuration # # diff --git a/images/kernel/versioned/config-amd64-5.10.21 b/images/kernel/versioned/config-amd64-5.10.25 similarity index 99% rename from images/kernel/versioned/config-amd64-5.10.21 rename to images/kernel/versioned/config-amd64-5.10.25 index 2aa5b62ee..19013c070 100644 --- a/images/kernel/versioned/config-amd64-5.10.21 +++ b/images/kernel/versioned/config-amd64-5.10.25 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.21 Kernel Configuration +# Linux/x86 5.10.25 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0" CONFIG_CC_IS_GCC=y diff --git a/images/kernel/versioned/config-amd64-5.4.102 b/images/kernel/versioned/config-amd64-5.4.108 similarity index 99% rename from images/kernel/versioned/config-amd64-5.4.102 rename to images/kernel/versioned/config-amd64-5.4.108 index f3d7d228c..d39aaa17b 100644 --- a/images/kernel/versioned/config-amd64-5.4.102 +++ b/images/kernel/versioned/config-amd64-5.4.108 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.102 Kernel Configuration +# Linux/x86 5.4.108 Kernel Configuration # # @@ -2532,6 +2532,7 @@ CONFIG_UIO=m CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_DMEM_GENIRQ=m # CONFIG_UIO_PRUSS is not set +# CONFIG_VFIO is not set CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO=y CONFIG_VIRTIO_MENU=y diff --git a/images/kernel/versioned/config-arm64-4.14.223 b/images/kernel/versioned/config-arm64-4.14.227 similarity index 99% rename from images/kernel/versioned/config-arm64-4.14.223 rename to images/kernel/versioned/config-arm64-4.14.227 index af39eff42..5ac9a0cca 100644 --- a/images/kernel/versioned/config-arm64-4.14.223 +++ b/images/kernel/versioned/config-arm64-4.14.227 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.223 Kernel Configuration +# Linux/arm64 4.14.227 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/images/kernel/versioned/config-arm64-4.19.178 b/images/kernel/versioned/config-arm64-4.19.183 similarity index 99% rename from images/kernel/versioned/config-arm64-4.19.178 rename to images/kernel/versioned/config-arm64-4.19.183 index 2176c5778..919b727e5 100644 --- a/images/kernel/versioned/config-arm64-4.19.178 +++ b/images/kernel/versioned/config-arm64-4.19.183 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.178 Kernel Configuration +# Linux/arm64 4.19.183 Kernel Configuration # # diff --git a/images/kernel/versioned/config-arm64-5.10.21 b/images/kernel/versioned/config-arm64-5.10.25 similarity index 99% rename from images/kernel/versioned/config-arm64-5.10.21 rename to images/kernel/versioned/config-arm64-5.10.25 index 4b70b52f0..c1217166f 100644 --- a/images/kernel/versioned/config-arm64-5.10.21 +++ b/images/kernel/versioned/config-arm64-5.10.25 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.21 Kernel Configuration +# Linux/arm64 5.10.25 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0" CONFIG_CC_IS_GCC=y diff --git a/images/kernel/versioned/config-arm64-5.4.102 b/images/kernel/versioned/config-arm64-5.4.108 similarity index 99% rename from images/kernel/versioned/config-arm64-5.4.102 rename to images/kernel/versioned/config-arm64-5.4.108 index 23180c8e8..2f7615df8 100644 --- a/images/kernel/versioned/config-arm64-5.4.102 +++ b/images/kernel/versioned/config-arm64-5.4.108 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.4.102 Kernel Configuration +# Linux/arm64 5.4.108 Kernel Configuration # #