From 95cc9a51e1057ace27ef09b5e19fa45d3e66ef2b Mon Sep 17 00:00:00 2001 From: Chris Ruffin Date: Thu, 3 Aug 2017 23:37:42 +0800 Subject: [PATCH] BaseTools/edksetup.sh: fix invalid test for current working directory edksetup.sh implements a test that requires the current working directory to contain the edksetup.sh script. This test has the side effect of requiring the WORKSPACE to be set to the same directory as the edksetup.sh. In a multiple workspace configuration, it is required to be able to have a WORKSPACE that is different from the directory that contains edksetup.sh. This changeset skips this test if PACKAGE_PATH is set. Change-Id: Ie6f16a08c012baf4e650c48cc8e91cdc466d05f2 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Chris Ruffin Reviewed-by: Yonghong Zhu --- edksetup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edksetup.sh b/edksetup.sh index ec54f9ea40..93d6525758 100755 --- a/edksetup.sh +++ b/edksetup.sh @@ -54,7 +54,7 @@ function SetWorkspace() return 0 fi - if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ] + if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ] && [ -z "$PACKAGES_PATH" ] then echo Run this script from the base of your tree. For example: echo " cd /Path/To/Edk/Root" -- 2.39.2