.../Source/C/FMMT/FirmwareModuleManagement.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
Fixed the FMMT Linux build issue which was introduced
by the commit 950333853b5fe2b73a7b5148501458cc97a01481
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Yunhua Feng <fengyunhua@byosoft.com.cn>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
---
.../Source/C/FMMT/FirmwareModuleManagement.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c b/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c
index 20663ba163..8a7ae096d0 100644
--- a/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c
+++ b/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c
@@ -9,11 +9,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include "FirmwareModuleManagement.h"
#include "Rebase.h"
#include <stdlib.h>
#include <wchar.h>
-
+#if defined(__linux__)
+#include <limits.h>
+#define _MAX_DIR PATH_MAX
+#endif
CHAR8* mGuidToolDefinition = "FmmtConf.ini";
extern EFI_FIRMWARE_VOLUME_HEADER *mFvHeader;
extern UINT32 mFvLength;
//
@@ -1715,15 +1718,10 @@ FmmtImageExtract (
EFI_STATUS Status;
FIRMWARE_DEVICE *FdData;
FV_INFORMATION *FvInFd;
UINT32 Index;
UINT32 FfsFoundFlag;
- FFS_INFORMATION *OutputFileName;
- FILE* NewFdFile;
- FILE* NewFvFile;
- UINT64 NewFvLength;
- VOID* Buffer;
CHAR8 *TemDir;
UINT8 FvNumInFd;
UINT32 Offset;
UINT8 *FdBuffer;
EFI_FFS_FILE_HEADER2 *CurrentFile;
@@ -1738,18 +1736,13 @@ FmmtImageExtract (
int j;
CHAR8 FfsOutputFileName[_MAX_DIR];
FdSize = 0;
Index = 0;
- NewFvLength = 0;
FfsFoundFlag = 0;
FdData = NULL;
FvInFd = NULL;
- OutputFileName = NULL;
- NewFdFile = NULL;
- NewFvFile = NULL;
- Buffer = NULL;
TemDir = NULL;
FvNumInFd = 0;
Offset = 0;
FdBuffer = NULL;
if (sizeof(FfsOutFileOrDirName) > _MAX_DIR) {
--
2.20.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#66163): https://edk2.groups.io/g/devel/message/66163
Mute This Topic: https://groups.io/mt/77478681/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
On 10/13/20 9:23 AM, Bob Feng wrote: > Fixed the FMMT Linux build issue which was introduced > by the commit 950333853b5fe2b73a7b5148501458cc97a01481 fatal: bad object 950333853b5fe2b73a7b5148501458cc97a01481 > > Signed-off-by: Bob Feng <bob.c.feng@intel.com> > Cc: Yunhua Feng <fengyunhua@byosoft.com.cn> > Cc: Liming Gao <gaoliming@byosoft.com.cn> > --- > .../Source/C/FMMT/FirmwareModuleManagement.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66164): https://edk2.groups.io/g/devel/message/66164 Mute This Topic: https://groups.io/mt/77478681/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
Hi Phil, Since the FMMT tool is in the edk2-staging repo, branch FceFmmt, the 950333853b5fe2b73a7b5148501458cc97a01481 is in there. Thanks, Bob -----Original Message----- From: Philippe Mathieu-Daudé <philmd@redhat.com> Sent: Tuesday, October 13, 2020 4:02 PM To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com> Cc: Yunhua Feng <fengyunhua@byosoft.com.cn>; Liming Gao <gaoliming@byosoft.com.cn> Subject: Re: [edk2-devel] [Patch] Basetools: Fixed FMMT Linux build break issue On 10/13/20 9:23 AM, Bob Feng wrote: > Fixed the FMMT Linux build issue which was introduced by the commit > 950333853b5fe2b73a7b5148501458cc97a01481 fatal: bad object 950333853b5fe2b73a7b5148501458cc97a01481 > > Signed-off-by: Bob Feng <bob.c.feng@intel.com> > Cc: Yunhua Feng <fengyunhua@byosoft.com.cn> > Cc: Liming Gao <gaoliming@byosoft.com.cn> > --- > .../Source/C/FMMT/FirmwareModuleManagement.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66165): https://edk2.groups.io/g/devel/message/66165 Mute This Topic: https://groups.io/mt/77478681/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
On 10/13/20 10:32 AM, Feng, Bob C wrote: > Hi Phil, > > Since the FMMT tool is in the edk2-staging repo, branch FceFmmt, the 950333853b5fe2b73a7b5148501458cc97a01481 is in there. Well this is confusing. Some contributors use the staging/ prefix in their patch subject. Maybe the contribution guideline could be updated. > > Thanks, > Bob > > -----Original Message----- > From: Philippe Mathieu-Daudé <philmd@redhat.com> > Sent: Tuesday, October 13, 2020 4:02 PM > To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com> > Cc: Yunhua Feng <fengyunhua@byosoft.com.cn>; Liming Gao <gaoliming@byosoft.com.cn> > Subject: Re: [edk2-devel] [Patch] Basetools: Fixed FMMT Linux build break issue > > On 10/13/20 9:23 AM, Bob Feng wrote: >> Fixed the FMMT Linux build issue which was introduced by the commit >> 950333853b5fe2b73a7b5148501458cc97a01481 > > fatal: bad object 950333853b5fe2b73a7b5148501458cc97a01481 > >> >> Signed-off-by: Bob Feng <bob.c.feng@intel.com> >> Cc: Yunhua Feng <fengyunhua@byosoft.com.cn> >> Cc: Liming Gao <gaoliming@byosoft.com.cn> >> --- >> .../Source/C/FMMT/FirmwareModuleManagement.c | 15 ++++----------- >> 1 file changed, 4 insertions(+), 11 deletions(-) > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66167): https://edk2.groups.io/g/devel/message/66167 Mute This Topic: https://groups.io/mt/77478681/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
Sorry for confusion. I'll update the patch title, it should have [edk2-staging] prefix. Thanks, Bob -----Original Message----- From: Philippe Mathieu-Daudé <philmd@redhat.com> Sent: Tuesday, October 13, 2020 4:48 PM To: Feng, Bob C <bob.c.feng@intel.com>; devel@edk2.groups.io Cc: Yunhua Feng <fengyunhua@byosoft.com.cn>; Liming Gao <gaoliming@byosoft.com.cn> Subject: Re: [edk2-devel] [Patch] Basetools: Fixed FMMT Linux build break issue On 10/13/20 10:32 AM, Feng, Bob C wrote: > Hi Phil, > > Since the FMMT tool is in the edk2-staging repo, branch FceFmmt, the 950333853b5fe2b73a7b5148501458cc97a01481 is in there. Well this is confusing. Some contributors use the staging/ prefix in their patch subject. Maybe the contribution guideline could be updated. > > Thanks, > Bob > > -----Original Message----- > From: Philippe Mathieu-Daudé <philmd@redhat.com> > Sent: Tuesday, October 13, 2020 4:02 PM > To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com> > Cc: Yunhua Feng <fengyunhua@byosoft.com.cn>; Liming Gao > <gaoliming@byosoft.com.cn> > Subject: Re: [edk2-devel] [Patch] Basetools: Fixed FMMT Linux build > break issue > > On 10/13/20 9:23 AM, Bob Feng wrote: >> Fixed the FMMT Linux build issue which was introduced by the commit >> 950333853b5fe2b73a7b5148501458cc97a01481 > > fatal: bad object 950333853b5fe2b73a7b5148501458cc97a01481 > >> >> Signed-off-by: Bob Feng <bob.c.feng@intel.com> >> Cc: Yunhua Feng <fengyunhua@byosoft.com.cn> >> Cc: Liming Gao <gaoliming@byosoft.com.cn> >> --- >> .../Source/C/FMMT/FirmwareModuleManagement.c | 15 ++++----------- >> 1 file changed, 4 insertions(+), 11 deletions(-) > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66169): https://edk2.groups.io/g/devel/message/66169 Mute This Topic: https://groups.io/mt/77478681/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.