From 2c9922245d6922d49d36bac93eef3508b1424331 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 10 Apr 2019 15:00:33 +0000 Subject: [PATCH] scripts/kernel-functions: Fix the code for retrieving kernel code from a git repo git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8179 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/kernel-functions | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/kernel-functions b/scripts/kernel-functions index e619739f8..de2be73e7 100644 --- a/scripts/kernel-functions +++ b/scripts/kernel-functions @@ -114,6 +114,12 @@ function extract_kernel_tree { fi mv "linux-$1" ".." || return $? cd "../linux-$1" || return $? + ) + rmdir "${tmpdir}" +} + +# Patch a kernel tree where $1 is the kernel version. +function patch_kernel { if [ "$1" = "2.6.29" -o "$1" = "2.6.29.1" -o "$1" = "2.6.29.2" -o "$1" = "2.6.29.3" ] then patch -f -s -p1 <<'EOF' @@ -423,8 +429,6 @@ EOF chmod a+x "$f" fi done - ) - rmdir "${tmpdir}" } function download_and_extract_kernel_tree { @@ -436,6 +440,8 @@ function download_and_extract_kernel_tree { { git tag -l "v$1" >/dev/null || git fetch stable; } && git archive "v$1" ) | tar -C "linux-$1" -xf- - fi - download_kernel "$1" && extract_kernel_tree "$1" + else + download_kernel "$1" && extract_kernel_tree "$1" + fi && + (cd linux-$1 && patch_kernel "$1") }