mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-12 15:49:17 -04:00
qcacld-3.0: Include change Ids in build tag
In order to assist in debugging efforts, include both CLD and CMN change Ids in a build tag. Include the build tag as a part of the driver version string. Change-Id: I66d159a1594f71fdf33f3e4b4e6be4840d7e140a CRs-Fixed: 2142704
This commit is contained in:
parent
ec9a3c9a9f
commit
96cd9633f1
2 changed files with 16 additions and 10 deletions
14
Kbuild
14
Kbuild
|
|
@ -47,7 +47,9 @@ ifeq ($(KERNEL_BUILD), 0)
|
|||
# Need to explicitly configure for Android-based builds
|
||||
|
||||
ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP),y)
|
||||
CONFIG_BUILD_TIMESTAMP := y
|
||||
ifneq ($(WLAN_DISABLE_BUILD_TAG),y)
|
||||
CONFIG_BUILD_TAG := y
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_ARCH_MDM9630), y)
|
||||
|
|
@ -2266,8 +2268,14 @@ CDEFINES += -DWLAN_HDD_ADAPTER_MAGIC=$(WLAN_HDD_ADAPTER_MAGIC)
|
|||
endif
|
||||
|
||||
# inject some build related information
|
||||
ifeq ($(CONFIG_BUILD_TIMESTAMP), y)
|
||||
CDEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"
|
||||
ifeq ($(CONFIG_BUILD_TAG), y)
|
||||
CLD_ID = $(shell cd "$(WLAN_ROOT)" && \
|
||||
git log -1 | sed -nE 's/.*Change-Id: (I[0-f]{10}).*/\1/p')
|
||||
CMN_ID = $(shell cd "$(WLAN_COMMON_INC)" && \
|
||||
git log -1 | sed -nE 's/.*Change-Id: (I[0-f]{10}).*/\1/p')
|
||||
TIMESTAMP = $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
|
||||
BUILD_TAG = "$(TIMESTAMP); cld:$(CLD_ID); cmn:$(CMN_ID);"
|
||||
CDEFINES += -DBUILD_TAG=\"$(BUILD_TAG)\"
|
||||
endif
|
||||
|
||||
# Module information used by KBuild framework
|
||||
|
|
|
|||
|
|
@ -339,12 +339,11 @@ void wlan_hdd_txrx_pause_cb(uint8_t vdev_id,
|
|||
* crash debugger can extract them from driver debug symbol and crashdump for
|
||||
* post processing
|
||||
*/
|
||||
#ifdef BUILD_TAG
|
||||
uint8_t g_wlan_driver_version[] = QWLAN_VERSIONSTR "; " BUILD_TAG;
|
||||
#else
|
||||
uint8_t g_wlan_driver_version[] = QWLAN_VERSIONSTR;
|
||||
|
||||
#ifndef BUILD_TIMESTAMP
|
||||
#define BUILD_TIMESTAMP ""
|
||||
#endif
|
||||
uint8_t g_wlan_driver_timestamp[] = BUILD_TIMESTAMP;
|
||||
|
||||
/**
|
||||
* hdd_device_mode_to_string() - return string conversion of device mode
|
||||
|
|
@ -11249,10 +11248,9 @@ static int __hdd_module_init(void)
|
|||
{
|
||||
int ret = 0;
|
||||
|
||||
pr_err("%s: Loading driver v%s (%s)%s\n",
|
||||
pr_err("%s: Loading driver v%s (%s)\n",
|
||||
WLAN_MODULE_NAME,
|
||||
QWLAN_VERSIONSTR,
|
||||
g_wlan_driver_timestamp,
|
||||
g_wlan_driver_version,
|
||||
TIMER_MANAGER_STR MEMORY_DEBUG_STR);
|
||||
|
||||
ret = wlan_hdd_state_ctrl_param_create();
|
||||
|
|
|
|||
Loading…
Reference in a new issue