Sync basetools' source and binary files with r1707 of the basetools project.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9257 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 6 insertions, 1 deletions

diff --git a/BaseTools/Source/Python/GenFds/CapsuleData.py b/BaseTools/Source/Python/GenFds/CapsuleData.py
index db29737963..0940094de0 100644
--- a/BaseTools/Source/Python/GenFds/CapsuleData.py
+++ b/BaseTools/Source/Python/GenFds/CapsuleData.py
@@ -45,6 +45,7 @@ class CapsuleFfs (CapsuleData):
     #

     def __init_(self) :

         self.Ffs = None

+        self.FvName = None

 

     ## generate FFS capsule data

     #

@@ -64,7 +65,9 @@ class CapsuleFv (CapsuleData):
     #   @param  self        The object pointer

     #

     def __init__(self) :

+        self.Ffs = None

         self.FvName = None

+        self.CapsuleName = None

 

     ## generate FV capsule data

     #

@@ -76,9 +79,11 @@ class CapsuleFv (CapsuleData):
             if self.FvName.upper() in GenFdsGlobalVariable.FdfParser.Profile.FvDict.keys():

                 FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(self.FvName.upper())

                 FdBuffer = StringIO.StringIO('')

+                FvObj.CapsuleName = self.CapsuleName

                 FvFile = FvObj.AddToBuffer(FdBuffer)

+                FvObj.CapsuleName = None

+                FdBuffer.close()

                 return FvFile

-            

         else:

             FvFile = GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.FvName)

             return FvFile