apply rancher TCMU patches on top of Ubuntu-4.2.0-28.33

scripts/build-common

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-: ${KERNEL_URL:="https://github.com/rancher/linux/archive/Ubuntu-4.2.0-22.27.tar.gz"}
-: ${KERNEL_SHA1:="44f46b49a879221b0812bfd4ab1ba2fd6dfc752b"}
+: ${KERNEL_URL:="https://github.com/rancher/linux/archive/Ubuntu-4.2.0-28.33-rancher.tar.gz"}
+: ${KERNEL_SHA1:="2cf7bf21f84570dc337bfa4eed43570a32e312a4"}
 : ${ARTIFACTS:=$(pwd)/assets}
 : ${BUILD:=/usr/src}
 : ${CONFIG:=$(pwd)/config}

scripts/build-kernel

@@ -12,22 +12,7 @@ KERNEL=$(basename ${KERNEL_URL})
 DIR=${KERNEL/.tar.*//}
 FIRMWARE=$(readlink -f scripts/firmware)
 
-mkdir -p ${BUILD}
-cd ${BUILD}
-
-if [ ! -e ${DIR} ]; then
-    echo Extracting ${ARTIFACTS}/${KERNEL}
-    TEMP=$(mktemp -d -p ${BUILD})
-    mkdir ${TEMP}/${DIR}
-    trap "rm -rf ${TEMP}" exit
-
-    tar xf ${ARTIFACTS}/${KERNEL} -C ${TEMP}/${DIR} --strip-components=1
-    mv ${TEMP}/${DIR} ${DIR}
-fi
-
-
-cd ${DIR}
-cp ${CONFIG}/kernel-config .config
+cd ${BUILD}/${DIR}
 
 # TODO update config/kernel-config for the latest kernel
 make oldconfig

scripts/ci

@@ -4,4 +4,5 @@ set -e
 cd $(dirname $0)/..
 
 ./scripts/download
+./scripts/extract
 ./scripts/build-kernel

scripts/extract

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+cd $(dirname $0)/..
+
+source scripts/build-common
+
+KERNEL=$(basename ${KERNEL_URL})
+DIR=${KERNEL/.tar.*//}
+
+mkdir -p ${BUILD}
+cd ${BUILD}
+
+if [ ! -e ${DIR} ]; then
+    echo Extracting ${ARTIFACTS}/${KERNEL}
+    TEMP=$(mktemp -d -p ${BUILD})
+    mkdir ${TEMP}/${DIR}
+    trap "rm -rf ${TEMP}" exit
+
+    tar xf ${ARTIFACTS}/${KERNEL} -C ${TEMP}/${DIR} --strip-components=1
+    mv ${TEMP}/${DIR} ${DIR}
+fi
+
+cp ${CONFIG}/kernel-config ${DIR}/.config