scripts: Merge from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4879 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2013-05-25 19:05:42 +00:00
parent b9aea5c9a9
commit eb6faa3fb7
2 changed files with 31 additions and 25 deletions

View File

@@ -262,7 +262,9 @@ done
scsi_exec_req_fifo_defined=0
scst_io_context=0
for p in scst/kernel/*-${kver}.patch \
iscsi-scst/kernel/patches/*-${kver}.patch
$(if [ ${kver} = 3.7 ] && [ "$1" = "3.7.10" -o "$1" ">" "3.7.10" ];
then echo iscsi-scst/kernel/patches/*-3.7.10.patch;
else echo iscsi-scst/kernel/patches/*-${kver}.patch; fi)
do
# Exclude the put_page_callback patch when command-line option -u has been
# specified since the current approach is not considered acceptable for