[PATCH] BaseTools/edksetup.sh: fix invalid test for current working directory

[PATCH] BaseTools/edksetup.sh: fix invalid test for current working directory

[Chris Ruffin]

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>
---
 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.13.3.windows.1

Re: [PATCH] BaseTools/edksetup.sh: fix invalid test for current working directory

[Zhu, Yonghong]

Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

Best Regards,
Zhu Yonghong


-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Chris Ruffin
Sent: Thursday, August 03, 2017 11:38 PM
To: edk2-devel@lists.01.org
Subject: [edk2] [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 <chris.ruffin@intel.com>
---
 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.13.3.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel