mirror of
https://github.com/SCST-project/scst.git
synced 2026-09-05 07:37:04 +00:00
Merged revisions 5746-5750,5756-5757,5759,5761,5763,5765-5766,5768,5770-5778 via svnmerge from
svn+ssh://yanb123@svn.code.sf.net/p/scst/svn/branches/3.0.x ........ r5746 | bvassche | 2014-09-03 12:12:08 +0300 (Wed, 03 Sep 2014) | 1 line srpt/README: Fix SLES patch instructions (merge r5682 from trunk) ........ r5747 | bvassche | 2014-09-03 12:14:20 +0300 (Wed, 03 Sep 2014) | 1 line srpt/Makefile: SLES + Mellanox OFED build fix (merge r5679:5681 from trunk) ........ r5748 | bvassche | 2014-09-03 12:17:39 +0300 (Wed, 03 Sep 2014) | 1 line Add kernel 3.16 nightly build infrastructure (merge r5719 from trunk) ........ r5749 | bvassche | 2014-09-03 12:19:07 +0300 (Wed, 03 Sep 2014) | 1 line ib_srpt: Kernel 3.17 build fix (merge r5725 from trunk) ........ r5750 | bvassche | 2014-09-03 12:22:38 +0300 (Wed, 03 Sep 2014) | 1 line nightly build: Add kernel 3.16.1 (merge r5651:5720 from trunk) ........ r5756 | bvassche | 2014-09-03 15:33:33 +0300 (Wed, 03 Sep 2014) | 1 line scst.h: Make vzalloc() available on RHEL 6.0 (merge r5752 from trunk) ........ r5757 | bvassche | 2014-09-03 15:35:49 +0300 (Wed, 03 Sep 2014) | 2 lines scst_vdisk: RHEL 6.0 build fix (merge r5754:5755 from trunk) ........ r5759 | bvassche | 2014-09-03 16:44:53 +0300 (Wed, 03 Sep 2014) | 1 line scst.h: RHEL 5.10 build fix (merge r5758 from trunk) ........ r5761 | bvassche | 2014-09-03 16:53:03 +0300 (Wed, 03 Sep 2014) | 1 line scst.h: RHEL 5.10 build fix (merge r5760 from trunk) ........ r5763 | bvassche | 2014-09-03 17:01:04 +0300 (Wed, 03 Sep 2014) | 1 line scst.h: Fix definition of __aligned() (merge r5762 from trunk) ........ r5765 | bvassche | 2014-09-03 17:25:53 +0300 (Wed, 03 Sep 2014) | 1 line scst_vdisk: Use parentheses around && inside || ........ r5766 | bvassche | 2014-09-03 17:27:09 +0300 (Wed, 03 Sep 2014) | 1 line Update for kernel 3.16 (merge r5717 from trunk) ........ r5768 | bvassche | 2014-09-04 15:45:59 +0300 (Thu, 04 Sep 2014) | 1 line ib_srpt: Version 3.0.0 ........ r5770 | bvassche | 2014-09-04 16:02:42 +0300 (Thu, 04 Sep 2014) | 1 line iscsi-scst: Build fix for IPV6=n (merge r5732 from trunk) ........ r5771 | bvassche | 2014-09-04 16:06:38 +0300 (Thu, 04 Sep 2014) | 1 line iscsi-scst: Micro-optimize cmnd_prepare_recv_pdu() (merge r5735 from trunk) ........ r5772 | bvassche | 2014-09-04 16:11:23 +0300 (Thu, 04 Sep 2014) | 1 line scripts/generate-patched-kernel: Fix for invocation from current directory (merge r5659 and r5745 from trunk) ........ r5773 | bvassche | 2014-09-04 16:13:52 +0300 (Thu, 04 Sep 2014) | 1 line scripts/kernel-functions: Handle 3.x.0 kernel versions correctly (merge r5658 and r5661 from trunk) ........ r5774 | bvassche | 2014-09-04 16:29:18 +0300 (Thu, 04 Sep 2014) | 1 line Add support for the RHEL 7 kernel (merge r5710:5711 from trunk) ........ r5775 | bvassche | 2014-09-04 16:44:08 +0300 (Thu, 04 Sep 2014) | 1 line Forbid using '.' in PR and mode page file names (merge r5702 from trunk) ........ r5776 | bvassche | 2014-09-04 16:46:14 +0300 (Thu, 04 Sep 2014) | 1 line scst_pres: Make a few error messages more clear (merge r5733 from trunk) ........ r5777 | bvassche | 2014-09-04 16:49:12 +0300 (Thu, 04 Sep 2014) | 1 line Pass-through error handling fix (merge r5703 from trunk) ........ r5778 | bvassche | 2014-09-04 16:55:04 +0300 (Thu, 04 Sep 2014) | 1 line scstadmin: Suppress a Perl warning (merge r5731 from trunk) ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x-iser@5784 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Yan Burman
@@ -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 $?
|
||||
|
||||
Reference in New Issue
Block a user