mirror of https://github.com/acidanthera/audk.git
BaseTools: Don't require ECP pkg in WORKSPACE when PACKAGES_PATH is set
When PACKAGES_PATH is set, ECP pkg may be in another directory, not exist in WORKSPACE. So, keep this check in single WORKSPACE. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao <liming.gao@intel.com> Reviewed-by: Michael Kinney <michael.d.kinney@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18731 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
a100d0073b
commit
31b27ef1aa
|
@ -156,16 +156,18 @@ def CheckEnvVariable():
|
|||
EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in EFI_SOURCE path",
|
||||
ExtraData=EfiSourceDir)
|
||||
|
||||
# change absolute path to relative path to WORKSPACE
|
||||
if EfiSourceDir.upper().find(WorkspaceDir.upper()) != 0:
|
||||
EdkLogger.error("build", PARAMETER_INVALID, "EFI_SOURCE is not under WORKSPACE",
|
||||
ExtraData="WORKSPACE = %s\n EFI_SOURCE = %s" % (WorkspaceDir, EfiSourceDir))
|
||||
if EdkSourceDir.upper().find(WorkspaceDir.upper()) != 0:
|
||||
EdkLogger.error("build", PARAMETER_INVALID, "EDK_SOURCE is not under WORKSPACE",
|
||||
ExtraData="WORKSPACE = %s\n EDK_SOURCE = %s" % (WorkspaceDir, EdkSourceDir))
|
||||
if EcpSourceDir.upper().find(WorkspaceDir.upper()) != 0:
|
||||
EdkLogger.error("build", PARAMETER_INVALID, "ECP_SOURCE is not under WORKSPACE",
|
||||
ExtraData="WORKSPACE = %s\n ECP_SOURCE = %s" % (WorkspaceDir, EcpSourceDir))
|
||||
# check those variables on single workspace case
|
||||
if not PackagesPath:
|
||||
# change absolute path to relative path to WORKSPACE
|
||||
if EfiSourceDir.upper().find(WorkspaceDir.upper()) != 0:
|
||||
EdkLogger.error("build", PARAMETER_INVALID, "EFI_SOURCE is not under WORKSPACE",
|
||||
ExtraData="WORKSPACE = %s\n EFI_SOURCE = %s" % (WorkspaceDir, EfiSourceDir))
|
||||
if EdkSourceDir.upper().find(WorkspaceDir.upper()) != 0:
|
||||
EdkLogger.error("build", PARAMETER_INVALID, "EDK_SOURCE is not under WORKSPACE",
|
||||
ExtraData="WORKSPACE = %s\n EDK_SOURCE = %s" % (WorkspaceDir, EdkSourceDir))
|
||||
if EcpSourceDir.upper().find(WorkspaceDir.upper()) != 0:
|
||||
EdkLogger.error("build", PARAMETER_INVALID, "ECP_SOURCE is not under WORKSPACE",
|
||||
ExtraData="WORKSPACE = %s\n ECP_SOURCE = %s" % (WorkspaceDir, EcpSourceDir))
|
||||
|
||||
# check EDK_TOOLS_PATH
|
||||
if "EDK_TOOLS_PATH" not in os.environ:
|
||||
|
|
Loading…
Reference in New Issue