mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-19 03:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-12-03 21:10:07 -08:00
parent 62d1fbc579 d39337637c
commit d1fbadc009
10 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SVN_TAGS
View File

@@ -26,4 +26,4 @@ SRPT 1.0.0 450
3.3.x branch start 7225, which is a copy of trunk r7224
3.3.0 7830 on the 3.3.x branch
3.4.x branch start 8675, which is a copy of trunk r8674
3.4.0 8674 on the trunk
3.4.0 8681 on the trunk

2
doc/scst_user_spec.sgml
View File

@@ -10,7 +10,7 @@ SCST user space device handler interface description
<name>Vladislav Bolkhovitin</name>
</author>
<date>Version 3.2.0</date>
<date>Version 3.4.0</date>
<toc>

2
iscsi-scst/README
View File

@@ -1,7 +1,7 @@
iSCSI SCST target driver
========================
Version 3.4.0, 02 December 2019
Version 3.4.0, 03 December 2019
----------------------------
ISCSI-SCST is a deeply reworked fork of iSCSI Enterprise Target (IET)

7
iscsi-scst/kernel/isert-scst/isert.c
View File

@@ -515,8 +515,9 @@ out:
MODULE_AUTHOR("Yan Burman");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_IMPORT_NS(SCST);
MODULE_DESCRIPTION("iSER target transport driver v3.0.1-pre#"
__stringify(OFED_FLAVOR));
#define DRV_VERSION "3.4.0" "#" __stringify(OFED_FLAVOR)
#define DRV_RELDATE "03 December 2019"
MODULE_DESCRIPTION("iSER target transport driver "
"v" DRV_VERSION " (" DRV_RELDATE ")");
module_init(isert_init_module);
module_exit(isert_cleanup_module);

2
qla2x00t/qla2x00-target/README
View File

@@ -1,7 +1,7 @@
Target driver for QLogic 2[2-6]xx/8[1-3]xx Fibre Channel cards
==============================================================
Version 3.4.0, 02 December 2019
Version 3.4.0, 03 December 2019
----------------------------
This is target driver for QLogic 2[2-6]xx/8[1-3]xx Fibre Channel cards.

6
scripts/update-version
View File

@@ -17,11 +17,11 @@ suffix=$4
fv=$major.$minor.$release$suffix
reldate=$(date "+%d %B %Y")
sed -i "s,^\(#define[[:blank:]]*\(FT_VERSION\|ISCSI_VERSION_STRING\|Q2T_VERSION_STRING\|SCST_LOCAL_VERSION\|SCST_VERSION_NAME\|DRV_VERSION\|VERSION_STR\)[[:blank:]]*\)\"[^\"]*\",\1\"$major.$minor.$release$suffix\"," scst_local/scst_local.c srpt/src/ib_srpt.c fcst/fcst.h iscsi-scst/include/iscsi_scst_ver.h qla2x00t/qla2x00-target/qla2x00t.h scst/include/scst_const.h usr/include/version.h
sed -i "s,^\(#define[[:blank:]]*\(FT_VERSION\|ISCSI_VERSION_STRING\|Q2T_VERSION_STRING\|SCST_LOCAL_VERSION\|SCST_VERSION_NAME\|DRV_VERSION\|VERSION_STR\)[[:blank:]]*\)\"[^\"]*\",\1\"$major.$minor.$release$suffix\"," iscsi-scst/kernel/isert-scst/isert.c scst_local/scst_local.c srpt/src/ib_srpt.c fcst/fcst.h iscsi-scst/include/iscsi_scst_ver.h qla2x00t/qla2x00-target/qla2x00t.h scst/include/scst_const.h usr/include/version.h
sed -i "s,^\(<date>Version[[:blank:]]*\)[^[:blank:]]*\(</date>\),\1$fv\2," doc/scst_user_spec.sgml
sed -i "s/^Version .*/Version $fv, $reldate/" iscsi-scst/README qla2x00t/qla2x00-target/README scst/README usr/fileio/README
sed -i "s/^\(\(static const char \*scst_local_version_date\|#define[[:blank:]]*DRV_RELDATE\)[[:blank:]]*\)\"[^\"]*\"/\1\"$reldate\"/" scst_local/scst_local.c srpt/src/ib_srpt.c
sed -i "s/^\(\(static const char \*scst_local_version_date\|#define[[:blank:]]*DRV_RELDATE\)[[:blank:]]*\)\"[^\"]*\"/\1\"$reldate\"/" iscsi-scst/kernel/isert-scst/isert.c scst_local/scst_local.c srpt/src/ib_srpt.c
sed -i "s/^\(#define[[:blank:]]*[^[:blank:]]*_REV[[:blank:]]*\)\"[[:blank:]0-9]*\"/\1\"$(printf "%-4s" ${major}${minor}${release})\"/" usr/fileio/common.h scst/src/dev_handlers/scst_vdisk.c
sed -i "s/^\(#define[[:blank:]]*SCST_VERSION_CODE[[:blank:]]*\).*/\1SCST_VERSION($major, $minor, $release, 0)/" scst/include/scst.h
sed -i "s/^\(#define[[:blank:]]*Q2T_VERSION_CODE[[:blank:]]*\).*/\1Q2T_VERSION($major, $minor, $release, 0)/" qla2x00t/qla2x00-target/qla2x00t.h
sed -i "s/^\(.Version[[:blank:]]*=[[:blank:]]*'SCST Configurator v\)[0-9.]*/\1$fv/" scstadmin/scstadmin.sysfs/scstadmin
sed -i "s/^\(my .Version[[:blank:]]*=[[:blank:]]*'SCST Configurator v\)[^']*/\1$fv/" scstadmin/scstadmin.sysfs/scstadmin

2
scst/README
View File

@@ -1,7 +1,7 @@
Generic SCSI target mid-level for Linux (SCST)
==============================================
Version 3.4.0, 02 December 2019
Version 3.4.0, 03 December 2019
----------------------------
SCST is designed to provide unified, consistent interface between SCSI

2
scstadmin/scstadmin.sysfs/scstadmin
View File

@@ -3,7 +3,7 @@
use strict;
use warnings;
my $Version = 'SCST Configurator v3.3.0-pre1';
my $Version = 'SCST Configurator v3.4.0';
# Configures SCST
#

4
srpt/src/ib_srpt.c
View File

@@ -63,8 +63,8 @@
/* Name of this kernel module. */
#define DRV_NAME "ib_srpt"
#define DRV_VERSION "3.4.0" __stringify(OFED_FLAVOR)
#define DRV_RELDATE "02 December 2019"
#define DRV_VERSION "3.4.0" "#" __stringify(OFED_FLAVOR)
#define DRV_RELDATE "03 December 2019"
#if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)
/* Flags to be used in SCST debug tracing statements. */
#define DEFAULT_SRPT_TRACE_FLAGS (TRACE_OUT_OF_MEM | TRACE_MINOR \

2
usr/fileio/README
View File

@@ -1,7 +1,7 @@
User space FILEIO handler
=========================
Version 3.4.0, 02 December 2019
Version 3.4.0, 03 December 2019
----------------------------
User space program fileio_tgt uses interface of SCST's scst_user dev