From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web09.3749.1610676928820706683 for ; Thu, 14 Jan 2021 18:15:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SPWlIlWq; spf=pass (domain: gmail.com, ip: 209.85.210.182, mailfrom: matthewfcarlson@gmail.com) Received: by mail-pf1-f182.google.com with SMTP id h186so4546761pfe.0 for ; Thu, 14 Jan 2021 18:15:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tq3OI8xziDuA9dfwt4Tyrv13AY8UJpeC4NZCSIqSx3s=; b=SPWlIlWqn+lTine6YO4BvEduYgFIXNerkdIHRirJfnwoZZIaEOMOUWR05qa50SlhTR 47b20bAwwAktz0mN4l//pJAqKQEYY4l7Bq7NNltw0ax5lipiNB3rhKmGcQeZ1X9F/dpa IJPlsLSzGVRfpFipXCl+x97lP/iT+7aaH4I/y0gq2TvE2mYRX5LDiA86FyFyBJJS9aYc vBuV8+Z2QTq1DgvrB00LzmMoX7My8Lcn/BIFIO91REQhBIv7dK5iUdaAPXE8XLk+YAjO uZHTEdTFe1Dg976kzHZGVIqZ1nkmeE0LZYbuluiXk8UBj23CwR/3N1QViLCSbxGeP26M W89w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tq3OI8xziDuA9dfwt4Tyrv13AY8UJpeC4NZCSIqSx3s=; b=bCnQE4SB4ZnX20QPtj35iTQu3/5DlB+sk284N4Y2wK+oR5qgouDU/kkKVvvMCYZIRM hYuGstaUB143KSSFkDpH4dNu8JG33sHlOSp42VzlKA31PjUU0tCV+4oTltnf6j46cOkI pKCSXUdkTnuq5IOg/nT2gEwW0WOL4PAAnQU0dkn6SlVOjVGrqgSnaVOvk0+IRgA1RZ8M mML4iABH75GYU2o3eB3zrhPJ/JMLPqUlVFrSLtHyc+yttNLxquhpqG5fnK8Tt0e4h78I a5Vg6IXIVAPXtrL2/seJN4jDYoBCs5l7PBP2o/7jMpl8MiyTA1YUnb/s59wye+ilG73w dmJA== X-Gm-Message-State: AOAM5321BHrXNFL8mDg7KMNuvaeQu+8TcTBYsG/Yk2w//vTKiFGZipOP +rBZI+ZEjb58BBOUYqJdeNw+sVgajuDoFA== X-Google-Smtp-Source: ABdhPJwDz40Gh3lkkVR1ykijT0GBgDVH53e88oBvcR5Sc+B+KuKmr49pP4n1e0SOr2gpjLjCgZjp6Q== X-Received: by 2002:a63:1d22:: with SMTP id d34mr10297999pgd.335.1610676927918; Thu, 14 Jan 2021 18:15:27 -0800 (PST) Return-Path: Received: from localhost.localdomain ([50.34.54.79]) by smtp.gmail.com with ESMTPSA id q23sm6256303pfg.192.2021.01.14.18.15.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jan 2021 18:15:27 -0800 (PST) From: "Matthew Carlson" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao , Yuwei Chen , Sean Brogan , Michael Kinney Subject: [PATCH v3 0/1] Use Pip version of BaseTools Date: Thu, 14 Jan 2021 18:15:18 -0800 Message-Id: <20210115021519.1080-1-matthewfcarlson@gmail.com> X-Mailer: git-send-email 2.29.0.vfs.0.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Matthew Carlson Hello all, This patch adds the capability to leverage the pip based BaseTools. The BaseTools master is current with EDK2 master (as of 3pm Nov 2, 2020). While I could rehash a lot of what has gone out on the mailing list, I think it might be better just to link the discussion. In a nutshell, setup will detect if edk2-basetools is installed, and if it is, use the other verison of BinWrappers (BinPipWrappers). This should provide an easy and convenient way to transition over. By default, CI uses the pip version. The pipeline is setup. Every commit that gets pushed to master on basetools get published to pypi and tagged. This should offer bisectability and easier debugging. Additionally, the pip requirements file tracks a specific version. We'd like to set a date for when PR's no longer go into EDK2 for BaseTools and instead go exclusively into the new basetools repo. V3 Changes: converted some files to unix line ending Ref: https://edk2.groups.io/g/devel/topic/76572200#64993 Ref: https://github.com/tianocore/edk2-basetools Ref: https://github.com/tianocore/edk2/pull/1072 Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Cc: Sean Brogan Cc: Michael Kinney Matthew Carlson (1): BaseTools: Use pip module if available, CI uses it by default .pytool/CISettings.py | 51 +- BaseTools/BinPipWrappers/PosixLike/AmlToC | 14 + BaseTools/BinPipWrappers/PosixLike/BPDG | 12 + BaseTools/BinPipWrappers/PosixLike/Brotli | 29 ++ BaseTools/BinPipWrappers/PosixLike/BrotliCompress | 34 ++ BaseTools/BinPipWrappers/PosixLike/DevicePath | 29 ++ BaseTools/BinPipWrappers/PosixLike/Ecc | 13 + BaseTools/BinPipWrappers/PosixLike/EfiRom | 29 ++ BaseTools/BinPipWrappers/PosixLike/GenCrc32 | 29 ++ BaseTools/BinPipWrappers/PosixLike/GenDepex | 12 + BaseTools/BinPipWrappers/PosixLike/GenFds | 12 + BaseTools/BinPipWrappers/PosixLike/GenFfs | 29 ++ BaseTools/BinPipWrappers/PosixLike/GenFv | 29 ++ BaseTools/BinPipWrappers/PosixLike/GenFw | 29 ++ BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable | 12 + BaseTools/BinPipWrappers/PosixLike/GenSec | 29 ++ BaseTools/BinPipWrappers/PosixLike/GenerateCapsule | 12 + BaseTools/BinPipWrappers/PosixLike/LzmaCompress | 29 ++ BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress | 19 + BaseTools/BinPipWrappers/PosixLike/PatchPcdValue | 12 + BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign | 12 + BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys | 12 + BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign | 12 + BaseTools/BinPipWrappers/PosixLike/Split | 29 ++ BaseTools/BinPipWrappers/PosixLike/TargetTool | 12 + BaseTools/BinPipWrappers/PosixLike/TianoCompress | 29 ++ BaseTools/BinPipWrappers/PosixLike/Trim | 13 + BaseTools/BinPipWrappers/PosixLike/UPT | 12 + BaseTools/BinPipWrappers/PosixLike/VfrCompile | 29 ++ BaseTools/BinPipWrappers/PosixLike/VolInfo | 29 ++ BaseTools/BinPipWrappers/PosixLike/build | 12 + BaseTools/{BinWrappers => BinPipWrappers}/PosixLike/posix_path_env.yaml | 21 +- BaseTools/BinPipWrappers/WindowsLike/AmlToC.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/BPDG.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/BrotliCompress.bat | 55 ++ BaseTools/BinPipWrappers/WindowsLike/Ecc.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/GenFds.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat | 1 + BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.bat | 1 + BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/Trim.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/UPT.bat | 3 + BaseTools/BinPipWrappers/WindowsLike/build.bat | 3 + BaseTools/{BinWrappers => BinPipWrappers}/WindowsLike/win_build_tools_path_env.yaml | 21 +- BaseTools/BinWrappers/PosixLike/posix_path_env.yaml | 1 + BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml | 1 + BaseTools/BuildEnv | 548 ++++++++++---------- BaseTools/Scripts/PatchCheck.py | 1 + BaseTools/Source/Python/README.md | 29 ++ BaseTools/toolsetup.bat | 19 + pip-requirements.txt | 1 + 56 files changed, 1102 insertions(+), 301 deletions(-) create mode 100644 BaseTools/BinPipWrappers/PosixLike/AmlToC create mode 100644 BaseTools/BinPipWrappers/PosixLike/BPDG create mode 100644 BaseTools/BinPipWrappers/PosixLike/Brotli create mode 100644 BaseTools/BinPipWrappers/PosixLike/BrotliCompress create mode 100644 BaseTools/BinPipWrappers/PosixLike/DevicePath create mode 100644 BaseTools/BinPipWrappers/PosixLike/Ecc create mode 100644 BaseTools/BinPipWrappers/PosixLike/EfiRom create mode 100644 BaseTools/BinPipWrappers/PosixLike/GenCrc32 create mode 100644 BaseTools/BinPipWrappers/PosixLike/GenDepex create mode 100644 BaseTools/BinPipWrappers/PosixLike/GenFds create mode 100644 BaseTools/BinPipWrappers/PosixLike/GenFfs create mode 100644 BaseTools/BinPipWrappers/PosixLike/GenFv create mode 100644 BaseTools/BinPipWrappers/PosixLike/GenFw create mode 100644 BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable create mode 100644 BaseTools/BinPipWrappers/PosixLike/GenSec create mode 100644 BaseTools/BinPipWrappers/PosixLike/GenerateCapsule create mode 100644 BaseTools/BinPipWrappers/PosixLike/LzmaCompress create mode 100644 BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress create mode 100644 BaseTools/BinPipWrappers/PosixLike/PatchPcdValue create mode 100644 BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign create mode 100644 BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys create mode 100644 BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign create mode 100644 BaseTools/BinPipWrappers/PosixLike/Split create mode 100644 BaseTools/BinPipWrappers/PosixLike/TargetTool create mode 100644 BaseTools/BinPipWrappers/PosixLike/TianoCompress create mode 100644 BaseTools/BinPipWrappers/PosixLike/Trim create mode 100644 BaseTools/BinPipWrappers/PosixLike/UPT create mode 100644 BaseTools/BinPipWrappers/PosixLike/VfrCompile create mode 100644 BaseTools/BinPipWrappers/PosixLike/VolInfo create mode 100644 BaseTools/BinPipWrappers/PosixLike/build copy BaseTools/{BinWrappers => BinPipWrappers}/PosixLike/posix_path_env.yaml (74%) create mode 100644 BaseTools/BinPipWrappers/WindowsLike/AmlToC.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/BPDG.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/BrotliCompress.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/Ecc.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/GenFds.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/Trim.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/UPT.bat create mode 100644 BaseTools/BinPipWrappers/WindowsLike/build.bat copy BaseTools/{BinWrappers => BinPipWrappers}/WindowsLike/win_build_tools_path_env.yaml (74%) create mode 100644 BaseTools/Source/Python/README.md -- 2.29.0.vfs.0.0