From 0b5fa19771e58e003e47bad50fa77a23fc049f7b Mon Sep 17 00:00:00 2001
From: Ivan Mikushin <i.mikushin@gmail.com>
Date: Mon, 7 Sep 2015 19:34:01 +0500
Subject: [PATCH] move kernel download url to KERNEL_URL var

---
 scripts/build-common |  2 ++
 scripts/build-kernel |  9 +++++----
 scripts/download     | 36 ++----------------------------------
 3 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/scripts/build-common b/scripts/build-common
index 55b71a0..009f6e0 100644
--- a/scripts/build-common
+++ b/scripts/build-common
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+: ${KERNEL_URL:="https://github.com/rancher/linux/archive/Ubuntu-3.19.0-27.29.tar.gz"}
+: ${KERNEL_SHA1:="84b9bc53bbb4dd465b97ea54a71a9805e27ae4f2"}
 : ${ARTIFACTS:=$(pwd)/assets}
 : ${BUILD:=$(pwd)/build}
 : ${CONFIG:=$(pwd)/config}
diff --git a/scripts/build-kernel b/scripts/build-kernel
index a453738..9e1f3c9 100755
--- a/scripts/build-kernel
+++ b/scripts/build-kernel
@@ -9,17 +9,18 @@ apt-get install -y build-essential libncurses5-dev bc ccache
 export CCACHE_DIR="${HOME}/.kernel-ccache"
 export CC="ccache gcc"
 export PATH="/usr/lib/ccache:$PATH"
-KERNEL="$(cd ${ARTIFACTS}; echo Ubuntu-*.tar.*)"
-DIR=linux-${KERNEL/.tar.*//}
+KERNEL=$(basename ${KERNEL_URL})
+DIR=${KERNEL/.tar.*//}
 
 cd ${BUILD}
 
 if [ ! -e ${DIR} ]; then
-    echo Extracting ${ARTIFACTS}/Ubuntu-*.tar.*
+    echo Extracting ${ARTIFACTS}/${KERNEL}
     TEMP=$(mktemp -d -p ${BUILD})
+    mkdir ${TEMP}/${DIR}
     trap "rm -rf ${TEMP}" exit
 
-    tar xf ${ARTIFACTS}/Ubuntu-*.tar.* -C $TEMP
+    tar xf ${ARTIFACTS}/${KERNEL} -C ${TEMP}/${DIR} --strip-components=1
     mv ${TEMP}/${DIR} ${DIR}
 fi
 
diff --git a/scripts/download b/scripts/download
index 792190b..4cfb9a2 100755
--- a/scripts/download
+++ b/scripts/download
@@ -4,38 +4,6 @@ set -x
 
 cd $(dirname $0)/..
 
-: ${ARTIFACTS:=$(pwd)/assets}
+source scripts/build-common
 
-check()
-{
-    local hash=$1
-    local file=$2
-
-    if [ ! -e "$file" ]; then
-        return 1
-    fi
-
-    CURRENT=$(sha1sum $file | awk '{print $1}')
-
-    [ "$hash" = "$CURRENT" ]
-}
-
-download()
-{
-    mkdir -p ${ARTIFACTS}
-
-    local url=$2
-    local file=${ARTIFACTS}/$(basename $2)
-    local hash=$1
-
-    if ! check $hash $file; then
-        curl -sL $url > $file
-    fi
-
-    if ! check $hash $file; then
-        echo "ERROR: $file does not match checksum $hash, got $CURRENT" 1>&2
-        return 1
-    fi
-}
-
-download 84b9bc53bbb4dd465b97ea54a71a9805e27ae4f2 https://github.com/rancher/linux/archive/Ubuntu-3.19.0-27.29.tar.gz
+download ${KERNEL_SHA1} ${KERNEL_URL}