github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

build: Using id tool to get builder username

Browse Source 
Some build environment might has no USER pre-defined. So use id tool to
get builder username instead of USER environemnt.

Also add a version cleanup for tools to keep them updated.

Signed-off-by: Shuo Liu <shuo.a.liu@intel.com>
Acked-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
This commit is contained in:
Shuo Liu 2018-06-28 02:36:10 +00:00 committed by lijinxia
parent 1b97c6ea92
commit 1c605a4f50
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devicemodel/Makefile
View File

@ -158,6 +158,7 @@ include/version.h:
DIRTY=`git diff-index --name-only HEAD`;\ DIRTY=`git diff-index --name-only HEAD`;\
if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\ if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
TIME=`date "+%Y-%m-%d %H:%M:%S"`;\ TIME=`date "+%Y-%m-%d %H:%M:%S"`;\
USER=`id -u -n`; \
echo "/*" > include/version.h; \ echo "/*" > include/version.h; \
sed 's/^/ * /' ../LICENSE >> include/version.h; \ sed 's/^/ * /' ../LICENSE >> include/version.h; \
echo " */" >> include/version.h; \ echo " */" >> include/version.h; \
@ -167,7 +168,7 @@ include/version.h:
echo "#define DM_RC_VERSION $(RC_VERSION)" >> include/version.h;\ echo "#define DM_RC_VERSION $(RC_VERSION)" >> include/version.h;\
echo "#define DM_BUILD_VERSION "\""$$PATCH"\""" >> 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_TIME "\""$$TIME"\""" >> include/version.h;\
echo "#define DM_BUILD_USER "\""$(USER)"\""" >> include/version.h echo "#define DM_BUILD_USER "\""$$USER"\""" >> include/version.h
$(DM_OBJDIR)/%.o: %.c $(HEADERS) $(DM_OBJDIR)/%.o: %.c $(HEADERS)
[ ! -e $@ ] && mkdir -p $(dir $@); \ [ ! -e $@ ] && mkdir -p $(dir $@); \

3
hypervisor/Makefile
View File

@ -242,6 +242,7 @@ $(VERSION):
DIRTY=`git diff-index --name-only HEAD`;\ DIRTY=`git diff-index --name-only HEAD`;\
if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\ if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
TIME=`date "+%F %T"`;\ TIME=`date "+%F %T"`;\
USER=`id -u -n`; \
if [ $(CONFIG_RELEASE) = "n" ];then BUILD_TYPE="DBG";else BUILD_TYPE="REL";fi;\ if [ $(CONFIG_RELEASE) = "n" ];then BUILD_TYPE="DBG";else BUILD_TYPE="REL";fi;\
echo "/*" > $(VERSION); \ echo "/*" > $(VERSION); \
sed 's/^/ * /' ../LICENSE >> $(VERSION); \ sed 's/^/ * /' ../LICENSE >> $(VERSION); \
@ -255,7 +256,7 @@ $(VERSION):
echo "#define HV_BUILD_VERSION "\""$$PATCH"\""" >> $(VERSION);\ echo "#define HV_BUILD_VERSION "\""$$PATCH"\""" >> $(VERSION);\
echo "#define HV_BUILD_TYPE "\""$$BUILD_TYPE"\""" >> $(VERSION);\ echo "#define HV_BUILD_TYPE "\""$$BUILD_TYPE"\""" >> $(VERSION);\
echo "#define HV_BUILD_TIME "\""$$TIME"\""" >> $(VERSION);\ echo "#define HV_BUILD_TIME "\""$$TIME"\""" >> $(VERSION);\
echo "#define HV_BUILD_USER "\""$(USER)"\""" >> $(VERSION) echo "#define HV_BUILD_USER "\""$$USER"\""" >> $(VERSION)
$(HV_OBJDIR)/%.o: %.c $(HV_OBJDIR)/$(HV_CONFIG_H) $(HV_OBJDIR)/%.o: %.c $(HV_OBJDIR)/$(HV_CONFIG_H)
[ ! -e $@ ] && mkdir -p $(dir $@); \ [ ! -e $@ ] && mkdir -p $(dir $@); \

4
tools/acrn-crashlog/acrnprobe/Makefile
View File

