Andrew Geissler | bffdb3e | 2020-08-21 16:13:29 -0500 | [diff] [blame] | 1 | From 3f7bb7218181745ca7762c1b4832cbb1c9e692f5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Vaclav Dolezal <vdolezal@redhat.com> |
| 3 | Date: Thu, 23 Jan 2020 11:26:32 +0100 |
| 4 | Subject: [PATCH] hpmfwupg: move variable definition to .c file |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com> |
| 8 | --- |
| 9 | include/ipmitool/ipmi_hpmfwupg.h | 2 +- |
| 10 | lib/ipmi_hpmfwupg.c | 2 ++ |
| 11 | 2 files changed, 3 insertions(+), 1 deletion(-) |
| 12 | |
| 13 | diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h |
| 14 | index de65292..07f597b 100644 |
| 15 | --- a/include/ipmitool/ipmi_hpmfwupg.h |
| 16 | +++ b/include/ipmitool/ipmi_hpmfwupg.h |
| 17 | @@ -800,7 +800,7 @@ typedef struct _VERSIONINFO { |
| 18 | char descString[HPMFWUPG_DESC_STRING_LENGTH + 1]; |
| 19 | }VERSIONINFO, *PVERSIONINFO; |
| 20 | |
| 21 | -VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; |
| 22 | +extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; |
| 23 | |
| 24 | #define TARGET_VER (0x01) |
| 25 | #define ROLLBACK_VER (0x02) |
| 26 | diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c |
| 27 | index bbcffc0..d7cdcd6 100644 |
| 28 | --- a/lib/ipmi_hpmfwupg.c |
| 29 | +++ b/lib/ipmi_hpmfwupg.c |
| 30 | @@ -58,6 +58,8 @@ ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf); |
| 31 | |
| 32 | extern int verbose; |
| 33 | |
| 34 | +VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; |
| 35 | + |
| 36 | int HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename, |
| 37 | int activate, int, int); |
| 38 | int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx); |
| 39 | -- |
| 40 | 2.28.0 |
| 41 | |