Merge pull request #456 from balena-os/update_kernel_to_6.6

Update kernel to 6.6
balena-os · Jul 23, 2024 · 4e4af09 · 4e4af09
2 parents bc7d650 + 42e3ff6
commit 4e4af09
Show file tree

Hide file tree

Showing 12 changed files with 5,543 additions and 124 deletions.
diff --git a/generic-aarch64.coffee b/generic-aarch64.coffee
@@ -19,7 +19,7 @@ module.exports =
 		machine: 'generic-aarch64'
 		image: 'balena-image'
 		fstype: 'balenaos-img'
-		version: 'yocto-dunfell'
+		version: 'yocto-kirkstone'
 		deployArtifact: 'balena-image-generic-aarch64.balenaos-img'
 		compressed: true
 

diff --git a/generic-amd64-fs.coffee b/generic-amd64-fs.coffee
@@ -44,7 +44,7 @@ module.exports =
 		machine: 'generic-amd64-fs'
 		image: 'balena-image-flasher'
 		fstype: 'balenaos-img'
-		version: 'yocto-dunfell'
+		version: 'yocto-kirkstone'
 		deployArtifact: 'balena-image-flasher-generic-amd64-fs.balenaos-img'
 		deployFlasherArtifact: 'balena-image-flasher-generic-amd64-fs.balenaos-img'
 		deployRawArtifact: 'balena-image-generic-amd64-fs.balenaos-img'

diff --git a/generic-amd64.coffee b/generic-amd64.coffee
@@ -45,7 +45,7 @@ module.exports =
 		machine: 'generic-amd64'
 		image: 'balena-image-flasher'
 		fstype: 'balenaos-img'
-		version: 'yocto-dunfell'
+		version: 'yocto-kirkstone'
 		deployArtifact: 'balena-image-flasher-generic-amd64.balenaos-img'
 		deployFlasherArtifact: 'balena-image-flasher-generic-amd64.balenaos-img'
 		deployRawArtifact: 'balena-image-generic-amd64.balenaos-img'

diff --git a/layers/meta-balena-generic/conf/machine/include/kernel.inc b/layers/meta-balena-generic/conf/machine/include/kernel.inc
@@ -1,4 +1,4 @@
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "6.1%"
+PREFERRED_VERSION_linux-yocto ?= "6.6%"
 
 FIRMWARE_COMPRESSION = "1"
diff --git a/layers/meta-balena-generic/recipes-kernel/linux/cve-exclusion_6.1.inc b/layers/meta-balena-generic/recipes-kernel/linux/cve-exclusion_6.1.inc