github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #107 from robertbaldyga/cleanup-cas-version

Browse Source 
Cleanup cas version
This commit is contained in:
Robert Bałdyga 2019-09-19 13:45:17 +02:00 committed by GitHub
commit 8f45549cc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
casadm/Makefile
View File

@ -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

1
casadm/cas_lib.c
View File

@ -35,7 +35,6 @@
#include "safeclib/safe_str_lib.h"
#include "safeclib/safe_lib.h"
#include <cas_ioctl_codes.h>
#include <cas_version.h>
#include "psort.h"
#define PRINT_STAT(x) header->cmd_input.cache_stats.x

1
casadm/cas_main.c
View File

@ -21,7 +21,6 @@
#include "cas_lib_utils.h"
#include "safeclib/safe_str_lib.h"
#include <cas_ioctl_codes.h>
#include <cas_version.h>
#include "upgrade.h"
#include "statistics_view.h"

41
modules/CAS_VERSION_GEN
View File

@ -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=9
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}

1
modules/cas_cache/cas_cache.h
View File

@ -9,7 +9,6 @@
#include "ocf/ocf.h"
#include "ocf_env.h"
#include <cas_version.h>
#include <cas_ioctl_codes.h>
#include "linux_kernel_version.h"

1
modules/cas_disk/cas_disk_defs.h
View File

@ -10,7 +10,6 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/kobject.h>
#include <cas_version.h>
struct casdsk_stored_config {
size_t n_blobs;

6
modules/config.mk
View File

@ -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)

29
modules/include/cas_version.h
View File

@ -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