Commit Graph

61 Commits

Author SHA1 Message Date
Yan Burman
20a36529b9 Merged revisions 5906-5909,5911,5915-5927,5930 via svnmerge from
svn+ssh://yanb123@svn.code.sf.net/p/scst/svn/branches/3.0.x

........
  r5906 | bvassche | 2014-12-03 19:12:20 +0200 (Wed, 03 Dec 2014) | 1 line
  
  Update for kernel 3.17 (merge r5882 from trunk)
........
  r5907 | bvassche | 2014-12-03 19:13:06 +0200 (Wed, 03 Dec 2014) | 1 line
  
  Add kernel 3.17 build infrastructure (merge r5883 from trunk)
........
  r5908 | bvassche | 2014-12-03 19:14:42 +0200 (Wed, 03 Dec 2014) | 1 line
  
  scripts: Merge 5827:5907 from trunk
........
  r5909 | bvassche | 2014-12-03 19:41:09 +0200 (Wed, 03 Dec 2014) | 1 line
  
  Build fixes for RHEL 6.6 kernel 2.6.32-504 (merge r5908 from trunk)
........
  r5911 | bvassche | 2014-12-04 14:14:44 +0200 (Thu, 04 Dec 2014) | 1 line
  
  scripts/generate-kernel-patch: Swap two filters (merge r5910 from trunk)
........
  r5915 | bvassche | 2014-12-05 12:01:49 +0200 (Fri, 05 Dec 2014) | 1 line
  
  iscsi-scst/kernel/patches/rhel/put_page_callback-2.6.32-504.patch: Add (merge r5904 from trunk)
........
  r5916 | bvassche | 2014-12-05 12:22:05 +0200 (Fri, 05 Dec 2014) | 1 line
  
  nightly: Merge r5720:5915 from trunk
........
  r5917 | bvassche | 2014-12-05 12:30:54 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst_lib: Fix READ POSITION parsing (merge r5740 from trunk)
........
  r5918 | bvassche | 2014-12-05 12:33:22 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst: Clean up __scst_resume_activity() (merge r5589 from trunk)
........
  r5919 | bvassche | 2014-12-05 12:49:20 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scstadmin regression tests: Merge r5475:5915 from trunk
........
  r5920 | bvassche | 2014-12-05 12:50:41 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scstadmin: Sync saved configuration files (merge r5793 from trunk)
........
  r5921 | bvassche | 2014-12-05 12:57:03 +0200 (Fri, 05 Dec 2014) | 1 line
  
  ib_srpt: Speed up kernel driver unloading after a cable pull (merge r5727 from trunk)
........
  r5922 | bvassche | 2014-12-05 14:24:23 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst_local: Avoid that session deletion triggers a kernel warning (merge r5601 and 5631 from trunk)
........
  r5923 | bvassche | 2014-12-05 14:25:46 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst_local: Set max_id to 1 (merge r5786 from trunk)
........
  r5924 | bvassche | 2014-12-05 14:55:32 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst: Add 64-bit LUN support (kernel 3.17 - merge r5587 from trunk)
........
  r5925 | bvassche | 2014-12-05 14:56:59 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst_local: Add 64-bit LUN support (kernel 3.17 - merge r5588 from trunk)
........
  r5926 | bvassche | 2014-12-05 14:59:32 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst: Remove unused variables (merge r5585 from trunk)
........
  r5927 | bvassche | 2014-12-05 15:01:57 +0200 (Fri, 05 Dec 2014) | 1 line
  
  scst: Avoid complaints about unused variables (merge r5600 from trunk)
........
  r5930 | bvassche | 2014-12-09 14:34:50 +0200 (Tue, 09 Dec 2014) | 1 line
  
  rpm build: Add support for qla2x00t driver in QLogic git repository (merge r5929 from trunk)
........


