Merge pull request #435 from rafalste/update_versioning

Version unifying
This commit is contained in:
Robert Baldyga
2020-07-27 18:34:46 +02:00
committed by GitHub
9 changed files with 165 additions and 157 deletions

View File

@@ -1,31 +0,0 @@
#!/bin/bash
#
# Copyright(c) 2012-2020 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause-Clear
#
VER_FILE=CAS_VERSION
if [ -f ${VER_FILE} ]; then
echo -e "Using existing ${VER_FILE} version file.\n"
exit 0
fi
echo -e "No ${VER_FILE} found. Preparing default version file.\n"
CAS_VERSION_MAIN=20
CAS_VERSION_MAJOR=6
CAS_VERSION_MINOR=0
CAS_BUILD_NO=0000`date +%m%d`
touch ${VER_FILE}
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}

View File

@@ -15,8 +15,6 @@ obj-y += cas_disk/
# line; invoke the kernel build system.
else
VERSION_FILE=$(PWD)/CAS_VERSION
OCFDIR=$(PWD)/../ocf
KERNEL_DIR ?= "/lib/modules/$(shell uname -r)/build"
PWD=$(shell pwd)
@@ -31,9 +29,6 @@ MODPROBE:=$(shell which modprobe)
all: default
$(VERSION_FILE):
./CAS_VERSION_GEN
# Extra targets and file configuration
ifneq ($(wildcard $(PWD)/extra.mk),)
include $(PWD)/extra.mk
@@ -41,7 +36,7 @@ else
sync distsync:
endif
default: $(VERSION_FILE) sync
default: sync
cd $(KERNEL_DIR) && $(MAKE) M=$(PWD) modules
clean:

View File

@@ -3,10 +3,7 @@
# SPDX-License-Identifier: BSD-3-Clause-Clear
#
VERSION_FILE := $(M)/CAS_VERSION
$(VERSION_FILE):
./CAS_VERSION_GEN
VERSION_FILE := $(M)/../.metadata/cas_version
check_cflag=$(shell echo "" | \
gcc -c -xc ${1} -o /dev/null - 2>/dev/null; \