Merge pull request #815 from stealthybox/811-prereq-kernel-bump

Signed-off-by: leigh capili <leigh@null.net>
weaveworks · Mar 29, 2021 · 0a6f49a · 0a6f49a
2 parents b3214a5 + 6a52516
commit 0a6f49a
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 18 deletions.
diff --git 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
@@ -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/...es/kernel/generated/config-amd64-4.14.223 → ...es/kernel/generated/config-amd64-4.14.227 b/...es/kernel/generated/config-amd64-4.14.223 → ...es/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/...es/kernel/generated/config-amd64-4.19.178 → ...es/kernel/generated/config-amd64-4.19.183 b/...es/kernel/generated/config-amd64-4.19.178 → ...es/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 → images/kernel/generated/config-amd64-5.10.25 b/images/kernel/generated/config-amd64-5.10.21 → 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 → images/kernel/generated/config-amd64-5.4.108 b/images/kernel/generated/config-amd64-5.4.102 → 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/...es/kernel/generated/config-arm64-4.14.223 → ...es/kernel/generated/config-arm64-4.14.227 b/...es/kernel/generated/config-arm64-4.14.223 → ...es/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/...es/kernel/generated/config-arm64-4.19.178 → ...es/kernel/generated/config-arm64-4.19.183 b/...es/kernel/generated/config-arm64-4.19.178 → ...es/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 → images/kernel/generated/config-arm64-5.10.25 b/images/kernel/generated/config-arm64-5.10.21 → 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 → images/kernel/generated/config-arm64-5.4.108 b/images/kernel/generated/config-arm64-5.4.102 → 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/...es/kernel/versioned/config-amd64-4.14.223 → ...es/kernel/versioned/config-amd64-4.14.227 b/...es/kernel/versioned/config-amd64-4.14.223 → ...es/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/...es/kernel/versioned/config-amd64-4.19.178 → ...es/kernel/versioned/config-amd64-4.19.183 b/...es/kernel/versioned/config-amd64-4.19.178 → ...es/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 → images/kernel/versioned/config-amd64-5.10.25 b/images/kernel/versioned/config-amd64-5.10.21 → 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 → images/kernel/versioned/config-amd64-5.4.108 b/images/kernel/versioned/config-amd64-5.4.102 → 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/...es/kernel/versioned/config-arm64-4.14.223 → ...es/kernel/versioned/config-arm64-4.14.227 b/...es/kernel/versioned/config-arm64-4.14.223 → ...es/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/...es/kernel/versioned/config-arm64-4.19.178 → ...es/kernel/versioned/config-arm64-4.19.183 b/...es/kernel/versioned/config-arm64-4.19.178 → ...es/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 → images/kernel/versioned/config-arm64-5.10.25 b/images/kernel/versioned/config-arm64-5.10.21 → 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 → images/kernel/versioned/config-arm64-5.4.108 b/images/kernel/versioned/config-arm64-5.4.102 → 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
 #
 
 #