mirror/sysmngr
1
0
Fork 0
mirror of https://dev.iopsys.eu/system/sysmngr.git synced 2025-12-10 00:06:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compilation

Browse source
This commit is contained in:
Vivek Kumar Dutta 2025-01-17 16:14:24 +05:30
parent 44289f5dad
commit 3470caa72a
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -1,6 +1,5 @@
variables: variables:
SOURCE_FOLDER: "src" SOURCE_FOLDER: "src"
CFLAGS: "-DBBF_VENDOR_PREFIX=\\\"X_IOPSYS_EU_\\\""
SYSMNGR_VENDOR_CONFIG_FILE: 'y' SYSMNGR_VENDOR_CONFIG_FILE: 'y'
SYSMNGR_MEMORY_STATUS: 'y' SYSMNGR_MEMORY_STATUS: 'y'
SYSMNGR_PROCESS_STATUS: 'y' SYSMNGR_PROCESS_STATUS: 'y'
@ -11,6 +10,7 @@ variables:
SYSMNGR_VENDOR_EXTENSIONS: 'y' SYSMNGR_VENDOR_EXTENSIONS: 'y'
SYSMNGR_FWBANK_UBUS_SUPPORT: 'y' SYSMNGR_FWBANK_UBUS_SUPPORT: 'y'
SYSMNGR_TEMPERATURE_STATUS: 'y' SYSMNGR_TEMPERATURE_STATUS: 'y'
SYSMNGR_VENDOR_EXTENSIONS: 'y'
include: include:
- project: 'iopsys/gitlab-ci-pipeline' - project: 'iopsys/gitlab-ci-pipeline'

2
src/Makefile
View file

@ -39,7 +39,7 @@ endif
ifeq ($(SYSMNGR_VENDOR_EXTENSIONS),y) ifeq ($(SYSMNGR_VENDOR_EXTENSIONS),y)
PROG_CFLAGS += -DSYSMNGR_VENDOR_EXTENSIONS PROG_CFLAGS += -DSYSMNGR_VENDOR_EXTENSIONS
ifeq ($(CUSTOM_PREFIX),) ifeq ($(filter -DCUSTOM_PREFIX=%,$(PROG_CFLAGS)),)
PROG_CFLAGS += -DCUSTOM_PREFIX=\"X_IOPSYS_EU_\" PROG_CFLAGS += -DCUSTOM_PREFIX=\"X_IOPSYS_EU_\"
endif endif
endif endif

10
src/fw_images.c
View file

@ -516,7 +516,9 @@ static operation_args firmware_image_download_args = {
"CheckSumAlgorithm", "CheckSumAlgorithm",
"CheckSum", "CheckSum",
"CommandKey", "CommandKey",
BBF_VENDOR_PREFIX"KeepConfig", #ifdef SYSMNGR_VENDOR_EXTENSIONS
CUSTOM_PREFIX"KeepConfig",
#endif
NULL NULL
} }
}; };
@ -555,8 +557,10 @@ static int operate_DeviceInfoFirmwareImage_Download(char *refparam, struct dmctx
char *checksum_algorithm = dmjson_get_value((json_object *)value, 1, "CheckSumAlgorithm"); char *checksum_algorithm = dmjson_get_value((json_object *)value, 1, "CheckSumAlgorithm");
char *checksum = dmjson_get_value((json_object *)value, 1, "CheckSum"); char *checksum = dmjson_get_value((json_object *)value, 1, "CheckSum");
char *commandKey = dmjson_get_value((json_object *)value, 1, "CommandKey"); char *commandKey = dmjson_get_value((json_object *)value, 1, "CommandKey");
char *keep_config = dmjson_get_value((json_object *)value, 1, BBF_VENDOR_PREFIX"KeepConfig"); char *keep_config = NULL;
#ifdef SYSMNGR_VENDOR_EXTENSIONS
keep_config = dmjson_get_value((json_object *)value, 1, CUSTOM_PREFIX"KeepConfig");
#endif
char *bank_id = get_fwbank_option_value(data, "id"); char *bank_id = get_fwbank_option_value(data, "id");
int res = bbf_fw_image_download(url, auto_activate, username, password, file_size, checksum_algorithm, checksum, bank_id, command, obj_path, commandKey, keep_config); int res = bbf_fw_image_download(url, auto_activate, username, password, file_size, checksum_algorithm, checksum, bank_id, command, obj_path, commandKey, keep_config);