git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x-iser@5992 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-01-28 09:11:06 +00:00
Bart Van Assche
ead35aa554 scripts/specialize-patch: Rework r5405
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5406 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-04-04 05:50:52 +00:00
Bart Van Assche
366970312c scripts/specialize-patch: Handle numbers surrounded by parentheses properly
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5405 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2014-04-04 04:38:33 +00:00
Bart Van Assche
69b6db5f43 scripts/specialize-patch: Add support for shift operator in preprocessor expressions
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4933 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2013-08-03 18:05:18 +00:00
Bart Van Assche
154cc8aa87 scripts/specialize-patch: Expand RHEL_RELEASE_VERSION()
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4803 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2013-03-16 11:37:39 +00:00
Bart Van Assche
f331a6e234 scripts/specialize-patch: Introduce [[:blank:]]
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4802 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2013-03-16 11:35:32 +00:00
Bart Van Assche
e8f04d3f1c scripts/specialize-patch: Avoid that joining two lines generates a space in front of a tab.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4379 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2012-06-27 05:30:53 +00:00
Bart Van Assche
20f64c4e7e regtests: Fix a copy/paste bug in the #if ... partial evaluation code
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3930 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-11-17 10:36:03 +00:00
Bart Van Assche
d554d56423 scripts/specialize-patch: Make sure that checkpatch doesn't complain about space after operator \!
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3812 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-08-16 12:22:31 +00:00
Bart Van Assche
78d62e7dd1 scripts/specialize-patch: Only emit "g1" debug output if debugging has been enabled.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3810 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-08-16 11:48:48 +00:00
Bart Van Assche
9455613488 scripts/specialize-patch: Update comments next to #else and #endif directives.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3809 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-08-16 11:26:59 +00:00
Bart Van Assche
8f48d8d7e9 Follow-up for r3807: make the hunk headers match again.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3808 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-08-16 08:32:23 +00:00
Bart Van Assche
803bae6fb8 scripts/specialize-patch: Remove #elif 0 sections from the output
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3807 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-08-16 07:47:32 +00:00
Bart Van Assche
dbc55781d7 Add remaining Linux kernel 3.0 patches and port nightly build scripts to 3.0 too.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3783 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-07-27 14:05:47 +00:00
Bart Van Assche
fb9ea53977 Expand CONFIG_SCST_PROC too.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3433 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-05-01 09:14:06 +00:00
Bart Van Assche
e40875d9b9 specialize-patch: Generalized a pattern.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3188 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2011-01-05 13:12:14 +00:00
Bart Van Assche
5fe037e5b9 Updated my e-mail address in copyright statements and README files.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3175 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-12-21 18:48:14 +00:00
Bart Van Assche
e66128f414 Added yet another pattern to the preprocessor statement partial evaluation engine.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2709 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-11-14 16:16:15 +00:00
Bart Van Assche
a9663949f0 Patch generation scripts: Fixed a typo.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2669 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-11-11 14:50:37 +00:00
Bart Van Assche
91aec29858 svn merge -r2369:2520 https://scst.svn.sourceforge.net/svnroot/scst/branches/ibmvstgt-port/scripts
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2521 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-10-31 10:54:36 +00:00
Bart Van Assche
9c20ed6584 Process tabs properly.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2432 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-10-21 14:06:51 +00:00
Bart Van Assche
6e152a3be1 #elif handling should now really be correct.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2362 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-10-06 20:26:38 +00:00
Bart Van Assche
89a2090064 Fixed a bug in #elif handling.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2361 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-10-06 19:58:06 +00:00
Bart Van Assche
507b7f0ae7 Reverted recently introduced #if/#elif handling changes because these were wrong.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2286 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-09-27 09:36:10 +00:00
Bart Van Assche
ad27ac341d patch header parsing bug fix.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2280 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-09-26 10:40:53 +00:00
Bart Van Assche
c9ad2e7a7b Changes:
- Process #elif directives correctly (doesn't affect the current SCST source code).
- Do not remove double blank lines from documentation files.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2278 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-09-26 09:37:27 +00:00
Bart Van Assche
e99d621185 Fixed bug in handling of #else statements matching an #if statement that could
be evaluated partially.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2265 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-09-25 09:16:26 +00:00
Bart Van Assche
9ece28c4f5 Added an additional expression to the list of recognized expressions.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2261 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-09-24 20:44:02 +00:00
Bart Van Assche
82b810f2ad Remove /* #define CONFIG_SCST_PROC */ from the input.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2104 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-09-12 08:07:28 +00:00
Bart Van Assche
2aa9e1d69a Bug fix: substitute CONFIG_SCST_PROC properly.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2103 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-09-12 07:49:54 +00:00
Bart Van Assche
0f4411d273 Added support for operator != (not equal to). Undefine CONFIG_SUSE_KERNEL.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2084 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-09-10 07:35:58 +00:00
Bart Van Assche
0ff36ae2e2 Unbreak the nightly build after the procfs to sysfs switch.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2047 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-09-04 08:17:55 +00:00
Bart Van Assche
a504344cee Bug fix: process undefined RHEL_MAJOR / RHEL_MINOR macros properly.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1909 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-08-02 18:25:47 +00:00
Bart Van Assche
12b1d9d57e Changes:
- Process the pattern [01] && defined(...) properly.
- Added command-line option -d (debug) to generate-kernel-patch.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1582 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2010-04-04 13:27:24 +00:00
Bart Van Assche
a907dc6d2e Made sure that all double blank lines are converted into single blank lines.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1293 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-29 13:18:03 +00:00
Bart Van Assche
a068429f5d Delete double blank lines from the input.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1287 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-28 10:54:11 +00:00
Bart Van Assche
9d89f0a77f Updated copyright statement.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1277 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-25 13:27:17 +00:00
Bart Van Assche
0c3c7bc193 run-regression-tests:
- Adding the suffix "-u" to a kernel version will make the tests to be run
  with generate-kernel-patch -u ${kernel_version} instead of
  generate-kernel-patch ${kernel_version}.
