Branch: refs/heads/master Home: https://github.com/tianocore/edk2 Commit: 50528537b2fb0ebdf32c719a0525635c93b905c2 https://github.com/tianocore/edk2/commit/50528537b2fb0ebdf32c719a0525635c93b905c2 Author: Tan, Ming <ming....@intel.com> Date: 2020-07-24 (Fri, 24 Jul 2020)
Changed paths: M IntelFsp2Pkg/Tools/GenCfgOpt.py Log Message: ----------- IntelFsp2Pkg/Tools/GenCfgOpt.py: Fix a bug about parse macro REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2827 Fix a bug about parse the macro value which use another macro. Use the following example to verify: [Define] DEFINE M1 = V1 DEFINE M2 = $(M1)/V2 !include $(M2)/pcd.dsc The old code will failed parse M2 and cause following error: Traceback (most recent call last): File "Edk2\IntelFsp2Pkg\Tools\GenCfgOpt.py", line 1550, in <module> sys.exit(Main()) File "Edk2\IntelFsp2Pkg\Tools\GenCfgOpt.py", line 1513, in Main if GenCfgOpt.ParseDscFile(DscFile, FvDir) != 0: File "Edk2\IntelFsp2Pkg\Tools\GenCfgOpt.py", line 533, in ParseDscFile NewDscLines = IncludeDsc.readlines() ValueError: I/O operation on closed file. The tool should support the value use another macro, and expand it. Cc: Chasel Chiu <chasel.c...@intel.com> Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> Cc: Star Zeng <star.z...@intel.com> Signed-off-by: Ming Tan <ming....@intel.com> Reviewed-by: Chasel Chiu <chasel.c...@intel.com> _______________________________________________ edk2-commits mailing list edk2-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-commits