From 90e883d76b54f93527bc7006a02f27728262c189 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 31 Oct 2018 14:23:26 +0000 Subject: [PATCH 1/3] scripts/update-version: Left-align the *_REV revision numbers in scst_vdisk.c git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7523 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/update-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-version b/scripts/update-version index d35df238d..a17fe0e06 100755 --- a/scripts/update-version +++ b/scripts/update-version @@ -21,7 +21,7 @@ sed -i "s,^\(#define[[:blank:]]*\(FT_VERSION\|ISCSI_VERSION_STRING\|Q2T_VERSION_ 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/^\(#define[[:blank:]]*[^[:blank:]]*_REV[[:blank:]]*\)\"[[:blank:]0-9]*\"/\1\"$(printf "%2d%d%d" $major $minor $release)\"/" usr/fileio/common.h scst/src/dev_handlers/scst_vdisk.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 From 91b99af9143464004741ee254a8b1c2c634da623 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 31 Oct 2018 14:24:20 +0000 Subject: [PATCH 2/3] scst, srpt, iscsi-scst, qla2x00t, fcst: Bump version number to 3.4.0 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7524 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- doc/scst_user_spec.sgml | 2 +- fcst/fcst.h | 2 +- iscsi-scst/README | 2 +- iscsi-scst/include/iscsi_scst_ver.h | 2 +- qla2x00t/qla2x00-target/README | 2 +- qla2x00t/qla2x00-target/qla2x00t.h | 4 ++-- scst/README | 2 +- scst/include/scst_const.h | 2 +- scst_local/scst_local.c | 2 +- scstadmin/scstadmin.sysfs/scstadmin | 2 +- srpt/src/ib_srpt.c | 4 ++-- usr/fileio/README | 2 +- 12 files changed, 14 insertions(+), 14 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/fcst/fcst.h b/fcst/fcst.h index e3a8aa5f8..a0e10ccef 100644 --- a/fcst/fcst.h +++ b/fcst/fcst.h @@ -30,7 +30,7 @@ #define NEW_LIBFC_API #endif -#define FT_VERSION "3.4.0-pre" +#define FT_VERSION "3.4.0" #define FT_MODULE "fcst" #define FT_MAX_HW_PENDING_TIME 20 /* max I/O time in seconds */ diff --git a/iscsi-scst/README b/iscsi-scst/README index 37bd611dd..363233aa0 100644 --- a/iscsi-scst/README +++ b/iscsi-scst/README @@ -1,7 +1,7 @@ iSCSI SCST target driver ======================== -Version 3.4.0, XX XXXXX 2018 +Version 3.4.0, 30 October 2018 ---------------------------- ISCSI-SCST is a deeply reworked fork of iSCSI Enterprise Target (IET) diff --git a/iscsi-scst/include/iscsi_scst_ver.h b/iscsi-scst/include/iscsi_scst_ver.h index ecb9bed4d..9e6a70a87 100644 --- a/iscsi-scst/include/iscsi_scst_ver.h +++ b/iscsi-scst/include/iscsi_scst_ver.h @@ -21,4 +21,4 @@ #define ISCSI_VERSION_STRING_SUFFIX #endif -#define ISCSI_VERSION_STRING "3.4.0-pre1" ISCSI_VERSION_STRING_SUFFIX +#define ISCSI_VERSION_STRING "3.4.0" ISCSI_VERSION_STRING_SUFFIX diff --git a/qla2x00t/qla2x00-target/README b/qla2x00t/qla2x00-target/README index 2235c849e..f84ba6d49 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, XX XXXXX 2018 +Version 3.4.0, 30 October 2018 ---------------------------- This is target driver for QLogic 2[2-6]xx/8[1-3]xx Fibre Channel cards. diff --git a/qla2x00t/qla2x00-target/qla2x00t.h b/qla2x00t/qla2x00-target/qla2x00t.h index bcb22fc14..14294d30d 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.h +++ b/qla2x00t/qla2x00-target/qla2x00t.h @@ -34,8 +34,8 @@ /* Version numbers, the same as for the kernel */ #define Q2T_VERSION(a, b, c, d) (((a) << 030) + ((b) << 020) + (c) << 010 + (d)) -#define Q2T_VERSION_CODE Q2T_VERSION(4, 1, 0, 0) -#define Q2T_VERSION_STRING "3.4.0-pre1" +#define Q2T_VERSION_CODE Q2T_VERSION(3, 4, 0, 0) +#define Q2T_VERSION_STRING "3.4.0" #define Q2T_PROC_VERSION_NAME "version" #define Q2T_MAX_CDB_LEN 16 diff --git a/scst/README b/scst/README index fed367fe1..86c1124f4 100644 --- a/scst/README +++ b/scst/README @@ -1,7 +1,7 @@ Generic SCSI target mid-level for Linux (SCST) ============================================== -Version 3.4.0, XX XXXXX 2018 +Version 3.4.0, 30 October 2018 ---------------------------- SCST is designed to provide unified, consistent interface between SCSI diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h index c4acfa171..382c27518 100644 --- a/scst/include/scst_const.h +++ b/scst/include/scst_const.h @@ -50,7 +50,7 @@ #else #define SCST_VERSION_STRING_SUFFIX #endif -#define SCST_VERSION_NAME "3.4.0-pre1" +#define SCST_VERSION_NAME "3.4.0" #define SCST_VERSION_STRING SCST_VERSION_NAME SCST_VERSION_STRING_SUFFIX #define SCST_CONST_VERSION SCST_CONST_INTF_VER diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c index 5ce4c1a53..2074183f4 100644 --- a/scst_local/scst_local.c +++ b/scst_local/scst_local.c @@ -96,7 +96,7 @@ static unsigned long scst_local_trace_flag = SCST_LOCAL_DEFAULT_LOG_FLAGS; #define scsi_bufflen(cmd) ((cmd)->request_bufflen) #endif -#define SCST_LOCAL_VERSION "3.4" +#define SCST_LOCAL_VERSION "3.4.0" static const char *scst_local_version_date = "20110901"; /* Some statistics */ diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin index eb6c89347..2ff878f13 100755 --- a/scstadmin/scstadmin.sysfs/scstadmin +++ b/scstadmin/scstadmin.sysfs/scstadmin @@ -1,6 +1,6 @@ #!/usr/bin/perl -$Version = 'SCST Configurator v3.3.0-pre1'; +$Version = 'SCST Configurator v3.4.0-pre1'; # Configures SCST # diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index a4b6585f5..da2b8fdd8 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -70,8 +70,8 @@ /* Name of this kernel module. */ #define DRV_NAME "ib_srpt" -#define DRV_VERSION "3.4.0-pre#" __stringify(OFED_FLAVOR) -#define DRV_RELDATE "(not yet released)" +#define DRV_VERSION "3.4.0" __stringify(OFED_FLAVOR) +#define DRV_RELDATE "30 October 2018" #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 403966cac..2daa1757c 100644 --- a/usr/fileio/README +++ b/usr/fileio/README @@ -1,7 +1,7 @@ User space FILEIO handler ========================= -Version 3.4.0, XX XXXXX 2018 +Version 3.4.0, 30 October 2018 ---------------------------- User space program fileio_tgt uses interface of SCST's scst_user dev From 69fde133e90c1034c08bad8a75471d5a77cfe973 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 31 Oct 2018 14:25:52 +0000 Subject: [PATCH 3/3] Revert r7524 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7525 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- doc/scst_user_spec.sgml | 2 +- fcst/fcst.h | 2 +- iscsi-scst/README | 2 +- iscsi-scst/include/iscsi_scst_ver.h | 2 +- qla2x00t/qla2x00-target/README | 2 +- qla2x00t/qla2x00-target/qla2x00t.h | 4 ++-- scst/README | 2 +- scst/include/scst_const.h | 2 +- scst_local/scst_local.c | 2 +- scstadmin/scstadmin.sysfs/scstadmin | 2 +- srpt/src/ib_srpt.c | 4 ++-- usr/fileio/README | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/scst_user_spec.sgml b/doc/scst_user_spec.sgml index 288461d68..75f601928 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.4.0 +Version 3.2.0 diff --git a/fcst/fcst.h b/fcst/fcst.h index a0e10ccef..e3a8aa5f8 100644 --- a/fcst/fcst.h +++ b/fcst/fcst.h @@ -30,7 +30,7 @@ #define NEW_LIBFC_API #endif -#define FT_VERSION "3.4.0" +#define FT_VERSION "3.4.0-pre" #define FT_MODULE "fcst" #define FT_MAX_HW_PENDING_TIME 20 /* max I/O time in seconds */ diff --git a/iscsi-scst/README b/iscsi-scst/README index 363233aa0..37bd611dd 100644 --- a/iscsi-scst/README +++ b/iscsi-scst/README @@ -1,7 +1,7 @@ iSCSI SCST target driver ======================== -Version 3.4.0, 30 October 2018 +Version 3.4.0, XX XXXXX 2018 ---------------------------- ISCSI-SCST is a deeply reworked fork of iSCSI Enterprise Target (IET) diff --git a/iscsi-scst/include/iscsi_scst_ver.h b/iscsi-scst/include/iscsi_scst_ver.h index 9e6a70a87..ecb9bed4d 100644 --- a/iscsi-scst/include/iscsi_scst_ver.h +++ b/iscsi-scst/include/iscsi_scst_ver.h @@ -21,4 +21,4 @@ #define ISCSI_VERSION_STRING_SUFFIX #endif -#define ISCSI_VERSION_STRING "3.4.0" ISCSI_VERSION_STRING_SUFFIX +#define ISCSI_VERSION_STRING "3.4.0-pre1" ISCSI_VERSION_STRING_SUFFIX diff --git a/qla2x00t/qla2x00-target/README b/qla2x00t/qla2x00-target/README index f84ba6d49..2235c849e 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, 30 October 2018 +Version 3.4.0, XX XXXXX 2018 ---------------------------- This is target driver for QLogic 2[2-6]xx/8[1-3]xx Fibre Channel cards. diff --git a/qla2x00t/qla2x00-target/qla2x00t.h b/qla2x00t/qla2x00-target/qla2x00t.h index 14294d30d..bcb22fc14 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.h +++ b/qla2x00t/qla2x00-target/qla2x00t.h @@ -34,8 +34,8 @@ /* Version numbers, the same as for the kernel */ #define Q2T_VERSION(a, b, c, d) (((a) << 030) + ((b) << 020) + (c) << 010 + (d)) -#define Q2T_VERSION_CODE Q2T_VERSION(3, 4, 0, 0) -#define Q2T_VERSION_STRING "3.4.0" +#define Q2T_VERSION_CODE Q2T_VERSION(4, 1, 0, 0) +#define Q2T_VERSION_STRING "3.4.0-pre1" #define Q2T_PROC_VERSION_NAME "version" #define Q2T_MAX_CDB_LEN 16 diff --git a/scst/README b/scst/README index 86c1124f4..fed367fe1 100644 --- a/scst/README +++ b/scst/README @@ -1,7 +1,7 @@ Generic SCSI target mid-level for Linux (SCST) ============================================== -Version 3.4.0, 30 October 2018 +Version 3.4.0, XX XXXXX 2018 ---------------------------- SCST is designed to provide unified, consistent interface between SCSI diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h index 382c27518..c4acfa171 100644 --- a/scst/include/scst_const.h +++ b/scst/include/scst_const.h @@ -50,7 +50,7 @@ #else #define SCST_VERSION_STRING_SUFFIX #endif -#define SCST_VERSION_NAME "3.4.0" +#define SCST_VERSION_NAME "3.4.0-pre1" #define SCST_VERSION_STRING SCST_VERSION_NAME SCST_VERSION_STRING_SUFFIX #define SCST_CONST_VERSION SCST_CONST_INTF_VER diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c index 2074183f4..5ce4c1a53 100644 --- a/scst_local/scst_local.c +++ b/scst_local/scst_local.c @@ -96,7 +96,7 @@ static unsigned long scst_local_trace_flag = SCST_LOCAL_DEFAULT_LOG_FLAGS; #define scsi_bufflen(cmd) ((cmd)->request_bufflen) #endif -#define SCST_LOCAL_VERSION "3.4.0" +#define SCST_LOCAL_VERSION "3.4" static const char *scst_local_version_date = "20110901"; /* Some statistics */ diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin index 2ff878f13..eb6c89347 100755 --- a/scstadmin/scstadmin.sysfs/scstadmin +++ b/scstadmin/scstadmin.sysfs/scstadmin @@ -1,6 +1,6 @@ #!/usr/bin/perl -$Version = 'SCST Configurator v3.4.0-pre1'; +$Version = 'SCST Configurator v3.3.0-pre1'; # Configures SCST # diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index da2b8fdd8..a4b6585f5 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -70,8 +70,8 @@ /* Name of this kernel module. */ #define DRV_NAME "ib_srpt" -#define DRV_VERSION "3.4.0" __stringify(OFED_FLAVOR) -#define DRV_RELDATE "30 October 2018" +#define DRV_VERSION "3.4.0-pre#" __stringify(OFED_FLAVOR) +#define DRV_RELDATE "(not yet released)" #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 2daa1757c..403966cac 100644 --- a/usr/fileio/README +++ b/usr/fileio/README @@ -1,7 +1,7 @@ User space FILEIO handler ========================= -Version 3.4.0, 30 October 2018 +Version 3.4.0, XX XXXXX 2018 ---------------------------- User space program fileio_tgt uses interface of SCST's scst_user dev