summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ruffin <chris.ruffin@intel.com>2017-08-03 23:37:42 +0800
committerYonghong Zhu <yonghong.zhu@intel.com>2017-08-10 12:54:58 +0800
commit95cc9a51e1057ace27ef09b5e19fa45d3e66ef2b (patch)
tree990aa57c77e65af68dabcc18535e42909ba42296
parentd506d8db7168c2c12a9e7afe0bf9047d14ec4c54 (diff)
downloadedk2-95cc9a51e1057ace27ef09b5e19fa45d3e66ef2b.tar.gz
edk2-95cc9a51e1057ace27ef09b5e19fa45d3e66ef2b.tar.bz2
edk2-95cc9a51e1057ace27ef09b5e19fa45d3e66ef2b.zip
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 <chris.ruffin@intel.com> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
-rwxr-xr-xedksetup.sh2
1 files changed, 1 insertions, 1 deletions
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"