scripts/kernel-functions: Handle 3.x.0 kernel versions correctly (merge r5658 and r5661 from trunk)

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@5773 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-09-04 13:13:52 +00:00
parent 0d3085ddef
commit 7f2d82eb14
+8 -5
View File
@@ -53,9 +53,9 @@ function download_kernel {
test -w "${kernel_sources}" || return $?
(
cd "${kernel_sources}" || return $?
if [ "$plevel" = "" ] \
|| download_file "${kernel_mirror}/v$series/patch-$1.xz" \
|| download_file "${kernel_mirror}/v$series/longterm/v${kver}/patch-$1.xz"
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"
then
download_file "${kernel_mirror}/v$series/linux-${kver}.tar.xz" \
|| download_file "${kernel_mirror}/v$series/longterm/v${kver}/linux-${kver}.tar.xz" \
@@ -87,14 +87,17 @@ function extract_kernel_tree {
mkdir "${tmpdir}" || return $?
(
cd "${tmpdir}" || return $?
if [ "$plevel" != "" -a -e "${kernel_sources}/patch-$1.xz" ]; then
if [ "$plevel" != "" -a "$plevel" != "0" -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
extract_kernel_archive $1 || return $?
extract_kernel_archive $1 ||
{ extract_kernel_archive $kver && mv linux-$kver linux-$1; } ||
return $?
fi
mv "linux-$1" ".." || return $?
cd "../linux-$1" || return $?