BaseTool: correct the generate compress section process

First generate a dummy file with section alignment,
then compress the dummy file to generate the compress file

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/GenFds/CompressSection.py b/BaseTools/Source/Python/GenFds/CompressSection.py
index 98532ed8e698d769106d8a57de24fa9f57585f8f..56e71a35453b92edf1b77d62dc0e1e28d7a15904 100644 (file)
--- a/BaseTools/Source/Python/GenFds/CompressSection.py
+++ b/BaseTools/Source/Python/GenFds/CompressSection.py
@@ -60,6 +60,7 @@ class CompressSection (CompressSectionClassObject) :
             self.Alignment = FfsInf.__ExtendMacro__(self.Alignment)\r
 \r
         SectFiles = tuple()\r
+        SectAlign = []\r
         Index = 0\r
         MaxAlign = None\r
         for Sect in self.SectionList:\r
@@ -76,13 +77,7 @@ class CompressSection (CompressSectionClassObject) :
                     AlignValue = "1"\r
                 for FileData in ReturnSectList:\r
                     SectFiles += (FileData,)\r
-\r
-        if MaxAlign != None:\r
-            if self.Alignment == None:\r
-                self.Alignment = MaxAlign\r
-            else:\r
-                if GenFdsGlobalVariable.GetAlignment (MaxAlign) > GenFdsGlobalVariable.GetAlignment (self.Alignment):\r
-                    self.Alignment = MaxAlign\r
+                    SectAlign.append(AlignValue)\r
 \r
         OutputFile = OutputPath + \\r
                      os.sep     + \\r
@@ -91,8 +86,10 @@ class CompressSection (CompressSectionClassObject) :
                      SecNum     + \\r
                      Ffs.SectionSuffix['COMPRESS']\r
         OutputFile = os.path.normpath(OutputFile)\r
+        DummyFile = OutputFile + '.dummy'\r
+        GenFdsGlobalVariable.GenerateSection(DummyFile, SectFiles, InputAlign=SectAlign, IsMakefile=IsMakefile)\r
 \r
-        GenFdsGlobalVariable.GenerateSection(OutputFile, SectFiles, Section.Section.SectionType['COMPRESS'],\r
+        GenFdsGlobalVariable.GenerateSection(OutputFile, [DummyFile], Section.Section.SectionType['COMPRESS'],\r
                                              CompressionType=self.CompTypeDict[self.CompType], IsMakefile=IsMakefile)\r
         OutputFileList = []\r
         OutputFileList.append(OutputFile)\r