edksetup.sh: Look for BuildEnv under EDK_TOOLS_PATH

EDK_TOOLS_PATH is basically a replacement for $WORKSPACE/BaseTools.

It makes sense to check for BuildEnv there, then, if $WORKSPACE
is absent but $EDK_TOOLS_PATH is present.

With this patch, it is possible to separately package tools in
/usr and use them compile EDK2 (doing "rm -rf BaseTools" in the
EDK2 tree).  This is desirable for OS distributions that need to
distribute the tools in a "free software" repository and OVMF in
a "non-free software" repository; bundling the same code in two
different packages causes confusion.  It is also simpler for distros
because the build process for BaseTools and OVMF is completely
different.

Contributed-under: TianoCore Contribution Agreement 1.0
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15700 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/edksetup.sh b/edksetup.sh
index 0b7e33fd77769eefa62b30278003ef54830b31ca..f00154e25abf93f6d36b0e08fe2ed1cb2f2b0a9c 100755 (executable)
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -35,11 +35,14 @@ function HelpMsg()
 
 function SetupEnv()
 {
-  if [ -z "$WORKSPACE" ]
+  if [ -n "$EDK_TOOLS_PATH" ]
+  then
+    . $EDK_TOOLS_PATH/BuildEnv $*
+  elif [ -n "$WORKSPACE" ]
   then
-    . BaseTools/BuildEnv $*
-  else
     . $WORKSPACE/BaseTools/BuildEnv $*
+  else
+    . BaseTools/BuildEnv $*
   fi
 }