From d04a6d4cf5ba7781590b279986841fc5ecfa1497 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 1 Nov 2018 04:40:21 +0000
Subject: [PATCH] scripts/kernel-functions: Synchronize with the latest
 kernel.org directory layout

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7584 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scripts/kernel-functions | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/scripts/kernel-functions b/scripts/kernel-functions
index af499d0a0..d9ad40f4d 100644
--- a/scripts/kernel-functions
+++ b/scripts/kernel-functions
@@ -64,10 +64,22 @@ function download_kernel {
 }
 
 function extract_kernel_archive {
+  local kver="$(kernel_version $1)"
+  local plevel="$(patchlevel $1)"
+  local series="$1"
+
   if [ -e "${kernel_sources}/linux-$1.tar.xz" ]; then
     xz -cd "${kernel_sources}/linux-$1.tar.xz" | tar xf -
-  else
+  elif [ -e "${kernel_sources}/linux-$kver.tar.xz" ]; then
+    xz -cd "${kernel_sources}/linux-$kver.tar.xz" | tar xf - &&
+      mv linux-$kver linux-$1
+  elif [ -e "${kernel_sources}/linux-$1.tar.bz2" ]; then
     tar xjf "${kernel_sources}/linux-$1.tar.bz2"
+  elif [ -e "${kernel_sources}/linux-$kver.tar.bz2" ]; then
+    tar xjf "${kernel_sources}/linux-$kver.tar.bz2" &&
+      mv linux-$kver linux-$1
+  else
+    return 1
   fi
 }
 
@@ -213,6 +225,13 @@ index 3f2793d..96e45ea 100644
 EOF
       fi
     fi
+    # After patch-v4.14.1[12] has been applied, the execute bit has to be
+    # set for sync-check.sh since patch can't do that.
+    for f in "tools/objtool/sync-check.sh"; do
+      if [ -e "$f" ]; then
+	chmod a+x "$f"
+      fi
+    done
   )
   rmdir "${tmpdir}"
 }