Merge pull request #11353 from kvuorine/fwknop-fixes
[feed/packages.git] / admin / ipmitool / patches / 0012-gcc10.patch
1 From c3939dac2c060651361fc71516806f9ab8c38901 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 Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
7 ---
8 include/ipmitool/ipmi_hpmfwupg.h | 2 +-
9 lib/ipmi_hpmfwupg.c | 2 ++
10 2 files changed, 3 insertions(+), 1 deletion(-)
11
12 diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h
13 index de65292b..07f597be 100644
14 --- a/include/ipmitool/ipmi_hpmfwupg.h
15 +++ b/include/ipmitool/ipmi_hpmfwupg.h
16 @@ -800,7 +800,7 @@ typedef struct _VERSIONINFO {
17 char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
18 }VERSIONINFO, *PVERSIONINFO;
19
20 -VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
21 +extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
22
23 #define TARGET_VER (0x01)
24 #define ROLLBACK_VER (0x02)
25 diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c
26 index 4aa8cecd..d63d2c15 100644
27 --- a/lib/ipmi_hpmfwupg.c
28 +++ b/lib/ipmi_hpmfwupg.c
29 @@ -58,6 +58,8 @@
30
31 extern int verbose;
32
33 +VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
34 +
35 int HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename,
36 int activate, int, int);
37 int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx);