From 19bc5da2cfb9ed081b0aa49a34ef4e67dec233e9 Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Thu, 19 Sep 2019 11:37:46 +0200 Subject: [PATCH] Cleanup CAS_VERSION Signed-off-by: Robert Baldyga --- casadm/Makefile | 9 +------ casadm/cas_lib.c | 1 - casadm/cas_main.c | 1 - modules/CAS_VERSION_GEN | 41 ++++++++++---------------------- modules/cas_cache/cas_cache.h | 1 - modules/cas_disk/cas_disk_defs.h | 1 - modules/config.mk | 6 +---- modules/include/cas_version.h | 29 ---------------------- 8 files changed, 14 insertions(+), 75 deletions(-) delete mode 100644 modules/include/cas_version.h diff --git a/casadm/Makefile b/casadm/Makefile index 022f7a0..1f01a81 100644 --- a/casadm/Makefile +++ b/casadm/Makefile @@ -24,14 +24,7 @@ endif DEFINES += CAS_VERSION_MAIN=$(CAS_VERSION_MAIN) DEFINES += CAS_VERSION_MAJOR=$(CAS_VERSION_MAJOR) DEFINES += CAS_VERSION_MINOR=$(CAS_VERSION_MINOR) -DEFINES += CAS_BUILD_NO=\"$(CAS_BUILD_NO)\" - -# -# Additional git version -# -ifneq ($(strip $(CAS_BUILD_FLAG)),) -DEFINES += CAS_BUILD_FLAG=\"$(CAS_BUILD_FLAG)\" -endif +DEFINES += CAS_VERSION=\"$(CAS_VERSION)\" # # Include directories diff --git a/casadm/cas_lib.c b/casadm/cas_lib.c index ef0a33b..0ac4e94 100644 --- a/casadm/cas_lib.c +++ b/casadm/cas_lib.c @@ -35,7 +35,6 @@ #include "safeclib/safe_str_lib.h" #include "safeclib/safe_lib.h" #include -#include #include "psort.h" #define PRINT_STAT(x) header->cmd_input.cache_stats.x diff --git a/casadm/cas_main.c b/casadm/cas_main.c index 8fb8393..ca97a64 100644 --- a/casadm/cas_main.c +++ b/casadm/cas_main.c @@ -21,7 +21,6 @@ #include "cas_lib_utils.h" #include "safeclib/safe_str_lib.h" #include -#include #include "upgrade.h" #include "statistics_view.h" diff --git a/modules/CAS_VERSION_GEN b/modules/CAS_VERSION_GEN index b6170da..59953b7 100755 --- a/modules/CAS_VERSION_GEN +++ b/modules/CAS_VERSION_GEN @@ -6,46 +6,29 @@ VER_FILE=CAS_VERSION -which git > /dev/null 2>&1 -if [ $? -eq 0 ] && [ -e ../../../.git ]; then - echo "Generating ${VER_FILE} from git revision." - echo "" - VERSION=`git describe HEAD 2>/dev/null` - - CAS_VERSION_MAIN=`echo ${VERSION} | cut -d '.' -f 1 | awk '{print substr($0, 2)}'` - CAS_VERSION_MAJOR=`echo ${VERSION} | cut -d '.' -f 2 | awk '{print substr($0, 2)}'` - CAS_VERSION_MINOR=`echo ${VERSION} | cut -d '.' -f 3 | awk '{print substr($0, 2)}'` - CAS_BUILD_NO=`echo ${VERSION} | cut -d '.' -f 4 | cut -d '-' -f 1` - CAS_BUILD_FLAG=`echo ${VERSION} | cut -d '.' -f 4 | cut -s -d '-' -f 3` - - rm -f ${VER_FILE} - touch ${VER_FILE} - - echo "CAS_VERSION_MAIN=${CAS_VERSION_MAIN}" >> ${VER_FILE} - echo "CAS_VERSION_MAJOR=${CAS_VERSION_MAJOR}" >> ${VER_FILE} - echo "CAS_VERSION_MINOR=${CAS_VERSION_MINOR}" >> ${VER_FILE} - echo "CAS_BUILD_NO=${CAS_BUILD_NO}" >> ${VER_FILE} - echo "CAS_BUILD_FLAG=${CAS_BUILD_FLAG}" >> ${VER_FILE} -elif [ -f ${VER_FILE} ]; then +if [ -f ${VER_FILE} ]; then echo "Using existing ${VER_FILE} version file." echo "" + exit 0 else echo "No ${VER_FILE} found. Preparing default version file." echo "" CAS_VERSION_MAIN=19 - CAS_VERSION_MAJOR=06 - CAS_VERSION_MINOR=00 + CAS_VERSION_MAJOR=6 + CAS_VERSION_MINOR=0 CAS_BUILD_NO=0000`date +%m%d` - CAS_BUILD_FLAG= touch ${VER_FILE} - echo "CAS_VERSION_MAIN=${CAS_VERSION_MAIN}" >> ${VER_FILE} - echo "CAS_VERSION_MAJOR=${CAS_VERSION_MAJOR}" >> ${VER_FILE} - echo "CAS_VERSION_MINOR=${CAS_VERSION_MINOR}" >> ${VER_FILE} - echo "CAS_BUILD_NO=${CAS_BUILD_NO}" >> ${VER_FILE} - echo "CAS_BUILD_FLAG=${CAS_BUILD_FLAG}" >> ${VER_FILE} fi +CAS_VERSION=$(printf "%02d.%02d.%02d.%s" $CAS_VERSION_MAIN $CAS_VERSION_MAJOR \ + $CAS_VERSION_MINOR $CAS_BUILD_NO) + +echo "CAS_VERSION_MAIN=${CAS_VERSION_MAIN}" >> ${VER_FILE} +echo "CAS_VERSION_MAJOR=${CAS_VERSION_MAJOR}" >> ${VER_FILE} +echo "CAS_VERSION_MINOR=${CAS_VERSION_MINOR}" >> ${VER_FILE} +echo "CAS_VERSION=${CAS_VERSION}" >> ${VER_FILE} + cat ${VER_FILE} diff --git a/modules/cas_cache/cas_cache.h b/modules/cas_cache/cas_cache.h index eed2624..6c7a44f 100644 --- a/modules/cas_cache/cas_cache.h +++ b/modules/cas_cache/cas_cache.h @@ -9,7 +9,6 @@ #include "ocf/ocf.h" #include "ocf_env.h" -#include #include #include "linux_kernel_version.h" diff --git a/modules/cas_disk/cas_disk_defs.h b/modules/cas_disk/cas_disk_defs.h index 0cafc3d..65a5ab7 100644 --- a/modules/cas_disk/cas_disk_defs.h +++ b/modules/cas_disk/cas_disk_defs.h @@ -10,7 +10,6 @@ #include #include #include -#include struct casdsk_stored_config { size_t n_blobs; diff --git a/modules/config.mk b/modules/config.mk index 14dcd7d..de03276 100644 --- a/modules/config.mk +++ b/modules/config.mk @@ -16,11 +16,7 @@ check_cflag=$(shell echo "" | \ EXTRA_CFLAGS += -DCAS_VERSION_MAIN=$(CAS_VERSION_MAIN) EXTRA_CFLAGS += -DCAS_VERSION_MAJOR=$(CAS_VERSION_MAJOR) EXTRA_CFLAGS += -DCAS_VERSION_MINOR=$(CAS_VERSION_MINOR) -EXTRA_CFLAGS += -DCAS_BUILD_NO=\"$(CAS_BUILD_NO)\" -ifeq ($(strip $(CAS_BUILD_FLAG)),) -else -EXTRA_CFLAGS += -DCAS_BUILD_FLAG=\"$(CAS_BUILD_FLAG)\" -endif +EXTRA_CFLAGS += -DCAS_VERSION=\"$(CAS_VERSION)\" EXTRA_CFLAGS += -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security EXTRA_CFLAGS += -I$(M) diff --git a/modules/include/cas_version.h b/modules/include/cas_version.h deleted file mode 100644 index e6af2d1..0000000 --- a/modules/include/cas_version.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -* Copyright(c) 2012-2019 Intel Corporation -* SPDX-License-Identifier: BSD-3-Clause-Clear -*/ - -#ifndef __CAS_VERSION_H__ -#define __CAS_VERSION_H__ - -#if !defined(CAS_BUILD_NO) -#error "You must define build number for version" -#endif - -#define STR_PREP(x) #x -#define FMT_VERSION(x) STR_PREP(x) - -#ifdef CAS_BUILD_FLAG -#define CAS_VERSION_FLAG "-"CAS_BUILD_FLAG -#else -#define CAS_VERSION_FLAG "" -#endif - -#define CAS_VERSION \ - FMT_VERSION(CAS_VERSION_MAIN) "." \ - FMT_VERSION(CAS_VERSION_MAJOR) "." \ - FMT_VERSION(CAS_VERSION_MINOR) "." \ - CAS_BUILD_NO \ - CAS_VERSION_FLAG - -#endif