github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-01 07:47:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1638 from jcvenegas/2021-04-06/linux-5.10.x-qemu-experimental

Browse Source 
kernel: update experimental kernel to 5.10.x
This commit is contained in:
Carlos Venegas 2021-04-07 16:02:44 -05:00 committed by GitHub
commit ec36883fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/packaging/kernel/build-kernel.sh
View File

@ -123,12 +123,6 @@ get_kernel() {
[ ! -d "${kernel_path}" ] || die "kernel_path already exist" [ ! -d "${kernel_path}" ] || die "kernel_path already exist"
if [[ ${experimental_kernel} == "true" ]]; then
kernel_tarball="linux-${version}.tar.gz"
curl --fail -OL "https://gitlab.com/virtio-fs/linux/-/archive/${version}/${kernel_tarball}"
tar xf "${kernel_tarball}"
mv "linux-${version}" "${kernel_path}"
else
#Remove extra 'v' #Remove extra 'v'
version=${version#v} version=${version#v}
@ -159,7 +153,6 @@ get_kernel() {
tar xf "${kernel_tarball}" tar xf "${kernel_tarball}"
mv "linux-${version}" "${kernel_path}" mv "linux-${version}" "${kernel_path}"
fi
} }
get_major_kernel_version() { get_major_kernel_version() {
@ -338,6 +331,7 @@ setup_kernel() {
local major_kernel local major_kernel
major_kernel=$(get_major_kernel_version "${kernel_version}") major_kernel=$(get_major_kernel_version "${kernel_version}")
local patches_dir_for_version="${patches_path}/${major_kernel}.x" local patches_dir_for_version="${patches_path}/${major_kernel}.x"
local experimental_patches_dir="${patches_path}/${major_kernel}.x/experimental"
[ -n "${arch_target}" ] || arch_target="$(uname -m)" [ -n "${arch_target}" ] || arch_target="$(uname -m)"
arch_target=$(arch_to_kernel "${arch_target}") arch_target=$(arch_to_kernel "${arch_target}")
@ -347,6 +341,12 @@ setup_kernel() {
# Apply version specific patches # Apply version specific patches
${packaging_scripts_dir}/apply_patches.sh "${patches_dir_for_version}" ${packaging_scripts_dir}/apply_patches.sh "${patches_dir_for_version}"
# Apply version specific patches for experimental build
if [ "${experimental_kernel}" == "true" ] ;then
info "Apply experimental patches"
${packaging_scripts_dir}/apply_patches.sh "${experimental_patches_dir}"
fi
[ -n "${hypervisor_target}" ] || hypervisor_target="kvm" [ -n "${hypervisor_target}" ] || hypervisor_target="kvm"
[ -n "${kernel_config_path}" ] || kernel_config_path=$(get_default_kernel_config "${kernel_version}" "${hypervisor_target}" "${arch_target}" "${kernel_path}") [ -n "${kernel_config_path}" ] || kernel_config_path=$(get_default_kernel_config "${kernel_version}" "${hypervisor_target}" "${arch_target}" "${kernel_path}")
@ -474,6 +474,8 @@ main() {
if [ -z "$kernel_version" ]; then if [ -z "$kernel_version" ]; then
if [[ ${experimental_kernel} == "true" ]]; then if [[ ${experimental_kernel} == "true" ]]; then
kernel_version=$(get_from_kata_deps "assets.kernel-experimental.tag" "${kata_version}") kernel_version=$(get_from_kata_deps "assets.kernel-experimental.tag" "${kata_version}")
#Remove extra 'v'
kernel_version="${kernel_version#v}"
else else
kernel_version=$(get_from_kata_deps "assets.kernel.version" "${kata_version}") kernel_version=$(get_from_kata_deps "assets.kernel.version" "${kata_version}")
#Remove extra 'v' #Remove extra 'v'

0
tools/packaging/kernel/patches/5.10.x/experimental/no_patches.txt Normal file
View File

4
versions.yaml
View File

@ -159,8 +159,8 @@ assets:
kernel-experimental: kernel-experimental:
description: "Linux kernel with virtio-fs support" description: "Linux kernel with virtio-fs support"
url: "https://gitlab.com/virtio-fs/linux.git" url: "https://cdn.kernel.org/pub/linux/kernel/v4.x/"
tag: "kata-v5.6-april-09-2020" tag: "v5.10.25"
externals: externals:
description: "Third-party projects used by the system" description: "Third-party projects used by the system"