chore: bump kernel to 6.1.54

Bump kernel to 6.1.54 `CONFIG_IMA_TRUSTED_KEYRING` is deprecated in favor of `INTEGRITY_TRUSTED_KEYRING`. Ref: https://cateee.net/lkddb/web-lkddb/IMA_TRUSTED_KEYRING.html Signed-off-by: Noel Georgi <git@frezbo.dev>
siderolabs · Sep 20, 2023 · acee18e · acee18e
1 parent 1d16fd2
commit acee18e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/Pkgfile b/Pkgfile
@@ -68,9 +68,9 @@ vars:
   ipxe_sha512: 01bf9590ab4d62dcc8d89e71402ef7b97fcf62ffafa89d4ff300128c966d4d9418ead822c70ef7e8bedc707d1d3c1bf5891d6677e21b09fcfb1bfc010538a48f
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
-  linux_version: 6.1.51
-  linux_sha256: 58b0446d8ea4bc0b26a35e2e3509bd53efcdeb295c9e4f48d33a23b1cdaa103b
-  linux_sha512: 82404e9e4ab7d12b83241433c02a0be4ad4c7e9c1452e5783956eb44e8a99ab140d78eeb294743a6023b24b5ddc23a7b3ed7765ca0dffabe9f3802bb896fab8a
+  linux_version: 6.1.54
+  linux_sha256: a3181e46d407cd6ab15f412402e8220684ff9659b0262b7a3de7384405ce4e27
+  linux_sha512: fcdcddd3001be94737a06208be39dce4ba31a51ac3f05ef492bfee1827d18a0d73f9ce3cb1b01a253f148a525cd16fc1278a99d25eeffcdaef8da0b64821b171
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
   kmod_version: 30

diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.51 Kernel Configuration
+# Linux/x86 6.1.54 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.3.0"
 CONFIG_CC_IS_GCC=y
@@ -5251,9 +5251,6 @@ CONFIG_IMA_ARCH_POLICY=y
 # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 # CONFIG_IMA_APPRAISE_MODSIG is not set
-CONFIG_IMA_TRUSTED_KEYRING=y
-# CONFIG_IMA_BLACKLIST_KEYRING is not set
-# CONFIG_IMA_LOAD_X509 is not set
 CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
 CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
 CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y

diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.51 Kernel Configuration
+# Linux/arm64 6.1.54 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.3.0"
 CONFIG_CC_IS_GCC=y
@@ -7782,9 +7782,6 @@ CONFIG_IMA_ARCH_POLICY=y
 # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 # CONFIG_IMA_APPRAISE_MODSIG is not set
-CONFIG_IMA_TRUSTED_KEYRING=y
-# CONFIG_IMA_BLACKLIST_KEYRING is not set
-# CONFIG_IMA_LOAD_X509 is not set
 CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
 CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y
 CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y