github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-28 03:42:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10787 from fidencio/topic/bump-kernel-to-6.12.11

Browse Source 
version: Bump kernel to 6.12.13
This commit is contained in:
Fabiano Fidêncio 2025-02-17 17:39:14 +01:00 committed by GitHub
commit 639bc84329
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@ -357,9 +357,9 @@ install_image() {
if [ "${variant}" == "confidential" ]; then
# For the confidential image we depend on the kernel built in order to ensure that
# measured boot is used
latest_artefacts+="-$(get_latest_kernel_confidential_artefact_and_builder_image_version)"
latest_artefacts+="-$(get_latest_coco_guest_components_artefact_and_builder_image_version)"
latest_artefacts+="-$(get_latest_pause_image_artefact_and_builder_image_version)"
latest_artefact+="-$(get_latest_kernel_confidential_artefact_and_builder_image_version)"
latest_artefact+="-$(get_latest_coco_guest_components_artefact_and_builder_image_version)"
latest_artefact+="-$(get_latest_pause_image_artefact_and_builder_image_version)"
fi
latest_builder_image=""
@ -432,9 +432,9 @@ install_initrd() {
if [ "${variant}" == "confidential" ]; then
# For the confidential initrd we depend on the kernel built in order to ensure that
# measured boot is used
latest_artefacts+="-$(get_latest_kernel_confidential_artefact_and_builder_image_version)"
latest_artefacts+="-$(get_latest_coco_guest_components_artefact_and_builder_image_version)"
latest_artefacts+="-$(get_latest_pause_image_artefact_and_builder_image_version)"
latest_artefact+="-$(get_latest_kernel_confidential_artefact_and_builder_image_version)"
latest_artefact+="-$(get_latest_coco_guest_components_artefact_and_builder_image_version)"
latest_artefact+="-$(get_latest_pause_image_artefact_and_builder_image_version)"
fi
latest_builder_image=""

2
tools/packaging/kernel/configs/fragments/common/fs.conf
View File

@ -9,6 +9,8 @@ CONFIG_BLK_DEV_THROTTLING=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_SD=y
# Required in v6.8+ to use mounted loop devices
CONFIG_BLK_DEV_WRITE_MOUNTED=y
# support initial ramdisk
CONFIG_RD_GZIP=y

1
tools/packaging/kernel/configs/fragments/whitelist.conf
View File

@ -38,3 +38,4 @@ CONFIG_PAGE_TABLE_ISOLATION
CONFIG_MITIGATION_PAGE_TABLE_ISOLATION
CONFIG_VFIO_AP
CONFIG_VFIO_MDEV
CONFIG_BLK_DEV_WRITE_MOUNTED

2
tools/packaging/kernel/kata_config_version
View File

@ -1 +1 @@
146
147

6
versions.yaml
View File

@ -191,11 +191,11 @@ assets:
kernel:
description: "Linux kernel optimised for virtual machines"
url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/"
version: "v6.12.8"
version: "v6.12.13"
confidential:
description: "Linux kernel with x86_64 TEEs (SEV, SNP, and TDX) support"
url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/"
version: "v6.12.8"
version: "v6.12.13"
kernel-arm-experimental:
description: "Linux kernel with cpu/mem hotplug support on arm64"
@ -228,7 +228,7 @@ externals:
coco-guest-components:
description: "Provides attested key unwrapping for image decryption"
url: "https://github.com/confidential-containers/guest-components/"
version: "3df6c412059f29127715c3fdbac9fa41f56cfce4"
version: "514c561d933cb11a0f1628621a0b930157af76cd"
toolchain: "1.80.0"
coco-trustee: