Commit Graph

38 Commits

Author SHA1 Message Date
Yan Burman
b990f13496 Merged revisions 5564-5565,5580,5591,5599,5604,5623,5632-5638,5645-5646,5652-5653 via svnmerge from
svn+ssh://yanb123@svn.code.sf.net/p/scst/svn/branches/3.0.x

................
  r5564 | vlnb | 2014-06-04 06:10:31 +0300 (Wed, 04 Jun 2014) | 3 lines
  
  Initialize merging from the trunk
................
  r5565 | vlnb | 2014-06-04 06:12:05 +0300 (Wed, 04 Jun 2014) | 13 lines
  
  Merged revisions 5543,5545 via svnmerge from 
  svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk
  
  ........
    r5543 | bvassche | 2014-05-23 00:33:53 -0700 (Fri, 23 May 2014) | 1 line
    
    RHEL 7 build fixes
  ........
    r5545 | bvassche | 2014-05-23 01:36:36 -0700 (Fri, 23 May 2014) | 1 line
    
    scripts/rebuild-rhel-kernel-rpm: Add RHEL 7 RC support
  ........
................
  r5580 | bvassche | 2014-06-11 17:33:30 +0300 (Wed, 11 Jun 2014) | 1 line
  
  ib_srpt: Merge build and login fixes from trunk
................
  r5591 | vlnb | 2014-06-12 02:52:43 +0300 (Thu, 12 Jun 2014) | 14 lines
  
  Merged revisions 5584 via svnmerge from 
  svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk
  
  ........
    r5584 | vlnb | 2014-06-11 12:33:18 -0700 (Wed, 11 Jun 2014) | 8 lines
    
    scst: RHEL 5 build fix
    
    Avoid that building the scst kernel module fails on RHEL 5 due to
    a missing kvasprintf() implementation.
    
    Signed-off-by: Bart Van Assche <bvanassche@acm.org>
  ........
................
  r5599 | bvassche | 2014-06-13 09:59:13 +0300 (Fri, 13 Jun 2014) | 1 line
  
  ib_srpt: Merge from trunk
................
  r5604 | vlnb | 2014-06-14 03:31:55 +0300 (Sat, 14 Jun 2014) | 14 lines
  
  Merged revisions 5602 via svnmerge from 
  svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk
  
  ........
    r5602 | vlnb | 2014-06-13 16:57:26 -0700 (Fri, 13 Jun 2014) | 8 lines
    
    scst_pr_read_reservation(): Initialize returned buffer
    
    Avoid that this function returns an uninitialized buffer to the
    initiator if buffer_size < 8. Detected by Coverity.
    
    Signed-off-by: Bart Van Assche <bvanassche@acm.org>
  ........
................
  r5623 | vlnb | 2014-06-25 07:00:14 +0300 (Wed, 25 Jun 2014) | 9 lines
  
  Merged revisions 5610 via svnmerge from 
  svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk
  
  ........
    r5610 | vlnb | 2014-06-18 20:51:48 -0700 (Wed, 18 Jun 2014) | 3 lines
    
    Update for 3.15 kernels
  ........
................
  r5632 | bvassche | 2014-06-29 08:18:01 +0300 (Sun, 29 Jun 2014) | 1 line
  
  scst_vdisk: 32-bit build fix (merge r5629 from trunk)
................
  r5633 | bvassche | 2014-06-29 08:20:31 +0300 (Sun, 29 Jun 2014) | 1 line
  
  ib_srpt: Remove existing ib_srpt.ko kernel modules before installation (merge r5621, r5628 and r5630 from trunk)
................
  r5634 | bvassche | 2014-06-29 08:22:58 +0300 (Sun, 29 Jun 2014) | 1 line
  
  Skip "depmod" while building an RPM (merge r5612 from trunk)
................
  r5635 | bvassche | 2014-06-29 08:24:11 +0300 (Sun, 29 Jun 2014) | 1 line
  
  ib_srpt: Set SCSI residual fields in SRP_CMD reply (merge r5622 from trunk)
................
  r5636 | bvassche | 2014-06-29 08:25:55 +0300 (Sun, 29 Jun 2014) | 1 line
  
  nightly build: Add kernel 3.15 build infrastructure (merge r5611 from trunk)
................
  r5637 | bvassche | 2014-06-29 08:27:14 +0300 (Sun, 29 Jun 2014) | 1 line
  
  regression tests: Sort hash keys before comparing (merge r5582 from trunk)
................
  r5638 | bvassche | 2014-06-29 08:28:45 +0300 (Sun, 29 Jun 2014) | 1 line
  
  regression tests: Sync with a recent sysfs change (merge r5581 from trunk)
................
  r5645 | bvassche | 2014-06-29 09:00:05 +0300 (Sun, 29 Jun 2014) | 1 line
  
  nightly build, scripts: Merge from trunk (r5533:r5642)
................
  r5646 | bvassche | 2014-06-29 09:10:22 +0300 (Sun, 29 Jun 2014) | 2 lines
  
  scst: Switch from the cpu_*() to the cpumask_*() API (merge r5596 from trunk)
................
  r5652 | bvassche | 2014-06-30 13:23:11 +0300 (Mon, 30 Jun 2014) | 1 line
  
  nightly build: Merge r5642:r5651 from trunk
................
  r5653 | bvassche | 2014-06-30 13:25:24 +0300 (Mon, 30 Jun 2014) | 1 line
  
  scst: Build fixes for kernel versions <= 2.6.34 (merge r5647 and r5648 from trunk)
................


git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x-iser@5665 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-07-07 10:28:33 +00:00
Bart Van Assche
99b7abe259 ib_srpt, Makefile: Introduce the OFED_KERNEL_DIR variable
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5473 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-04-24 12:27:00 +00:00
Bart Van Assche
cd0dcb32ab ib_srpt: Add support in the Makefile for MLNX OFED and for OFED 3.x
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5471 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-04-24 10:38:37 +00:00
Bart Van Assche
3c5a901bf0 srpt/Makefile: Avoid that the build process depends on source control tools
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5361 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-03-21 16:29:26 +00:00
Bart Van Assche
ecc0a4a25d ib_srpt/Makefile: Add kerneldoc target
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5347 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-03-20 15:16:27 +00:00
Bart Van Assche
bcc5cefce8 srpt: Minor buid process terminology change
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5338 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-03-16 13:38:50 +00:00
Bart Van Assche
69d5b979eb Makefiles: 'uninstall' target fixes
Some components don't have 'uninstall' targets although the top-level
Makefile references them. Some others don't remove the proper file.

Signed-off-by: Steven J. Magnani <steve@digidescorp.com>


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5290 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-02-18 08:41:30 +00:00
Bart Van Assche
7d89372c53 Makefiles: respect DESTDIR when specified
Not all SCST components handle DESTDIR properly, or at all.

In particular:
* INSTALL_MOD_PATH should account for DESTDIR when 'make modules_install'
  is invoked, so the kernel make infrastructure deploys the modules
  and runs depmod against the proper directory tree.
* depmods must include a '-b' option to reference the proper directory tree.
* Drop special ISCSI_DESTDIR.

Signed-off-by: Steven J. Magnani <steve@digidescorp.com>


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5289 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-02-18 08:40:36 +00:00
Bart Van Assche
79b8ce942e Makefiles: calculate KVER properly
When deriving the kernel version (KVER) from KDIR, the file
$(KDIR)/include/config/kernel.release should be preferred over
'make kernelversion'.

For example, the Ubuntu 3.2.0-23-generic kernel has a kernel.release
file containing '3.2.0-23-generic', but 'make kernelversion' returns
3.2.14. Since the modules are stored under /lib/modules/3.2.0-23-generic,
the value in kernel.release is the correct one to use.
    
Also:
- Evaluate KVER only once
- All depmod commands must include KVER
    
Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
[bvanassche: Split long lines / removed trailing whitespace]


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5286 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-02-14 15:52:10 +00:00
Bart Van Assche
c33cf3f81b Makefiles: Convert from "install" to "make modules_install"
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5284 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-02-14 13:48:54 +00:00
Vladislav Bolkhovitin
369863f015 Allow install SCST in any location
Currently the install location of SCST is pretty much hard coded into 
the Makefiles to be /usr/local.

I am custom building a system for ZFS & SCST and I want to install in 
/usr instead of /usr/local.

Currently I am doing a “find . -name Makefile -exec sed -i 's:/usr/local:/usr:g'
{} \;” to accommodate this.

This patch fixes it.

