From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web09.202.1611868652162677903 for ; Thu, 28 Jan 2021 13:17:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gb1fTWWW; spf=pass (domain: gmail.com, ip: 209.85.215.178, mailfrom: matthewfcarlson@gmail.com) Received: by mail-pg1-f178.google.com with SMTP id b21so5136186pgk.7 for ; Thu, 28 Jan 2021 13:17:32 -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=/hsxSBaBQegclaXRkb5arEiIuVWkKAX0i4VRZiTUMhs=; b=gb1fTWWWlkNJDiPYsGZbE4gdl/sgu/Vx4RrJCThCatrK4nNP2CB1zQEfvmjaH9EK7c jLsp90cdwC4yXCzkkQdRAlttRCYPT0e5xx2qGCC0Xo/2DRg5SsBzkdKDToaNBA4T0Ta6 Z+yjOwVcRDfWMz09UwLQMb2VIyjLy7Qo23koJFhhmsZnbFgod9uVkQIQY6LjtTs3G85r fldnEdBGVCTcKRMs4IOsCycMWv8tsUcqlseXwakYnnaEjc0CRbui7LQO6VnSxgecxMYK iZAOwj4o4omsxFIasrQowLG1/O/IohbbtnolSuIB8CSVoNV6O2/L/p4xmj/fBqw7U9sU lpqQ== 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=/hsxSBaBQegclaXRkb5arEiIuVWkKAX0i4VRZiTUMhs=; b=ZUzdVq4My5UKMB0NoiAau04o3kyjjjIeY013jzTBTwzmA4izSoVt7XLUfsF2RyI2y1 lBfpFDgbuyYKGKd61aHP+bFJLDg3BtLSt9U5YqHNLHE9B+H6RmSM81vVBvMl/Xgry1JX oilFF/IqeExpdHUaNvxutoLkWYwDS4EsZISJXYth2bd6Tz6AKUof28Qowc4oXHeM6Y7Z /SJWSU851VWaKO7j1T6T/LMW81jARAKNk8vtvC+rL9nt884hvXrFmv16DCH33zmJepKB tdPcsnV7icOsdOCsdvR6mi33UyPVrauRyj7GOLma2TOni8bp+4GpdOZYO6A7SOc/hjD5 iskA== X-Gm-Message-State: AOAM531H20ZoBxO4AyVD9lUj9HR6nwyZP3vHcxoXqYfQvXoCSJ/mhG32 l8JHfhC1uPqVDuX+2nP8Z1Vbk+U49JL95Q== X-Google-Smtp-Source: ABdhPJyea6XnVEcID+UbGQ57nZV7NKFBVCIFxVrrBQ/kpoOaYiHwk2WEiRL54kaf6iCL6Z0pQzdMCw== X-Received: by 2002:a62:484:0:b029:1b7:878b:c170 with SMTP id 126-20020a6204840000b02901b7878bc170mr1424070pfe.28.1611868651350; Thu, 28 Jan 2021 13:17:31 -0800 (PST) Return-Path: Received: from localhost.localdomain ([50.34.54.79]) by smtp.gmail.com with ESMTPSA id b65sm7001623pfg.3.2021.01.28.13.17.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 13:17:31 -0800 (PST) From: "Matthew Carlson" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao , Yuwei Chen , Sean Brogan , Michael Kinney Subject: [PATCH v4 0/1] Use Pip version of BaseTools Date: Thu, 28 Jan 2021 13:17:19 -0800 Message-Id: <20210128211720.1317-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. V4 Changes: converted files to DOX line ending, added executable chmod to unix binwrappers, and removed unnecessary binwrappers. 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/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 | 3 +- BaseTools/BinWrappers/PosixLike/posix_path_env.yaml | 1 + BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml | 1 + BaseTools/BuildEnv | 14 ++++- BaseTools/Scripts/PatchCheck.py | 1 + BaseTools/Source/Python/README.md | 29 +++++++++++ BaseTools/toolsetup.bat | 19 +++++++ pip-requirements.txt | 1 + 55 files changed, 797 insertions(+), 25 deletions(-) create mode 100755 BaseTools/BinPipWrappers/PosixLike/AmlToC create mode 100755 BaseTools/BinPipWrappers/PosixLike/BPDG create mode 100755 BaseTools/BinPipWrappers/PosixLike/BrotliCompress create mode 100755 BaseTools/BinPipWrappers/PosixLike/DevicePath create mode 100755 BaseTools/BinPipWrappers/PosixLike/Ecc create mode 100755 BaseTools/BinPipWrappers/PosixLike/EfiRom create mode 100755 BaseTools/BinPipWrappers/PosixLike/GenCrc32 create mode 100755 BaseTools/BinPipWrappers/PosixLike/GenDepex create mode 100755 BaseTools/BinPipWrappers/PosixLike/GenFds create mode 100755 BaseTools/BinPipWrappers/PosixLike/GenFfs create mode 100755 BaseTools/BinPipWrappers/PosixLike/GenFv create mode 100755 BaseTools/BinPipWrappers/PosixLike/GenFw create mode 100755 BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable create mode 100755 BaseTools/BinPipWrappers/PosixLike/GenSec create mode 100755 BaseTools/BinPipWrappers/PosixLike/GenerateCapsule create mode 100755 BaseTools/BinPipWrappers/PosixLike/LzmaCompress create mode 100755 BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress create mode 100755 BaseTools/BinPipWrappers/PosixLike/PatchPcdValue create mode 100755 BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign create mode 100755 BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys create mode 100755 BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign create mode 100755 BaseTools/BinPipWrappers/PosixLike/Split create mode 100755 BaseTools/BinPipWrappers/PosixLike/TargetTool create mode 100755 BaseTools/BinPipWrappers/PosixLike/TianoCompress create mode 100755 BaseTools/BinPipWrappers/PosixLike/Trim create mode 100755 BaseTools/BinPipWrappers/PosixLike/UPT create mode 100755 BaseTools/BinPipWrappers/PosixLike/VfrCompile create mode 100755 BaseTools/BinPipWrappers/PosixLike/VolInfo create mode 100755 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 (70%) create mode 100644 BaseTools/Source/Python/README.md -- 2.29.0.vfs.0.0