From 09edff95e3f9d55dbb2e46cfbc69ac490b3e0f6c Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 4 Dec 2019 04:54:05 +0000 Subject: [PATCH 1/6] isert-scst: Bump the version number git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8677 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/isert-scst/isert.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/iscsi-scst/kernel/isert-scst/isert.c b/iscsi-scst/kernel/isert-scst/isert.c index 3af86018f..7188cc8e7 100644 --- a/iscsi-scst/kernel/isert-scst/isert.c +++ b/iscsi-scst/kernel/isert-scst/isert.c @@ -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 "02 December 2019" +MODULE_DESCRIPTION("iSER target transport driver " + "v" DRV_VERSION " (" DRV_RELDATE ")"); module_init(isert_init_module); module_exit(isert_cleanup_module); From 4c409a4b756acced6daf160438b3e4f44ae35d0d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 4 Dec 2019 04:54:29 +0000 Subject: [PATCH 2/6] ib_srpt: Tweak the version number formatting git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8678 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/src/ib_srpt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index 601e2cd5f..cba8fede4 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -63,7 +63,7 @@ /* Name of this kernel module. */ #define DRV_NAME "ib_srpt" -#define DRV_VERSION "3.4.0" __stringify(OFED_FLAVOR) +#define DRV_VERSION "3.4.0" "#" __stringify(OFED_FLAVOR) #define DRV_RELDATE "02 December 2019" #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) /* Flags to be used in SCST debug tracing statements. */ From 7fec3457f63c0e7ae9672dcfcbe45e7a905832c5 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 4 Dec 2019 04:55:30 +0000 Subject: [PATCH 3/6] scripts/update-version: Also update the iSERt version number git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8679 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/update-version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update-version b/scripts/update-version index ab2310ccc..ac4fa79ef 100755 --- a/scripts/update-version +++ b/scripts/update-version @@ -17,10 +17,10 @@ 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,^\(Version[[:blank:]]*\)[^[:blank:]]*\(\),\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 From 447d25f678a65bdaf00befa230aa8db64e8cc02d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 4 Dec 2019 05:00:24 +0000 Subject: [PATCH 4/6] scstadmin: Bump version number git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8680 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/scstadmin.sysfs/scstadmin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin index c64f965ee..aea2e657a 100755 --- a/scstadmin/scstadmin.sysfs/scstadmin +++ b/scstadmin/scstadmin.sysfs/scstadmin @@ -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 # From fa156aa40d0ae910c3a9960a8fb4992b97d44107 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 4 Dec 2019 05:00:49 +0000 Subject: [PATCH 5/6] scripts/update-version: Fix the code for updating the scstadmin version number git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8681 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- doc/scst_user_spec.sgml | 2 +- iscsi-scst/README | 2 +- iscsi-scst/kernel/isert-scst/isert.c | 2 +- qla2x00t/qla2x00-target/README | 2 +- scripts/update-version | 2 +- scst/README | 2 +- srpt/src/ib_srpt.c | 2 +- usr/fileio/README | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/scst_user_spec.sgml b/doc/scst_user_spec.sgml index 75f601928..288461d68 100644 --- a/doc/scst_user_spec.sgml +++ b/doc/scst_user_spec.sgml @@ -10,7 +10,7 @@ SCST user space device handler interface description Vladislav Bolkhovitin -Version 3.2.0 +Version 3.4.0 diff --git a/iscsi-scst/README b/iscsi-scst/README index 17d906e73..696917ebd 100644 --- a/iscsi-scst/README +++ b/iscsi-scst/README @@ -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) diff --git a/iscsi-scst/kernel/isert-scst/isert.c b/iscsi-scst/kernel/isert-scst/isert.c index 7188cc8e7..8636fcb26 100644 --- a/iscsi-scst/kernel/isert-scst/isert.c +++ b/iscsi-scst/kernel/isert-scst/isert.c @@ -516,7 +516,7 @@ MODULE_AUTHOR("Yan Burman"); MODULE_LICENSE("Dual BSD/GPL"); MODULE_IMPORT_NS(SCST); #define DRV_VERSION "3.4.0" "#" __stringify(OFED_FLAVOR) -#define DRV_RELDATE "02 December 2019" +#define DRV_RELDATE "03 December 2019" MODULE_DESCRIPTION("iSER target transport driver " "v" DRV_VERSION " (" DRV_RELDATE ")"); module_init(isert_init_module); diff --git a/qla2x00t/qla2x00-target/README b/qla2x00t/qla2x00-target/README index 585c57192..69a6ffb06 100644 --- a/qla2x00t/qla2x00-target/README +++ b/qla2x00t/qla2x00-target/README @@ -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. diff --git a/scripts/update-version b/scripts/update-version index ac4fa79ef..ff57e280b 100755 --- a/scripts/update-version +++ b/scripts/update-version @@ -24,4 +24,4 @@ sed -i "s/^\(\(static const char \*scst_local_version_date\|#define[[:blank:]]*D 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 diff --git a/scst/README b/scst/README index 4e8280b4f..1e8f2bffb 100644 --- a/scst/README +++ b/scst/README @@ -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 diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index cba8fede4..465286441 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -64,7 +64,7 @@ /* 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_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 \ diff --git a/usr/fileio/README b/usr/fileio/README index b706c0ade..972f8c14a 100644 --- a/usr/fileio/README +++ b/usr/fileio/README @@ -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 From d39337637c9db14eb29f4f3713280c2097905275 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 4 Dec 2019 05:09:52 +0000 Subject: [PATCH 6/6] SVN_TAGS: Update git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8682 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- SVN_TAGS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SVN_TAGS b/SVN_TAGS index 155df1dbf..94c9b3263 100644 --- a/SVN_TAGS +++ b/SVN_TAGS @@ -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