From acc573a2bb1dde4a3d53d4366d2e6a28a8c0bfd1 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 2 May 2017 14:10:22 +0000 Subject: [PATCH] scripts: Update kernel download location git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7161 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/kernel-functions | 16 ++++++---------- scripts/run-regression-tests | 11 ----------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/scripts/kernel-functions b/scripts/kernel-functions index 609ce564e..af499d0a0 100644 --- a/scripts/kernel-functions +++ b/scripts/kernel-functions @@ -2,8 +2,7 @@ # Shell functions for parsing the Linux kernel version and for downloading # from kernel.org. -kernel_mirror="http://ftp.kernel.org/pub/linux/kernel" -kernel_longterm="http://www.kernel.org/pub/linux/kernel" +kernel_mirror="http://cdn.kernel.org/pub/linux/kernel" kernel_sources="$HOME/software/downloads" # Kernel version number. @@ -53,16 +52,13 @@ function download_kernel { ( cd "${kernel_sources}" || return $? if [ "$plevel" = "" -o "$plevel" = "0" ] || - download_file "${kernel_mirror}/v$series/patch-$1.xz" || - download_file "${kernel_mirror}/v$series/longterm/v${kver}/patch-$1.xz" + download_file "${kernel_mirror}/v$series/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 $? + download_file "${kernel_mirror}/v$series/linux-${kver}.tar.xz" || + return $? else - download_file "${kernel_mirror}/v$series/linux-$1.tar.xz" \ - || download_file "${kernel_mirror}/v$series/longterm/v${kver}/linux-$1.tar.xz" \ - || return $? + download_file "${kernel_mirror}/v$series/linux-$1.tar.xz" || + return $? fi ) } diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests index 5fbd9b2bf..4deabe196 100755 --- a/scripts/run-regression-tests +++ b/scripts/run-regression-tests @@ -508,9 +508,6 @@ if [ "${scriptsdir:0:1}" != "/" ]; then fi # Where to store persistenly downloaded kernel tarballs and kernel patches. kernel_sources="$HOME/software/downloads" -# URL for downloading kernel tarballs and kernel patches. -kernel_mirror="http://ftp.kernel.org/pub/linux/kernel" -kernel_longterm="http://www.kernel.org/pub/linux/kernel" kernel_versions="" # Directory in which the regression test output files will be stored. Must be # an absolute path. @@ -542,14 +539,6 @@ done kernel_versions="$*" -# RHEL 4.x / CentOS 4.x has a kernel based on version 2.6.9. -# RHEL 5.x / CentOS 5.x has a kernel based on version 2.6.18. -# Ubuntu 8.04 (Hardy Heron) has a kernel based on version 2.6.24. -# Ubuntu 8.10 (Intrepid Ibex) has a kernel based on version 2.6.27. -# openSUSE 11.0 has a kernel based on version 2.6.25. -# openSUSE 11.1 has a kernel based on version 2.6.27. -#kernel_versions="2.6.23.17 2.6.24.7 2.6.25.20 2.6.26.8 2.6.27.21 2.6.28.9 2.6.29.1" - if [ "${kernel_versions}" = "" ]; then usage exit 1