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

Merge pull request #4439 from amshinde/update-kernel-to-5.15.46

Browse Source 
versions: Update kernel to latest LTS version 5.15.48
This commit is contained in:
Archana Shinde 2022-06-24 11:03:32 -07:00 committed by GitHub
commit 2488a0f6c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/packaging/kernel/README.md
View File

@ -47,7 +47,7 @@ Options:
-g <vendor> : GPU vendor, intel or nvidia. -g <vendor> : GPU vendor, intel or nvidia.
-h : Display this help. -h : Display this help.
-k <path> : Path to kernel to build. -k <path> : Path to kernel to build.
-p <path> : Path to a directory with patches to apply to kernel. -p <path> : Path to a directory with patches to apply to kernel, only patches in top-level directory are applied.
-t <hypervisor> : Hypervisor_target. -t <hypervisor> : Hypervisor_target.
-v <version> : Kernel version to use if kernel path not provided. -v <version> : Kernel version to use if kernel path not provided.
``` ```
@ -76,7 +76,7 @@ $ ./build-kernel.sh setup
The script `./build-kernel.sh` tries to apply the patches from The script `./build-kernel.sh` tries to apply the patches from
`${GOPATH}/src/github.com/kata-containers/kata-containers/tools/packaging/kernel/patches/` when it `${GOPATH}/src/github.com/kata-containers/kata-containers/tools/packaging/kernel/patches/` when it
sets up a kernel. If you want to add a source modification, add a patch on this sets up a kernel. If you want to add a source modification, add a patch on this
directory. directory. Patches present in the top-level directory are applied, with subdirectories being ignored.
The script also adds a kernel config file from The script also adds a kernel config file from
`${GOPATH}/src/github.com/kata-containers/kata-containers/tools/packaging/kernel/configs/` to `.config` `${GOPATH}/src/github.com/kata-containers/kata-containers/tools/packaging/kernel/configs/` to `.config`

2
tools/packaging/scripts/apply_patches.sh
View File

@ -36,7 +36,7 @@ fi
echo "INFO: Apply patches from $patches_dir" echo "INFO: Apply patches from $patches_dir"
if [ -d "$patches_dir" ]; then if [ -d "$patches_dir" ]; then
patches=($(find "$patches_dir" -name '*.patch'|sort -t- -k1,1n)) patches=($(find "$patches_dir" -maxdepth 1 -name '*.patch'|sort -t- -k1,1n))
echo "INFO: Found ${#patches[@]} patches" echo "INFO: Found ${#patches[@]} patches"
for patch in ${patches[@]}; do for patch in ${patches[@]}; do
echo "INFO: Apply $patch" echo "INFO: Apply $patch"

2
versions.yaml
View File

@ -153,7 +153,7 @@ assets:
kernel: kernel:
description: "Linux kernel optimised for virtual machines" description: "Linux kernel optimised for virtual machines"
url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/" url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
version: "v5.15.26" version: "v5.15.48"
tdx: tdx:
description: "Linux kernel that supports TDX" description: "Linux kernel that supports TDX"
url: "https://github.com/intel/tdx/archive/refs/tags" url: "https://github.com/intel/tdx/archive/refs/tags"