hv: update versioning scheme
* introduce EXTRA_VERSION to replace RC_VERSION * add daily tag into the version information * unify the hypervisor and device model version Signed-off-by: Jack Ren <jack.ren@intel.com>
This commit is contained in:
parent
dc135bd501
commit
d924482ca7
|
@ -1,9 +1,8 @@
|
|||
#
|
||||
# ACRN-DM
|
||||
#
|
||||
MAJOR_VERSION=0
|
||||
MINOR_VERSION=1
|
||||
RC_VERSION=5
|
||||
include ../VERSION
|
||||
FULL_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)$(EXTRA_VERSION)
|
||||
BASEDIR := $(shell pwd)
|
||||
DM_OBJDIR ?= $(CURDIR)/build
|
||||
|
||||
|
@ -157,6 +156,7 @@ include/version.h:
|
|||
@COMMIT=`git rev-parse --verify --short HEAD 2>/dev/null`;\
|
||||
DIRTY=`git diff-index --name-only HEAD`;\
|
||||
if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
|
||||
DAILY_TAG=`git tag --merged HEAD|grep "acrn"|tail -n 1`;\
|
||||
TIME=`date "+%Y-%m-%d %H:%M:%S"`;\
|
||||
USER=`id -u -n`; \
|
||||
echo "/*" > include/version.h; \
|
||||
|
@ -165,7 +165,9 @@ include/version.h:
|
|||
echo "" >> include/version.h; \
|
||||
echo "#define DM_MAJOR_VERSION $(MAJOR_VERSION)" >> include/version.h;\
|
||||
echo "#define DM_MINOR_VERSION $(MINOR_VERSION)" >> include/version.h;\
|
||||
echo "#define DM_RC_VERSION $(RC_VERSION)" >> include/version.h;\
|
||||
echo "#define DM_EXTRA_VERSION "\"$(EXTRA_VERSION)\""" >> include/version.h;\
|
||||
echo "#define DM_FULL_VERSION "\"$(FULL_VERSION)\""" >> include/version.h;\
|
||||
echo "#define DM_DAILY_TAG "\""$$DAILY_TAG"\""" >> include/version.h;\
|
||||
echo "#define DM_BUILD_VERSION "\""$$PATCH"\""" >> include/version.h;\
|
||||
echo "#define DM_BUILD_TIME "\""$$TIME"\""" >> include/version.h;\
|
||||
echo "#define DM_BUILD_USER "\""$$USER"\""" >> include/version.h
|
||||
|
|
|
@ -164,14 +164,9 @@ usage(int code)
|
|||
static void
|
||||
print_version(void)
|
||||
{
|
||||
if (DM_RC_VERSION)
|
||||
fprintf(stderr, "DM version is: %d.%d-%d-%s, build by %s@%s\n",
|
||||
DM_MAJOR_VERSION, DM_MINOR_VERSION, DM_RC_VERSION,
|
||||
DM_BUILD_VERSION, DM_BUILD_USER, DM_BUILD_TIME);
|
||||
else
|
||||
fprintf(stderr, "DM version is: %d.%d-%s, build by %s@%s\n",
|
||||
DM_MAJOR_VERSION, DM_MINOR_VERSION, DM_BUILD_VERSION,
|
||||
DM_BUILD_USER, DM_BUILD_TIME);
|
||||
fprintf(stderr, "DM version is: %s-%s (daily tag:%s), build by %s@%s\n",
|
||||
DM_FULL_VERSION,
|
||||
DM_BUILD_VERSION, DM_DAILY_TAG, DM_BUILD_USER, DM_BUILD_TIME);
|
||||
|
||||
exit(0);
|
||||
}
|
||||
|
|
|
@ -2,9 +2,8 @@
|
|||
# ACRN Hypervisor
|
||||
#
|
||||
|
||||
MAJOR_VERSION=0
|
||||
MINOR_VERSION=1
|
||||
RC_VERSION=5
|
||||
include ../VERSION
|
||||
FULL_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)$(EXTRA_VERSION)
|
||||
|
||||
API_MAJOR_VERSION=1
|
||||
API_MINOR_VERSION=0
|
||||
|
@ -241,6 +240,7 @@ $(VERSION):
|
|||
@COMMIT=`git rev-parse --verify --short HEAD 2>/dev/null`;\
|
||||
DIRTY=`git diff-index --name-only HEAD`;\
|
||||
if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
|
||||
DAILY_TAG=`git tag --merged HEAD|grep "acrn"|tail -n 1`;\
|
||||
TIME=`date "+%F %T"`;\
|
||||
USER=`id -u -n`; \
|
||||
if [ $(CONFIG_RELEASE) = "n" ];then BUILD_TYPE="DBG";else BUILD_TYPE="REL";fi;\
|
||||
|
@ -250,9 +250,11 @@ $(VERSION):
|
|||
echo "" >> $(VERSION); \
|
||||
echo "#define HV_MAJOR_VERSION $(MAJOR_VERSION)" >> $(VERSION);\
|
||||
echo "#define HV_MINOR_VERSION $(MINOR_VERSION)" >> $(VERSION);\
|
||||
echo "#define HV_RC_VERSION $(RC_VERSION)" >> $(VERSION);\
|
||||
echo "#define HV_EXTRA_VERSION "\"$(EXTRA_VERSION)\""" >> $(VERSION);\
|
||||
echo "#define HV_FULL_VERSION "\"$(FULL_VERSION)\""" >> $(VERSION);\
|
||||
echo "#define HV_API_MAJOR_VERSION $(API_MAJOR_VERSION)" >> $(VERSION);\
|
||||
echo "#define HV_API_MINOR_VERSION $(API_MINOR_VERSION)" >> $(VERSION);\
|
||||
echo "#define HV_DAILY_TAG "\""$$DAILY_TAG"\""" >> $(VERSION);\
|
||||
echo "#define HV_BUILD_VERSION "\""$$PATCH"\""" >> $(VERSION);\
|
||||
echo "#define HV_BUILD_TYPE "\""$$BUILD_TYPE"\""" >> $(VERSION);\
|
||||
echo "#define HV_BUILD_TIME "\""$$TIME"\""" >> $(VERSION);\
|
||||
|
|
|
@ -491,15 +491,10 @@ static void bsp_boot_post(void)
|
|||
init_logmsg(CONFIG_LOG_BUF_SIZE,
|
||||
CONFIG_LOG_DESTINATION);
|
||||
|
||||
if (HV_RC_VERSION != 0)
|
||||
pr_acrnlog("HV version %d.%d-rc%d-%s-%s %s build by %s, start time %lluus",
|
||||
HV_MAJOR_VERSION, HV_MINOR_VERSION, HV_RC_VERSION,
|
||||
HV_BUILD_TIME, HV_BUILD_VERSION, HV_BUILD_TYPE,
|
||||
HV_BUILD_USER, ticks_to_us(start_tsc));
|
||||
else
|
||||
pr_acrnlog("HV version %d.%d-%s-%s %s build by %s, start time %lluus",
|
||||
HV_MAJOR_VERSION, HV_MINOR_VERSION,
|
||||
pr_acrnlog("HV version %s-%s-%s %s (daily tag:%s) build by %s, start time %lluus",
|
||||
HV_FULL_VERSION,
|
||||
HV_BUILD_TIME, HV_BUILD_VERSION, HV_BUILD_TYPE,
|
||||
HV_DAILY_TAG,
|
||||
HV_BUILD_USER, ticks_to_us(start_tsc));
|
||||
|
||||
pr_acrnlog("API version %d.%d",
|
||||
|
|
Loading…
Reference in New Issue