@ -16,6 +16,7 @@ TARGET = $(BUILDDIR)/acrnprobe/bin/acrnprobe
.PHONY: all check_dirs .PHONY: all check_dirs
all: $(VERSION_H) check_dirs $(TARGET) all: $(VERSION_H) check_dirs $(TARGET)
rm -f $(VERSION_H)
$(BUILDDIR)/acrnprobe/obj/%.o:%.c $(BUILDDIR)/acrnprobe/obj/%.o:%.c
$(CC) -c $(CFLAGS) $< -o $@ $(CC) -c $(CFLAGS) $< -o $@
@ -63,12 +64,13 @@ $(VERSION_H):
DIRTY=`git diff --name-only $(CURDIR)`;\ DIRTY=`git diff --name-only $(CURDIR)`;\
if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\ if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
TIME=`date "+%Y-%m-%d %H:%M:%S"`;\ TIME=`date "+%Y-%m-%d %H:%M:%S"`;\
USER=`id -u -n`; \
cat $(CURDIR)/../license_header > $(VERSION_H);\ cat $(CURDIR)/../license_header > $(VERSION_H);\
echo "#define AP_MAJOR_VERSION $(MAJOR_VERSION)" >> $(VERSION_H);\ echo "#define AP_MAJOR_VERSION $(MAJOR_VERSION)" >> $(VERSION_H);\
echo "#define AP_MINOR_VERSION $(MINOR_VERSION)" >> $(VERSION_H);\ echo "#define AP_MINOR_VERSION $(MINOR_VERSION)" >> $(VERSION_H);\
echo "#define AP_BUILD_VERSION "\""$$PATCH"\""" >> $(VERSION_H);\ echo "#define AP_BUILD_VERSION "\""$$PATCH"\""" >> $(VERSION_H);\
echo "#define AP_BUILD_TIME "\""$$TIME"\""" >> $(VERSION_H);\ echo "#define AP_BUILD_TIME "\""$$TIME"\""" >> $(VERSION_H);\
echo "#define AP_BUILD_USER "\""$(USER)"\""" >> $(VERSION_H) echo "#define AP_BUILD_USER "\""$$USER"\""" >> $(VERSION_H)
check_dirs: check_dirs:
@if [ ! -d $(BUILDDIR)/acrnprobe/bin ]; then \ @if [ ! -d $(BUILDDIR)/acrnprobe/bin ]; then \

4
tools/acrn-crashlog/usercrash/Makefile
View File

@ -5,6 +5,7 @@ VERSION_H = $(BUILDDIR)/include/usercrash/version.h
.PHONY: all check_obj .PHONY: all check_obj
all: $(VERSION_H) check_obj usercrash_s usercrash_c debugger all: $(VERSION_H) check_obj usercrash_s usercrash_c debugger
rm -f $(VERSION_H)
INCLUDE += -I $(CURDIR)/include/ INCLUDE += -I $(CURDIR)/include/
INCLUDE += -I $(BUILDDIR)/include/usercrash INCLUDE += -I $(BUILDDIR)/include/usercrash
@ -45,12 +46,13 @@ $(VERSION_H):
DIRTY=`git diff --name-only $(CURDIR)`;\ DIRTY=`git diff --name-only $(CURDIR)`;\
if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\ if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
TIME=`date "+%Y-%m-%d %H:%M:%S"`;\ TIME=`date "+%Y-%m-%d %H:%M:%S"`;\
USER=`id -u -n`; \
cat $(CURDIR)/../license_header > $(VERSION_H);\ cat $(CURDIR)/../license_header > $(VERSION_H);\
echo "#define UC_MAJOR_VERSION $(MAJOR_VERSION)" >> $(VERSION_H);\ echo "#define UC_MAJOR_VERSION $(MAJOR_VERSION)" >> $(VERSION_H);\
echo "#define UC_MINOR_VERSION $(MINOR_VERSION)" >> $(VERSION_H);\ echo "#define UC_MINOR_VERSION $(MINOR_VERSION)" >> $(VERSION_H);\
echo "#define UC_BUILD_VERSION "\""$$PATCH"\""" >> $(VERSION_H);\ echo "#define UC_BUILD_VERSION "\""$$PATCH"\""" >> $(VERSION_H);\
echo "#define UC_BUILD_TIME "\""$$TIME"\""" >> $(VERSION_H);\ echo "#define UC_BUILD_TIME "\""$$TIME"\""" >> $(VERSION_H);\
echo "#define UC_BUILD_USER "\""$(USER)"\""" >> $(VERSION_H) echo "#define UC_BUILD_USER "\""$$USER"\""" >> $(VERSION_H)
check_obj: check_obj:
@if [ ! -d $(BUILDDIR)/usercrash/bin ]; then \ @if [ ! -d $(BUILDDIR)/usercrash/bin ]; then \