generate-kernel-patch:
- sBUG(...) and sBUG_ON(...) are now replaced by BUG(...) and BUG_ON(...)
  respectively.
- Option -n does no longer disable the above substitution.
- Source file scst/src/scst_proc.c is now excluded when option -u is specified.
specialize-patch:
- Replaced variable delete_disabled_code by blank_deleted_lines. While setting
  the former variable had the effect of deleting disabled code, the latter
  has the effect of replacing disabled code by blank lines.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1271 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-25 09:46:40 +00:00
Bart Van Assche
51892c42d8 The generate-kernel-patch option -u does now enable #undef CONFIG_SCST_PROC.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1265 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-24 07:48:44 +00:00
Bart Van Assche
64803db9f1 When command-line option -u is passed to scripts/generate-kernel-patch,
undefine the preprocessor symbol
CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1249 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-22 18:26:19 +00:00
Bart Van Assche
7c9a154e05 Added support for continued lines.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1234 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-21 19:45:35 +00:00
Bart Van Assche
b9528d1407 Added variable generating_upstream_patch_defined. When set to 1, this
variable tells the script specialize-patch to treat the preprocessor
symbol GENERATING_UPSTREAM_PATCH as defined.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1218 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-15 07:14:54 +00:00
Bart Van Assche
45523183e4 Made sure all per-hunk state variables are initialized properly.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1204 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-10-12 17:40:24 +00:00
Bart Van Assche
a003cea218 Do not only remove references of SCSI_EXEC_REQ_FIFO_DEFINED / SCST_IO_CONTEXT
but also their definition.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1077 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-09-06 12:02:49 +00:00
Bart Van Assche
9d4e2f9399 Refinements / bug fixes of the changes introduced in the previous commit:
- Only replace sBUG/sBUG_ON by BUG/BUG_ON when this macro is being used, not
  in its definition.
- Fixed bugs in algorithm for preserving the original code during a sparse run.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1076 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-09-06 11:09:21 +00:00
Bart Van Assche
aaf2ed455d Modified scripts invoked during a regression test run such that the line numbers printed by sparse match those of the SCST source files present in the Subversion repository.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1068 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-09-02 16:42:26 +00:00
Bart Van Assche
d9bc8bbff8 Fixed bug introduced in the previous revision of the specialize-patch
script: empty lines after #if ... #else ... #endif blocks were deleted.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1058 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-08-16 12:18:52 +00:00
Bart Van Assche
8c029b22ec Whether or not SCSI_EXEC_REQ_FIFO_DEFINED and SCST_IO_CONTEXT are defined
does now depend on their definition in the per kernel-version patches.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1053 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-08-14 19:34:55 +00:00
Bart Van Assche
2232922dd9 - The expression "defined(SCST_IO_CONTEXT)" is now replaced by "1".
- The following two lines and the first blank line below are now removed:
  +#define SCSI_EXEC_REQ_FIFO_DEFINED
  +#define SCST_IO_CONTEXT
- Hunks that do no longer contain any modifications because of the 
  previous steps are now removed from the output because patch otherwise
  complains.
- Added support for evaluating expressions containing the arithmetic
  operators *, /, +, -.
- Removed support for partial evaluation of expressions because it is too
  tricky to get this right due to operator precedence.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1047 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-08-14 18:26:58 +00:00
Bart Van Assche
edb8da8616 - Remove the line "+#define SCSI_EXEC_REQ_FIFO_DEFINED" from the generated
patch.
- Substitute "defined(SCSI_EXEC_REQ_FIFO_DEFINED)" by "1" in preprocessor
  statements.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1045 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2009-08-13 18:29:59 +00:00