From 3470caa72a1e2903e204e31ea0226e957cf25469 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Fri, 17 Jan 2025 16:14:24 +0530
Subject: [PATCH] Fix compilation
---
.gitlab-ci.yml | 2 +-
src/Makefile | 2 +-
src/fw_images.c | 10 +++++++---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 292f2b3..f129ca6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
variables:
SOURCE_FOLDER: "src"
- CFLAGS: "-DBBF_VENDOR_PREFIX=\\\"X_IOPSYS_EU_\\\""
SYSMNGR_VENDOR_CONFIG_FILE: 'y'
SYSMNGR_MEMORY_STATUS: 'y'
SYSMNGR_PROCESS_STATUS: 'y'
@@ -11,6 +10,7 @@ variables:
SYSMNGR_VENDOR_EXTENSIONS: 'y'
SYSMNGR_FWBANK_UBUS_SUPPORT: 'y'
SYSMNGR_TEMPERATURE_STATUS: 'y'
+ SYSMNGR_VENDOR_EXTENSIONS: 'y'
include:
- project: 'iopsys/gitlab-ci-pipeline'
diff --git a/src/Makefile b/src/Makefile
index e888ef9..7393461 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,7 +39,7 @@ endif
ifeq ($(SYSMNGR_VENDOR_EXTENSIONS),y)
PROG_CFLAGS += -DSYSMNGR_VENDOR_EXTENSIONS
-ifeq ($(CUSTOM_PREFIX),)
+ifeq ($(filter -DCUSTOM_PREFIX=%,$(PROG_CFLAGS)),)
PROG_CFLAGS += -DCUSTOM_PREFIX=\"X_IOPSYS_EU_\"
endif
endif
diff --git a/src/fw_images.c b/src/fw_images.c
index aa80411..48e7c82 100644
--- a/src/fw_images.c
+++ b/src/fw_images.c
@@ -516,7 +516,9 @@ static operation_args firmware_image_download_args = {
"CheckSumAlgorithm",
"CheckSum",
"CommandKey",
- BBF_VENDOR_PREFIX"KeepConfig",
+#ifdef SYSMNGR_VENDOR_EXTENSIONS
+ CUSTOM_PREFIX"KeepConfig",
+#endif
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 = dmjson_get_value((json_object *)value, 1, "CheckSum");
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");
int res = bbf_fw_image_download(url, auto_activate, username, password, file_size, checksum_algorithm, checksum, bank_id, command, obj_path, commandKey, keep_config);
--
GitLab