the following effect:
- Exclude the put_page_callback patch.
- Enable #define GENERATING_UPSTREAM_PATCH.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1217 d57e44dd-8a1f-0410-8b47-8ef2f437770f
in patch order between the systems on which this script is run. Since the
applied changes did not have any effect, I'm reverting this commit.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1203 d57e44dd-8a1f-0410-8b47-8ef2f437770f
- Moved qla2x00t patch generation code from qla2x00t/Makefile to
qla2x00t/extract-qla2xxx-orig and qla2x00t/generate-in-tree-patches.
Restored qla2x00t/Makefile to r1104.
- scripts/run-regression-tests now passes the full kernel version (including
patch level) to scripts/generate-kernel-patch.
- scripts/generate-kernel-patch can now generate patches for the files
in drivers/scsi/qla2xxx for any kernel version instead of only 2.6.26.8.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1198 d57e44dd-8a1f-0410-8b47-8ef2f437770f
follows:
- Building the QLogic target driver is possible by following the instructions
in qla2x00t/qla2x00-target/README.
- Some but not all of the qla2x00-target code is included in the output of
scripts/generate-kernel-patch. This is unfortunate because it is the output
of this script that is posted to the LKML each time SCST is submitted for
review.
- Most of the qla2x00-target code is checked during the nightly build by
checkpatch. None of the qla2x00-target code is checked during the nightly
build by sparse.
The patch below makes sure that all of the qla2x00-target code is included in
the generate-kernel-patch output and also that all of the qla2x00-target code
is checked during the nightly build by both checkpatch and sparse. This has
been realized by including the diff of the linux-2.6.26.8/drivers/scsi/qla2xxx
source files and the source files in qla2x00t/*[ch] as individual patches under
qla2x00t/in-tree-patches. These patches are generated from downloaded
linux-2.6.26.8 sources and the sources in the SCST SVN repository.
The next step is to fix the checkpatch and sparse warnings triggered by the
qla2x00-target code and to port the latest qla2xxx patches to the SCST
qla2x00t implementation.
Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1189 d57e44dd-8a1f-0410-8b47-8ef2f437770f
- 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
- Left out iscsi_scst_itf_ver.h since it is a generated file.
- README.qla2x00t has been put in a separate patch, qla2x00t-doc.diff.
- scst_proc.diff has been scst_core.diff.
- scst_vdisk.diff has been split from scst_dev_handlers.diff.
- scst_dev_handlers.diff has been renamed into scst_passthrough.diff.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@611 d57e44dd-8a1f-0410-8b47-8ef2f437770f
included in the generated patch output.
- Added command-line option -p <patchdir>, which allows to generate a
set of patches instead of one big patch.
- New feature: by setting the environment variable SIGNED_OFF_BY, the
Signed-off-by line is filled in.
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@600 d57e44dd-8a1f-0410-8b47-8ef2f437770f
- Add a dummy Signed-off-by line to the generated patch, such that checkpatch
doesn't complain that it's missing.
- Sort the names of source files (through ls) before using these, such that
the generated patch is the same during each run.
- Fixed a bug in #elif handling (this bug is not triggered by the current SCST
code).
This patch has been tested by comparing the output of the old and the new
generate-kernel-patch script.
Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@530 d57e44dd-8a1f-0410-8b47-8ef2f437770f
- Converted tabs to spaces in the help text.
- Removed command-line option '-s' -- the srpt driver is now always included.
- Recognizes now both kernel versions with three components (x.y.z) and kernel
versions with four components (x.y.z.p).
- Empty files for Kconfig and Makefile are added for those components that are
not included in the kernel patch, such that make allyesconfig
/ make allmodconfig keeps working.
Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@528 d57e44dd-8a1f-0410-8b47-8ef2f437770f
vanilla Linux kernel version. When I submitted this script for inclusion in the
SCST Subversion repository the SRPT target driver was excluded by default
because of checkpatch errors triggered by the SRPT source code. These errors
have been fixed considerable time ago. Hence the patch below makes inclusion
of the SRPT driver the default.
This patch has been tested by verifying that the generated patch still applies
cleanly to the 2.6.25.17 kernel, and that the patched kernel still compiles cleanly.
Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@511 d57e44dd-8a1f-0410-8b47-8ef2f437770f
- The script specialize-patch now acts as if #define INSIDE_KERNEL_TREE 1
is effective.
- The script generate-kernel-patch now renames sBUG_ON() into BUG_ON()
and sBUG() into BUG(). The same script removes the definitions of the
sBUG_ON(), sBUG() and WARN_ON_ONCE() macro's from the header file
scst_debug.h. The last macro is only removed for kernel versions later than
2.6.19.
This patch has been tested as follows:
- Compared the output of the command "scripts/generate-kernel-patch 2.6.25"
before and after the changes.
- Verified the newly generated patch with checkpatch. Checkpatch statistics
are now as follows:
521 WARNING: line over 80 characters
12 WARNING: consider using strict_strtoul in preference to simple_strtoul
10 WARNING: printk() should include KERN_ facility level
3 WARNING: CVS style keyword markers, these will _not_ be updated
2 WARNING: do not add new typedefs
1 WARNING: Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt
- Verified that the generated kernel patch still applies cleanly to the
2.6.25.10 kernel and that this kernel still compiles, installs and boots fine.
Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@445 d57e44dd-8a1f-0410-8b47-8ef2f437770f
The patch adds command-line options -m and -q to the script
generate-kernel-patch. These command line options make it possible to
choose at the time the script is invoked whether or not to include the
qla2x00t and/or mpt code in the generated kernel patch.
Please review.
Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>
Index: scripts/generate-kernel-patch
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@390 d57e44dd-8a1f-0410-8b47-8ef2f437770f
The patch below implements the following changes:
- Make sure the output of the make command does not appear in the generated
kernel patch.
- Changed interpreter of scripts/specialize-patch from /usr/bin/gawk to
/usr/bin/awk in order to make sure this awk script also runs on systems
where awk is installed but not gawk.
- Added an extra evaluation rule such that expressions like (0) are rewritten
as 0.
- Fixed a spelling error.
- Expressions that can only be partially evaluated are now partially evaluated.
E.g. #if defined(EXTRACHECKS) && (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
becomes #if defined(EXTRACHECKS) && 0 in the output.
- Code between #if 0 / #endif or #if 1 / #endif is included in the generated
kernel patch, including the surrounding preprocessor directives.
- Preprocessor statements with spaces behind # are now recognized (e.g. "# if").
- Expression evaluator now supports ! (logical not) and () (braces).
- #elif is now evaluated correctly.
- Nested #if / #elif / #else / #endif are now interpreted correctly.
Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@385 d57e44dd-8a1f-0410-8b47-8ef2f437770f
The patch below contains a script that removes C preprocessor tests on the
LINUX_VERSION_CODE macro, depending on the kernel version that was passed as
an argument to that script. Furthermore, the generate-kernel-patch script has
been modified such that its output is filtered by the specialize-patch script.
This eliminates another class of checkpatch errors.
Note: due to the way the specialize-patch script is implemented, #if 0 and
#if 1 statements are also processed.
The patch below has been verified as follows:
- Checked that checkpatch does no longer complain about LINUX_VERSION_CODE
on the generated patch.
- Checked that the generated kernel patch applies cleanly to the 2.6.25.4
kernel.
- Checked that the patched kernel compiles and installs cleanly, and that
after reboot it was possible to load the iscsi-scst and ib_srpt kernel modules.
I will wait with sending more patches until this and the previous two patches
have been reviewed and/or applied.
Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@384 d57e44dd-8a1f-0410-8b47-8ef2f437770f
The patch below implements the following changes:
- Fixes the remaining warnings reported by checkpatch.pl with regard to the use
of whitespace in C code.
- Adds double qoutes around some #warning messages, such that checkpatch.pl
does no longer try to interprete the text behind the #warning preprocessor
directive.
- Adds an extra conversion to the generate-kernel-patch script that removes
the single space from before goto-labels while generating the kernel patch.
This patch has been tested as follows:
- Verified that svn diff -x -w only shows changes in the #warning preprocessor directives.
- Verified the output of svn diff by reading it.
- Verified that checkpatch.pl does no longer complain on the use of whitespace
(searched through the checkpatch.pl output for the text ' space').
- Verified that the patch generated by the generate-kernel-patch script still
applies cleanly to the 2.6.24 kernel, and that the patched kernel still compiles cleanly.
Please let me know if I have to resubmit parts of this patch to other SCST authors.
Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@381 d57e44dd-8a1f-0410-8b47-8ef2f437770f
I don't know when this was broken, but with the current SVN version, after
having generated and applied a kernel patch for SCST, iscsi-scst doesn't
build anymore. The patch below fixes this and also includes a cleanup patch
for the generate-kernel-patch'>generate-kernel-patch script. The generated kernel patch has been
tested with the 2.6.24 and 2.6.25.4 kernels (extracted kernel sources +
applied patch + built kernel + installed kernel + reboot + load SCST
modules).
Signed-off-by: <bart.vanassche@gmail.com>
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@375 d57e44dd-8a1f-0410-8b47-8ef2f437770f
By this time I have reworked the update of scripts/generate-kernel-patch'>scripts/generate-kernel-patch.
These are the changes that were already present in version 1 of this patch
and that have been kept in this patch:
- The SCST code has been moved from drivers/scsi/scsi_tgt to drivers/scst.
- Moved SCST header files from include/scsi_tgt to include/scst.
- Added iscsi-scst in drivers/scst/iscsi-scst.
For the time being the generate-kernel-patch does no longer try to add the
qla2x00t driver in drivers/scst/qla2x00-target -- I have not yet been able to
figure out how to get qla2x00t/qla2x00-target compiled without the initiator
code.
Just as in version 1 of this patch, the following files in the Subversion
repository have been renamed to reflect the above changes:
- Renamed scst/kernel/in-tree/Makefile.scsi.Linux-2.6.24.patch'>scst/kernel/in-tree/Makefile.scsi.Linux-2.6.24.patch to
scst/kernel/in-tree/Makefile.drivers.Linux-2.6.24.patch'>scst/kernel/in-tree/Makefile.drivers.Linux-2.6.24.patch.
- Renamed Kconfig'>scst/kernel/in-tree/Kconfig.scsi.Linux-2.6.24.patch to
scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.24.patch'>scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.24.patch.
- Renamed scst/kernel/in-tree/Makefile.scsi_tgt'>scst/kernel/in-tree/Makefile.scsi_tgt to
scst/kernel/in-tree/Makefile.scst'>scst/kernel/in-tree/Makefile.scst.
- Renamed scst/kernel/in-tree/Kconfig.scsi_tgt'>scst/kernel/in-tree/Kconfig.scsi_tgt to
scst/kernel/in-tree/Kconfig.scst'>scst/kernel/in-tree/Kconfig.scst.
Because of the above changes the include path specified in the following
Makefiles had to be changed:
- scst/kernel/in-tree/Makefile.dev_handlers'>scst/kernel/in-tree/Makefile.dev_handlers
- srpt/src/Makefile.in_kernel'>srpt/src/Makefile.in_kernel
Other changes:
- I have added menu/endmenu entries in file scst/kernel/in-tree/Kconfig.scst
such that the SCST entries become visible when running make xconfig or make
menuconfig.
- Elaborated the SCST help texts a little bit (in file
scst/kernel/in-tree/Kconfig.scst).
New in version 2 of this patch:
- Moved remaining patches in the generate-kernel-patch script to separate
files.
- Added support for the 2.6.25 kernel.
This patch has been tested as follows:
mkdir -p tmp
cd tmp
rm -rf linux-2.6.25.3 /lib/modules/2.6.25.3-scst
tar xjf ~vanasscb/software/downloads/linux-2.6.25.3.tar.bz2
cd linux-2.6.25.3
cp ../.config-2.6.25 .
(cd ~vanasscb/software/scst
&& ~vanasscb/software/scst/scripts/generate-kernel-patch \
2.6.25) | patch -p1
make oldconfig
diff ../.config .
make xconfig
make menuconfig
make -j5 bzImage modules
make modules_install install
cp -r /lib/firmware/$(uname -r) /lib/firmware/2.6.25.3-scst
update-initramfs -k 2.6.25.3-scst -c
reboot
modprobe iscsi-scst
modprobe ib_srpt
lsmod | grep -E 'scst|ib_srpt'
dmesg
Signed-off-by: bart.vanassche@gmail.com
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@373 d57e44dd-8a1f-0410-8b47-8ef2f437770f
The script generate-kernel-patch generates a kernel tree based on the sources
and the in-tree kernel patches in the SCST Subversion repository. When I
submitted the first version of the generate-kernel-patch script most but not
all in-tree patches were present as separate files in the SCST Subversion
repository. The patch below moves the two remaining patches that are contained
inline in the generate-kernel-patch script to separate files. This should
make it possible to use the script on future Linux kernels without having to
modify the script itself. The patch below does not contain functional
changes, it only moves two patches out of the script.
Modified:
* scripts/generate-kernel-patch'>scripts/generate-kernel-patch
Added:
* srpt/src/Makefile.infiniband.Linux-2.6.24.patch'>srpt/src/Makefile.infiniband.Linux-2.6.24.patch
* srpt/src/Kconfig.infiniband.Linux-2.6.24.patch'>srpt/src/Kconfig.infiniband.Linux-2.6.24.patch
Also Makefile and Kconfig files were renamed (".drivers." was replaced by ".scsi.")
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@369 d57e44dd-8a1f-0410-8b47-8ef2f437770f
- Added Makefile.scsi.Linux-2.6.24.patch and Kconfig.scsi.Linux-2.6.24.patch
- Updated Makefile.scsi_tgt to reflect move of the SCST device handlers from scst/src/ to scst/src/dev_handlers/
- Added Makefile.dev_handlers
- SCST include path fixed in srpt/ Makefile.in_kernel
- Added script for converting the SCST source tree to a kernel patch. More comment on it:
The SCST source tree as it exists in the current Subversion repository will
have to be maintained for some time. And if SCST is submitted for inclusion
in the mainline kernel, this tree will have to be converted to a kernel
patch, reviewer comments will have to be processed, and the patch will have
to be resubmitted. So it's convenient to have a script available that
converts the Subversion source tree into a kernel patch. The patch below does
just that: convert the scst and srpt directories into a kernel patch
(iscsi-scst support will be added later on). I have tested the script
contained in the patch below as follows:
rm -rf linux-2.6.24
rm -rf /lib/modules/2.6.24-scst
tar xjf ~vanasscb/software/downloads/linux-2.6.24.tar.bz2
cd linux-2.6.24
cp ../.config .
(cd ~vanasscb/software/scst
&& ~vanasscb/software/scst/scripts/generate-kernel-patch \
2.6.24) | patch -p1
make -j5 bzImage modules && make modules_install install
cp -r /lib/firmware/$(uname -r) /lib/firmware/2.6.24-scst
update-initramfs -k 2.6.24-scst -c
reboot
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@366 d57e44dd-8a1f-0410-8b47-8ef2f437770f
