github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-13 04:49:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1005 from jodh-intel/fix-patch-ordering

Browse Source 
kernel: Fix patch ordering
This commit is contained in:
Salvador Fuentes
2020-04-08 12:55:28 -05:00
committed by GitHub
parent ed13991f2d 93da14508f
commit 367c2ac068
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/build-kernel.sh
View File

@@ -343,7 +343,20 @@ setup_kernel() {
local patches_dir_for_version="${patches_path}/${major_kernel}.x" local patches_dir_for_version="${patches_path}/${major_kernel}.x"
local kernel_patches="" local kernel_patches=""
if [ -d "${patches_dir_for_version}" ]; then if [ -d "${patches_dir_for_version}" ]; then
kernel_patches=$(find "${patches_dir_for_version}" -name '*.patch' -type f) # Patches are expected to be named in the standard
# git-format-patch(1) format where the first part of the
# filename represents the patch ordering
# (lowest numbers apply first):
#
# "${number}-${dashed_description}"
#
# For example,
#
# 0001-fix-the-bad-thing.patch
# 0002-improve-the-fix-the-bad-thing-fix.patch
# 0003-correct-compiler-warnings.patch
kernel_patches=$(find "${patches_dir_for_version}" -name '*.patch' -type f |\
sort -t- -k1,1n)
else else
info "kernel patches directory does not exit" info "kernel patches directory does not exit"
fi fi

2
kernel/kata_config_version
View File

@@ -1 +1 @@
71 72