diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2016-11-14 17:41:11 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2016-11-15 10:23:22 +0800 |
| commit | 94e4bcbb5efaf86440e89293d80b0a73781fff12 (patch) | |
| tree | 97b2ad99a7d87ca09b2c3067e910d29f29b7e166 /BaseTools | |
| parent | f475f1e2361877e9947ecda98a697bc55fb9d85a (diff) | |
| download | edk2-94e4bcbb5efaf86440e89293d80b0a73781fff12.tar.gz edk2-94e4bcbb5efaf86440e89293d80b0a73781fff12.tar.bz2 edk2-94e4bcbb5efaf86440e89293d80b0a73781fff12.zip | |
BaseTools: FILE DATA to support relative path under Multiple workspace
Fix the bug that FILE DATA to support relative path under Multiple
workspace.
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Source/Python/GenFds/FdfParser.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py index f17a41f94d..2900283737 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -54,7 +54,7 @@ from Common import GlobalData from Common.String import ReplaceMacro
import uuid
from Common.Misc import tdict
-
+from Common.MultipleWorkspace import MultipleWorkspace as mws
import Common.LongFilePathOs as os
from Common.LongFilePathSupport import OpenLongFilePath as open
from Capsule import EFI_CERT_TYPE_PKCS7_GUID
@@ -3505,6 +3505,9 @@ class FdfParser: AnyFileName = self.__Token
self.__VerifyFile(AnyFileName)
+ if not os.path.isabs(AnyFileName):
+ AnyFileName = mws.join(GenFdsGlobalVariable.WorkSpaceDir, AnyFileName)
+
return AnyFileName
## __GetAnyFileStatement() method
|