Skip to content

Commit

Permalink
Merge pull request kata-containers#10787 from fidencio/topic/bump-ker…
Browse files Browse the repository at this point in the history
…nel-to-6.12.11

version: Bump kernel to 6.12.13
  • Loading branch information
fidencio authored Feb 17, 2025
2 parents d96e837 + 7ae5fa4 commit 639bc84
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
12 changes: 6 additions & 6 deletions tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down Expand Up @@ -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=""
Expand Down
2 changes: 2 additions & 0 deletions tools/packaging/kernel/configs/fragments/common/fs.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tools/packaging/kernel/configs/fragments/whitelist.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion tools/packaging/kernel/kata_config_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
146
147
6 changes: 3 additions & 3 deletions versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 639bc84

Please sign in to comment.