From 6c205d7ff0e09d727afcfc9363a74f549eb6ea1d Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sat, 7 Jan 2012 10:52:28 +0000
Subject: [PATCH] Nightly build: make scripts work again for base level kernels

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4055 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scripts/kernel-functions | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/scripts/kernel-functions b/scripts/kernel-functions
index 9446cb8b2..7bfdf7133 100644
--- a/scripts/kernel-functions
+++ b/scripts/kernel-functions
@@ -29,10 +29,12 @@ function patchlevel {
 function download_file {
   if [ ! -e "$(basename "$1")" ]; then
     if [ "${quiet_download}" = "false" ]; then
-      wget --spider -q -nc "$1" && echo "Downloading $1 ..."
+      { wget -q -nc -O- "$1" 2>/dev/null | grep -q .; } \
+        && echo "Downloading $1 ..."
     fi
     wget -q -nc "$1"
   fi
+  [ -e "$(basename "$1")" ]
 }
 
 # Make sure the kernel tarball and patch file are present in directory
@@ -51,8 +53,10 @@ function download_kernel {
   test -w "${kernel_sources}" || return $?
   (
     cd "${kernel_sources}" || return $?
-    if download_file "${kernel_mirror}/v$series/patch-$1.xz" \
-         || download_file "${kernel_mirror}/v$series/longterm/v${kver}/patch-$1.xz"; then
+    if [ "$plevel" = "" ] \
+       || download_file "${kernel_mirror}/v$series/patch-$1.xz" \
+       || download_file "${kernel_mirror}/v$series/longterm/v${kver}/patch-$1.xz"
+    then
       download_file "${kernel_mirror}/v$series/linux-${kver}.tar.xz" \
         || download_file "${kernel_mirror}/v$series/longterm/v${kver}/linux-${kver}.tar.xz" \
         || return $?
@@ -64,6 +68,14 @@ function download_kernel {
   )
 }
 
+function extract_kernel_archive {
+  if [ -e "${kernel_sources}/linux-$1.tar.xz" ]; then
+    xz -cd "${kernel_sources}/linux-$1.tar.xz" | tar xf -
+  else
+    tar xjf "${kernel_sources}/linux-$1.tar.bz2"
+  fi
+}
+
 # Create a linux-$1 tree in the current directory, where $1 is a kernel
 # version number with either three or four components.
 function extract_kernel_tree {
@@ -75,17 +87,14 @@ function extract_kernel_tree {
   mkdir "${tmpdir}" || return $?
   (
     cd "${tmpdir}" || return $?
-    if [ -e "${kernel_sources}/patch-$1.xz" \
-         -a -e "${kernel_sources}/linux-${kver}.tar.xz" ]
-    then
-      { xz -cd "${kernel_sources}/linux-${kver}.tar.xz" | tar xf -; } \
-        || return $?
+    if [ "$plevel" != "" -a -e "${kernel_sources}/patch-$1.xz" ]; then
+      extract_kernel_archive $kver || return $?
       mv linux-$kver linux-$1
       ( cd linux-$1 && xz -cd "${kernel_sources}/patch-$1.xz" \
         | patch -p1 -f -s; ) \
         || return $?
     else
-      { xz -cd "${kernel_sources}/linux-$1.xz" | tar xf -; } || return $?
+      extract_kernel_archive $1 || return $?
     fi
     mv "linux-$1" ".." || return $?
     cd "../linux-$1" || return $?