From 102398a61f5e373dc2f785501f21838106c4f7c4 Mon Sep 17 00:00:00 2001 From: Gleb Chesnokov Date: Wed, 14 Sep 2022 11:49:46 +0300 Subject: [PATCH] scripts/update-version: Update the SCST_VERSION_CODE SCST_VERSION_CODE has not been updated since SCST v3.4 because the update-version script used the wrong file for parsing. Hence fix the update-version script and SCST_VERSION_CODE. --- scripts/update-version | 2 +- scst/include/scst_const.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update-version b/scripts/update-version index 16ef8ba9b..7800efb7c 100755 --- a/scripts/update-version +++ b/scripts/update-version @@ -31,7 +31,7 @@ sed -i "s,^\(Version[[:blank:]]*\)[^[:blank:]]*\(\),\1$fv\2," doc/s 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\"/" 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:]]*SCST_VERSION_CODE[[:blank:]]*\).*/\1SCST_VERSION($major, $minor, $release, 0)/" scst/include/scst_const.h sed -i "s/^\(#define[[:blank:]]*Q2T_VERSION_CODE[[:blank:]]*\).*/\1Q2T_VERSION($major, $minor, $release, 0)/" \ qla2x00t/qla2x00-target/qla2x00t.h \ qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.h diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h index 9b9d42aaf..04e0e5b46 100644 --- a/scst/include/scst_const.h +++ b/scst/include/scst_const.h @@ -44,7 +44,7 @@ * and FIO_REV in usr/fileio/common.h as well. */ #define SCST_VERSION(a, b, c, d) (((a) << 24) + ((b) << 16) + ((c) << 8) + d) -#define SCST_VERSION_CODE SCST_VERSION(3, 4, 0, 0) +#define SCST_VERSION_CODE SCST_VERSION(3, 7, 0, 0) #define SCST_VERSION_STRING_SUFFIX #define SCST_VERSION_NAME "3.7.0-pre" #define SCST_VERSION_STRING SCST_VERSION_NAME SCST_VERSION_STRING_SUFFIX