mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-09-02 14:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts: Merge r5177:5337 from trunk

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@5373 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-03-25 16:29:07 +00:00
parent 2f91feaa0c
commit f9242eb1ae
4 changed files with 66 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/generate-kernel-patch
+12 -4
View File
@@ -224,7 +224,7 @@ else
include_fcst="false"
fi
# Make sure that for kernel 2.6.33 and later the line
# Make sure that for kernel 2.6.26 and later the line
# "#define CONFIG_SCST_PROC" is removed from scst/include/scst.h.
if grep -qw scst_sysfs scst/kernel/in-tree/Makefile.scst-${kver} \
|| [ "${generating_upstream_patch}" = "true" ];
@@ -268,9 +268,17 @@ done
scsi_exec_req_fifo_defined=0
scst_io_context=0
for p in scst/kernel/*-${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)
$(if [ ${kver} = 3.7 ] && [ "${1#3.7.}" -ge 10 ]; then
echo iscsi-scst/kernel/patches/*-3.7.10.patch;
elif [ ${kver} = 3.10 ] && [ "${1#3.10.}" -ge 30 ]; then
echo iscsi-scst/kernel/patches/*-3.10.30.patch;
elif [ ${kver} = 3.12 ] && [ "${1#3.12.}" -ge 11 ]; then
echo iscsi-scst/kernel/patches/*-3.12.11.patch;
elif [ ${kver} = 3.13 ] && [ "${1#3.13.}" -ge 3 ]; then
echo iscsi-scst/kernel/patches/*-3.13.3.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