From bad8f4498de4ff8258c5048809fbd241aa543ef8 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 16 Dec 2011 10:16:12 +0000 Subject: [PATCH] Nightly build: the directory structure on ftp.kernel.org has been modified once more. Update scripts/run-regression-tests accordingly git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3998 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/run-regression-tests | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests index 7fb0575ce..ff13fa8ee 100755 --- a/scripts/run-regression-tests +++ b/scripts/run-regression-tests @@ -78,14 +78,8 @@ function extract_kernel_tree { mkdir "${tmpdir}" || return $? ( cd "${tmpdir}" || return $? - tar xjf "${kernel_sources}/linux-${kver}.tar.bz2" || return $? - cd "linux-${kver}" || return $? - if [ "${plevel}" != "" ]; then - bzip2 -cd "${kernel_sources}/patch-$1.bz2" \ - | patch -p1 -f -s || return $? - fi - cd .. - mv "linux-${kver}" "../linux-$1" || return $? + tar xaf "${kernel_sources}/linux-$1.tar.xz" || return $? + mv "linux-$1" ".." || return $? if [ "$1" = "2.6.29" -o "$1" = "2.6.29.1" -o "$1" = "2.6.29.2" -o "$1" = "2.6.29.3" ] then cd "../linux-$1" || return $? @@ -288,13 +282,9 @@ function download_kernel { test -w "${kernel_sources}" || return $? ( cd "${kernel_sources}" || return $? - download_file "${kernel_mirror}/v$series/linux-$kver.tar.bz2" \ + download_file "${kernel_mirror}/v$series/linux-$1.tar.xz" \ + || download_file "${kernel_mirror}/v$series/longterm/v${kver}/linux-$1.tar.xz" \ || return $? - if [ "${plevel}" != "" ]; then - download_file "${kernel_mirror}/v$series/patch-$1.bz2" \ - || download_file "${kernel_longterm}/v$series/longterm/patch-$1.bz2" \ - || return $? - fi ) }