From 7bc14212b3f640f34c343e38c508ecfd5e8409e5 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 28 Jul 2014 17:37:35 +0000 Subject: 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 Reviewed-by: Jordan Justen Signed-off-by: Paolo Bonzini git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15700 6f19259b-4bc3-4df7-8a09-765794883524 --- edksetup.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/edksetup.sh b/edksetup.sh index 0b7e33fd77..f00154e25a 100755 --- 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 } -- cgit v1.2.3