From 61f9695f20a575085d0579a0d3efc41b322ce1ac Mon Sep 17 00:00:00 2001 From: Oliver Smith-Denny Date: Wed, 4 Sep 2024 10:02:09 -0700 Subject: BaseTools: Remove Pip BaseTools BaseTools was moved out to a separate repo and consumed as a pip module by edk2 CI. This process has not led to the desired goals of doing so, so this patch removes the pip based BaseTools from edk2 CI. The original goal of moving BaseTools to a pip module was primarily to speed up the development process, as the old edk2 mailing list was slow. However, with edk2 moving to PRs, it now actually slows the BaseTools development process to have to do a PR in another repo, publish the module, and then make a PR in edk2 to consume the new BaseTools. It also holds up using the features in a new BaseTools in other PRs. There were other goals of moving, such as allowing projects to use the BaseTools outside of edk2. This can still be accomplished outside of this PR, this PR simply stops edk2 CI from using the pip module. Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Oliver Smith-Denny --- BaseTools/BuildEnv | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'BaseTools/BuildEnv') diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv index bd6235d74f..1d9526bdfc 100755 --- a/BaseTools/BuildEnv +++ b/BaseTools/BuildEnv @@ -198,16 +198,7 @@ AddEdkToolsToPath() { EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory` - # check if the edk2basetools pip package is available - if $PYTHON_COMMAND -c "import edk2basetools" > /dev/null 2>&1; then - # if it is, use the pip version of the wrappers - echo "Using Pip Basetools" - AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike - else - echo "Using EDK2 in-source Basetools" - AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike - fi - + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike AddDirToStartOfPath $EDK_TOOLS_PATH_BIN -- cgit v1.2.3