Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
kernel: update guest kernel to 4.19.6 on aarch64
Browse files Browse the repository at this point in the history
For supporting nvdimm, we need to update kernel on aarch64 to the
longterm version 4.19.6 and backport Suzuki K Poulose's latest
Dynamic IPA and 52bit IPA support patch series
(https://patchwork.kernel.org/cover/10616271/)which has been included
in 4.20-rc3+ to stable 4.19.6.

Fixes: #268

Signed-off-by: Penny Zheng <penny.zheng@arm.com>
Signed-off-by: Wei Chen <Wei.Chen@arm.com>
  • Loading branch information
Pennyzct committed Dec 6, 2018
1 parent 645728d commit d2e9822
Show file tree
Hide file tree
Showing 5 changed files with 2,641 additions and 492 deletions.
14 changes: 12 additions & 2 deletions kernel/build-kernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,24 @@ setup_kernel() {

[ -d "${patches_path}" ] || die " patches path '${patches_path}' does not exist"

kernel_patches=$(find "${patches_path}" -name '*.patch' -type f)
kernel_patches=$(find "${patches_path}" -maxdepth 1 -name '*.patch' -type f)

pushd "${kernel_path}" >>/dev/null
for p in ${kernel_patches}; do
info "Applying patch $p"
patch -p1 <"$p"
done

patches_arch_path="${patches_path}/$(arch)"

if [ -d "${patches_arch_path}" ]; then
kernel_arch_patches=$(find "${patches_arch_path}" -name '*.patch' -type f)
for p in ${kernel_arch_patches}; do
info "Applying arch specific patch $p"
patch -p1 <"$p"
done
fi

[ -n "${hypervisor_target}" ] || hypervisor_target="kvm"
[ -n "${arch_target}" ] || arch_target="$(uname -m)"
arch_target=$(arch_to_kernel "${arch_target}")
Expand Down Expand Up @@ -282,7 +292,7 @@ main() {

# If not kernel version take it from versions.yaml
if [ -z "$kernel_version" ]; then
kernel_version=$(get_from_kata_deps "assets.kernel.version")
kernel_version=$(get_from_kata_deps "assets.kernel.architecture.$(arch).version")
#Remove extra 'v'
kernel_version="${kernel_version#v}"
fi
Expand Down
Loading

0 comments on commit d2e9822

Please sign in to comment.