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

scst: Revert semantic kernel version change

Browse Source 
Partially revert the earlier commit which limited SCST_KVER to a semantic
version only. Restore usage of the full kernel version string for improved
clarity in build metadata.

Fixes: ac1e7f82b7 ("scst: Fix SCST_KVER to use semantic version only")
This commit is contained in:
Gleb Chesnokov
2025-05-21 11:04:38 +03:00
parent 977904d33a
commit 707554a310
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -71,7 +71,6 @@ ISCSI_DIR = iscsi-scst
BUILD_DATE := $(shell date -u '+%Y/%m/%d-%H:%M:%S-%Z%:z')
GIT_COMMIT := $(shell git rev-parse --short=12 HEAD 2>/dev/null)
KVER_SEMVER := $(shell echo ${KVER} | cut -d'-' -f1)
ifndef BUILD_NUMBER
BUILD_NUMBER := $(shell git rev-list --count HEAD 2>/dev/null || echo 0)
@@ -81,7 +80,7 @@ ifndef ARCH_TYPE
ARCH_TYPE := $(shell uname -m)
endif
export KVER BUILD_DATE GIT_COMMIT KVER_SEMVER BUILD_NUMBER ARCH_TYPE
export KVER BUILD_DATE GIT_COMMIT BUILD_NUMBER ARCH_TYPE
RELEASE_VERSION := $(shell echo -n "$$(sed -n 's/^\#define[[:blank:]]SCST_VERSION_NAME[[:blank:]]*\"\([^-]*\).*\"/\1/p' scst/include/scst_const.h)")

12
scst/include/scst_const.h
View File

@@ -59,6 +59,12 @@
#define SCST_BUILD_DATE_STRING ""
#endif
#ifdef SCST_BUILD_NUMBER
#define SCST_BUILD_NUMBER_STRING SCST_STRINGIFY(SCST_BUILD_NUMBER)
#else
#define SCST_BUILD_NUMBER_STRING ""
#endif
#ifdef SCST_GIT_COMMIT
#define SCST_GIT_COMMIT_STRING SCST_STRINGIFY(SCST_GIT_COMMIT)
#else
@@ -71,12 +77,6 @@
#define SCST_KVER_STRING ""
#endif
#ifdef SCST_BUILD_NUMBER
#define SCST_BUILD_NUMBER_STRING SCST_STRINGIFY(SCST_BUILD_NUMBER)
#else
#define SCST_BUILD_NUMBER_STRING ""
#endif
#ifdef SCST_ARCH_TYPE
#define SCST_ARCH_TYPE_STRING SCST_STRINGIFY(SCST_ARCH_TYPE)
#else

10
scst/src/Kbuild
View File

@@ -15,12 +15,12 @@ ccflags-y := -I$(src)/../include \
-fstack-protector-strong \
-Wstrict-prototypes
ccflags-y += $(shell [ -n "${CONFIG_SCST_NO_DLM}" ] && echo -DCONFIG_SCST_NO_DLM) \
$(shell [ -n "${BUILD_DATE}" ] && echo -DSCST_BUILD_DATE=${BUILD_DATE}) \
$(shell [ -n "${GIT_COMMIT}" ] && echo -DSCST_GIT_COMMIT=${GIT_COMMIT}) \
$(shell [ -n "${KVER}" ] && echo -DSCST_KVER=${KVER_SEMVER}) \
ccflags-y += $(shell [ -n "${BUILD_DATE}" ] && echo -DSCST_BUILD_DATE=${BUILD_DATE}) \
$(shell [ -n "${BUILD_NUMBER}" ] && echo -DSCST_BUILD_NUMBER=${BUILD_NUMBER}) \
$(shell [ -n "${ARCH_TYPE}" ] && echo -DSCST_ARCH_TYPE=${ARCH_TYPE})
$(shell [ -n "${GIT_COMMIT}" ] && echo -DSCST_GIT_COMMIT=${GIT_COMMIT}) \
$(shell [ -n "${KVER}" ] && echo -DSCST_KVER=${KVER}) \
$(shell [ -n "${ARCH_TYPE}" ] && echo -DSCST_ARCH_TYPE=${ARCH_TYPE}) \
$(shell [ -n "${CONFIG_SCST_NO_DLM}" ] && echo -DCONFIG_SCST_NO_DLM)
#ccflags-y += -DCONFIG_SCST_STRICT_SERIALIZING
#ccflags-y += -DCONFIG_SCST_USE_EXPECTED_VALUES

4
scst/src/scst_main.c
View File

@@ -2476,9 +2476,9 @@ static int __init init_scst(void)
#endif
PRINT_INFO("SCST version: %s", SCST_VERSION_STRING);
PRINT_INFO("SCST build date: %s", SCST_BUILD_DATE_STRING);
PRINT_INFO("SCST build number: %s", SCST_BUILD_NUMBER_STRING);
PRINT_INFO("SCST git commit sha1: %s", SCST_GIT_COMMIT_STRING);
PRINT_INFO("SCST kver: %s", SCST_KVER_STRING);
PRINT_INFO("SCST build number: %s", SCST_BUILD_NUMBER_STRING);
PRINT_INFO("SCST arch type: %s", SCST_ARCH_TYPE_STRING);
scst_print_config();
@@ -2633,7 +2633,7 @@ MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SCSI target core");
MODULE_VERSION(SCST_VERSION_STRING);
MODULE_INFO(build_date, SCST_BUILD_DATE_STRING);
MODULE_INFO(build_number, SCST_BUILD_NUMBER_STRING);
MODULE_INFO(git_commit, SCST_GIT_COMMIT_STRING);
MODULE_INFO(kver, SCST_KVER_STRING);
MODULE_INFO(build_number, SCST_BUILD_NUMBER_STRING);
MODULE_INFO(arch_type, SCST_ARCH_TYPE_STRING);

2
scst/src/scst_sysfs.c
View File

@@ -7449,9 +7449,9 @@ static ssize_t scst_version_show(struct kobject *kobj,
ret += sysfs_emit_at(buf, ret, "SCST version: %s\n", SCST_VERSION_STRING);
ret += sysfs_emit_at(buf, ret, "SCST build date: %s\n", SCST_BUILD_DATE_STRING);
ret += sysfs_emit_at(buf, ret, "SCST build number: %s\n", SCST_BUILD_NUMBER_STRING);
ret += sysfs_emit_at(buf, ret, "SCST git commit sha1: %s\n", SCST_GIT_COMMIT_STRING);
ret += sysfs_emit_at(buf, ret, "SCST kver: %s\n", SCST_KVER_STRING);
ret += sysfs_emit_at(buf, ret, "SCST build number: %s\n", SCST_BUILD_NUMBER_STRING);
ret += sysfs_emit_at(buf, ret, "SCST arch type: %s\n", SCST_ARCH_TYPE_STRING);
if (scst_dump_config(config, sizeof(config)))