Merge r7822:7826 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7827 d57e44dd-8a1f-0410-8b47-8ef2f437770f

scripts/generate-kernel-patch

@@ -219,7 +219,7 @@ else
 fi
 
 # Include fcst in the patch for kernel versions 2.6.33 and later.
-if [ "${kver}" ">" "2.6.32" ]; then
+if kernel_version_le "2.6.33" "${kver}"; then
   include_fcst="true"
 else
   include_fcst="false"
@@ -269,8 +269,6 @@ do
    fi
 done
 
-download_kernel "${kver}" || exit $?
-
 # General kernel patches.
 
 scsi_exec_req_fifo_defined=0
@@ -338,7 +336,7 @@ mkdir -p "${tmpdir}"
 tmp_Kconfig="${tmpdir}/Kconfig.scst-${kver}"
 # shellcheck disable=SC2002
 cat "scst/kernel/in-tree/Kconfig.scst" | \
-if [ "${include_fcst}" ]; then
+if [ "${include_fcst}" = true ]; then
   cat
 else
   grep -v '^source "drivers/scst/fcst/Kconfig"$'
@@ -353,7 +351,7 @@ if [ "$include_proc_impl" != "true" ]; then
 else
   cat
 fi | \
-  if [ "${include_fcst}" ] && [ "${kver}" != "2.6.37" ] &&
+  if [ "${include_fcst}" = true ] && [ "${kver}" != "2.6.37" ] &&
 	 [ "${kver}" != "2.6.38" ]; then
   cat
 else
@@ -426,7 +424,7 @@ done \
 
 # Directory drivers/scst/fcst/
 
-{
+if [ "${include_fcst}" = true ]; then
   if [ -e "${fcst_patch_series}" ]; then
     grep -v '^#' "${fcst_patch_series}" |
       while read -r f; do
@@ -443,7 +441,7 @@ done \
     [ -e "$f" ] || continue
     add_file "${f}" "drivers/scst/fcst/${f#fcst/}"
   done
-} \
+fi \
 | process_patch "fcst.diff"
 
 add_file "fcst/README" "Documentation/scst/README.fcst" \
@@ -499,6 +497,8 @@ add_file "iscsi-scst/README_in-tree" "Documentation/scst/README.iscsi" \
 
 if [ "${qla2x00t}" = "true" ]; then
 
+  download_kernel "${kver3}" || exit $?
+
   ( cd qla2x00t && ./generate-in-tree-patches "$1" )
 
   for f in qla2x00t/in-tree-patches/"$1"/*.patch; do