From Sietse van Zanen <sietse@wizdom.nu>



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4791 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2013-03-08 21:25:45 +00:00
Vladislav Bolkhovitin
bd7c893f04 Multiple makefiles: autodetect SCST include directory
It is cumbersome to change SCST_INC_DIR and SCST_DIR in each Makefile
before and after a release. Hence modify the Makefiles such that these
paths are detected automatically.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4740 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2013-01-16 00:12:38 +00:00
Bart Van Assche
9dcf4d3036 ib_srpt: Move functionality for creating a release archive into scripts/generate-release-archive
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4676 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2013-01-03 17:46:01 +00:00
Bart Van Assche
831fe6de2f ib_srpt: Follow-up for r4035
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4036 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-12-29 12:06:44 +00:00
Bart Van Assche
8b1948c182 ib_srpt: Make the Makefile independent of the location of the SCST directory
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4035 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-12-29 11:32:17 +00:00
Bart Van Assche
cda113058b ib_srpt: Add "make release-archive" target in Makefile
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4034 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-12-29 11:21:20 +00:00
Bart Van Assche
50c2ef2e01 srpt/Makefile: Use $(MAKE) instead of make when recursing. See also http://www.gnu.org/s/hello/manual/make/MAKE-Variable.html for more information about why this is important.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3814 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-08-17 07:51:08 +00:00
Bart Van Assche
7999ac6f53 srpt: Make build mode switches silent
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3760 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-07-26 09:27:48 +00:00
Bart Van Assche
84f56dfa67 srpt: Change default build mode from release to debug. Add support for "make 2debug" / "make 2release" / "make 2perf".
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3759 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-07-26 09:26:17 +00:00
Vladislav Bolkhovitin
f518cd150c Let's remove *.orig and *.rej files on extraclean
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3277 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-03-10 20:07:23 +00:00
Bart Van Assche
492e570df0 Made ib_srpt easier to build on a multiboot system where multiple kernels
have been installed -- one kernel with OFED and one or more kernels without
OFED.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1498 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-02-11 19:28:58 +00:00
Bart Van Assche
a03c2176a8 Added an additional consistency check: an error message is now printed if
the kernel-ib-devel RPM has been installed but not the kernel-ib RPM.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1387 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-12-13 13:00:39 +00:00
Bart Van Assche
b9a0eb9386 Updates for the OFED 1.5 + kernel 2.6.30 combination.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1306 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-31 13:06:39 +00:00
Bart Van Assche
e83ed53e9b Updated for the 2.6.30 kernel + OFED combination.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1297 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-29 18:41:52 +00:00
Bart Van Assche
049293249b Made srpt compilation more silent.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1264 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-23 18:41:05 +00:00
Bart Van Assche
7084cac82e Display which kernel headers are used during compilation of the SRP target driver.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@913 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-06-18 18:35:05 +00:00
Bart Van Assche
7340819a3f Clarified an error message.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@836 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-05-10 18:25:08 +00:00
Bart Van Assche
603d81dde4 Documented how to build SCST-SRPT against OFED.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@834 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-05-10 17:31:22 +00:00
Bart Van Assche
52d50a5ea7 Removed one OFED installation test because on some distro's it triggers false complaints.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@822 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-05-04 20:02:30 +00:00
Bart Van Assche
2f1acab33e Prepend the OFED kernel header paths before the regular kernel header path when compiling on a system where OFED has been installed.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@819 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-05-04 18:55:50 +00:00
Bart Van Assche
90e914fd25 - Removed comments that referred to the 2.4 module build system.
- Simplified this Makefile: the target all now directly refers to
  src/Module.symvers. Removed the phony target Module.symvers.
- An error message is now printed if OFED has been built with srpt=y.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@817 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-05-02 12:38:33 +00:00
Bart Van Assche
19ab352393 Made building against OFED more robust.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@815 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-05-01 19:12:14 +00:00
Bart Van Assche
8f7f3d64cc Added support for compiling scst-srpt on a system where the OFED InfiniBand
kernel modules have been installed.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@814 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-05-01 09:24:47 +00:00
Vladislav Bolkhovitin
643c7ab2d1 Patch from Ruben Laban <r.laban@ism.nl>:
I replaced all occurences of DISTDIR with DESTDIR and also introduced SBINDIR (and friends) to some other Makefiles. 



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@719 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-03-25 19:33:10 +00:00
Vu Pham
44f54e2625 srpt: converting makefile back to compile in scst tree
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@457 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2008-07-11 16:32:48 +00:00
Vu Pham
0019c43728 srpt:
- changing Makefile to compile srpt out-of scst tree and in release mode
 - fixing checkpath warnings for kernel inclusion


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@450 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2008-07-10 00:04:49 +00:00
Vladislav Bolkhovitin
cf53d51733 - In "extraclean" target new autogenerated files added
- Don't automatically build iscsi-scst-adm anymore until it will be fixed


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@368 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2008-05-13 17:18:07 +00:00
Vladislav Bolkhovitin
240d5511be Patch from Vu Pham <vuhuong@mellanox.com>: SRP target driver
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@304 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2008-03-17 11:29:50 +00:00