Merged revisions 7032,7034,7037 via svnmerge from

svn+ssh://svn.code.sf.net/p/scst/svn/trunk

........
  r7032 | bvassche | 2016-11-24 08:53:00 -0800 (Thu, 24 Nov 2016) | 6 lines
  
  scripts/generate-kernel-patch: Revert r7022
  
  Revert r7022 because:
  * Changing $kver3 into $kver is wrong for 2.x kernels.
  * Building include/iscsi_scst_itf_ver.h must not depend on the kernel version.
........
  r7034 | bvassche | 2016-11-24 09:32:40 -0800 (Thu, 24 Nov 2016) | 7 lines
  
  iscsi-scst/Makefile: Fix INFINIBAND_ENABLED test
  
  Running "make install" ensures that the kernel config file is available
  in $(KDIR)/.config. However, that file is not available if $(KDIR) points
  at a kernel that comes from a Linux distributor. Hence change the
  $(INFINIBAND_ENABLED) test to check $(KDIR)/../modules.symbols.
........
  r7037 | vlnb | 2016-11-29 19:06:38 -0800 (Tue, 29 Nov 2016) | 9 lines
  
  generate-kernel-patch: fix custom cross-compilation kernel case
  
  Otherwise there is non-fatal error like: No such file or directory
  
  grep: /lib/modules/<current_running_kernel>/build/.config: Permission denied
  
  This is a better version of r7022 suggested by Bart
........


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

scripts/generate-kernel-patch

@@ -114,7 +114,7 @@ function specialize_patch {
     fi |
     "$(dirname $0)/specialize-patch" \
          ${specialize_patch_options} \
-         -v kernel_version="${kver}" \
+         -v kernel_version="${kver3}" \
          -v SCSI_EXEC_REQ_FIFO_DEFINED="${scsi_exec_req_fifo_defined}" \
          -v SCST_IO_CONTEXT="${scst_io_context}"
   else
@@ -478,7 +478,7 @@ add_file "fcst/README" "Documentation/scst/README.fcst" \
 # Directory drivers/scst/iscsi-scst/
 
 # Make sure the file iscsi-scst/iscsi_scst_itf_ver.h is up to date.
-make KVER=${kver3} -s -C iscsi-scst include/iscsi_scst_itf_ver.h
+make -s -C iscsi-scst include/iscsi_scst_itf_ver.h
 
 (
 for f in $(ls iscsi-scst/include/*h 2>/dev/null)