StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add BUILD_USERNAME and BUILD_HOSTNAME"

Browse Source
This commit is contained in:
Treehugger Robot
2019-01-10 21:29:47 +00:00
committed by Gerrit Code Review
parent 6621a2fa8b 63e48db6d1
commit 1b8939b946
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -317,7 +317,7 @@ $(intermediate_system_build_prop): PRIVATE_BUILD_DESC := $(build_desc)
# The string used to uniquely identify the combined build and product; used by the OTA server. # The string used to uniquely identify the combined build and product; used by the OTA server.
ifeq (,$(strip $(BUILD_FINGERPRINT))) ifeq (,$(strip $(BUILD_FINGERPRINT)))
ifeq ($(strip $(HAS_BUILD_NUMBER)),false) ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
BF_BUILD_NUMBER := $(USER)$$($(DATE_FROM_FILE) +%m%d%H%M) BF_BUILD_NUMBER := $(BUILD_USERNAME)$$($(DATE_FROM_FILE) +%m%d%H%M)
else else
BF_BUILD_NUMBER := $(file <$(BUILD_NUMBER_FILE)) BF_BUILD_NUMBER := $(file <$(BUILD_NUMBER_FILE))
endif endif
@@ -420,6 +420,8 @@ endif
BUILD_ID="$(BUILD_ID)" \ BUILD_ID="$(BUILD_ID)" \
BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \ BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \
DATE="$(DATE_FROM_FILE)" \ DATE="$(DATE_FROM_FILE)" \
BUILD_USERNAME="$(BUILD_USERNAME)" \
BUILD_HOSTNAME="$(BUILD_HOSTNAME)" \
BUILD_NUMBER="$(BUILD_NUMBER_FROM_FILE)" \ BUILD_NUMBER="$(BUILD_NUMBER_FROM_FILE)" \
BOARD_BUILD_SYSTEM_ROOT_IMAGE="$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)" \ BOARD_BUILD_SYSTEM_ROOT_IMAGE="$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)" \
AB_OTA_UPDATER="$(AB_OTA_UPDATER)" \ AB_OTA_UPDATER="$(AB_OTA_UPDATER)" \

2
core/main.mk
View File

@@ -80,7 +80,7 @@ endif
ifeq ($(strip $(HAS_BUILD_NUMBER)),false) ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
# BUILD_NUMBER has a timestamp in it, which means that # BUILD_NUMBER has a timestamp in it, which means that
# it will change every time. Pick a stable value. # it will change every time. Pick a stable value.
FILE_NAME_TAG := eng.$(USER) FILE_NAME_TAG := eng.$(BUILD_USERNAME)
else else
FILE_NAME_TAG := $(file <$(BUILD_NUMBER_FILE)) FILE_NAME_TAG := $(file <$(BUILD_NUMBER_FILE))
endif endif

2
core/version_defaults.mk
View File

@@ -314,7 +314,7 @@ ifndef BUILD_NUMBER
# If no BUILD_NUMBER is set, create a useful "I am an engineering build # If no BUILD_NUMBER is set, create a useful "I am an engineering build
# from this date/time" value. Make it start with a non-digit so that # from this date/time" value. Make it start with a non-digit so that
# anyone trying to parse it as an integer will probably get "0". # anyone trying to parse it as an integer will probably get "0".
BUILD_NUMBER := eng.$(shell echo $${USER:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S) BUILD_NUMBER := eng.$(shell echo $${BUILD_USERNAME:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S)
HAS_BUILD_NUMBER := false HAS_BUILD_NUMBER := false
endif endif
.KATI_READONLY := BUILD_NUMBER HAS_BUILD_NUMBER .KATI_READONLY := BUILD_NUMBER HAS_BUILD_NUMBER

4
tools/buildinfo.sh
View File

@@ -18,8 +18,8 @@ echo "ro.build.version.min_supported_target_sdk=$PLATFORM_MIN_SUPPORTED_TARGET_S
echo "ro.build.date=`$DATE`" echo "ro.build.date=`$DATE`"
echo "ro.build.date.utc=`$DATE +%s`" echo "ro.build.date.utc=`$DATE +%s`"
echo "ro.build.type=$TARGET_BUILD_TYPE" echo "ro.build.type=$TARGET_BUILD_TYPE"
echo "ro.build.user=$USER" echo "ro.build.user=$BUILD_USERNAME"
echo "ro.build.host=`hostname`" echo "ro.build.host=$BUILD_HOSTNAME"
echo "ro.build.tags=$BUILD_VERSION_TAGS" echo "ro.build.tags=$BUILD_VERSION_TAGS"
echo "ro.build.flavor=$TARGET_BUILD_FLAVOR" echo "ro.build.flavor=$TARGET_BUILD_FLAVOR"
if [ -n "$BOARD_BUILD_SYSTEM_ROOT_IMAGE" ] ; then if [ -n "$BOARD_BUILD_SYSTEM_ROOT_IMAGE" ] ; then