From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web12.3358.1604363802113751030 for ; Mon, 02 Nov 2020 16:36:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=A7Q+Okg/; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: matthewfcarlson@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id y14so12661131pfp.13 for ; Mon, 02 Nov 2020 16:36:42 -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=Z0Fzb4kyT6PgLwdHKsjNVpIinDFb8bAcstsfRroxCcA=; b=A7Q+Okg/M0SaXok0+zSyl5zXJo3aXJsbNYYvQHbaO5hd1owIf5TUkvJw2K34qtWW+L dwg3i7lcPbDcsyKsR2CZ+MLXc/bejVeqCjOu+n+G6TeTDYXQlc8N8CTDihKU9p57fQAj MSzdRC5OA+xPg6GbruUdCrzxOxUnHqlGhwoo8dLjG65U3vu0mp9GhdZQHGoKSM2GPFiO 0ri7SZJXJcN3H31UevJ/Pu+CUaVAImocKzaIYJWUcAnH1IIjlpvKEI+bO2iij+o1C+C6 V3DGIGK8AiOd5QZq6ayWcqpEcEdk4LvPK++MRHqvO7QPwQoN9zm4tHKdJhkShp8ULvHr EU1w== 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=Z0Fzb4kyT6PgLwdHKsjNVpIinDFb8bAcstsfRroxCcA=; b=oROlinUp/CpTtIckcx8MIsE7G1z1wFdXb8yyy1LwE6VaWyTh5u5hZCvXXAqIf65QAc p1mKbWNhxWmeif9hef4768ukNHLiuHBr/roPhRzKVJ88+CCZ3RDbHh06qupBQt4/LveX VoN8jELy2nG6tSFB8m8hmd1/5VspzgY40+3esdOExh24UlxZetOuKqpbcsWrjxCHDvc5 o/kruBg2VoCnTrcF5OVK6atV1KtU/TPbGZuNMZ5C7sQT+ZO2rQFyXxxbp96J2Z6hPFUp vb5vljgYh6uvAd76iu708r17IS86GVMLgOUQKUjmEoSd5X9E2A/NhM5cHbyLzJVQeqB7 Bgow== X-Gm-Message-State: AOAM531c+iUl3lFvHMZ2dhhorsIb/Bc/6+bZynS6gs12Z8exsrcVwGTP jtrFKvWf9kM9CuGnV/YNWozDUctI73OxsA== X-Google-Smtp-Source: ABdhPJyIrs8nJyagC8j2g6ElMSROlVPTW4ZY2EjgM+5pOnUDjykNFhpJLUvw+pqcgLB634pd0FP6zw== X-Received: by 2002:a17:90a:ea8a:: with SMTP id h10mr875447pjz.142.1604363801372; Mon, 02 Nov 2020 16:36:41 -0800 (PST) Return-Path: Received: from localhost.localdomain ([50.34.53.167]) by smtp.gmail.com with ESMTPSA id x15sm630853pjh.21.2020.11.02.16.36.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 16:36:40 -0800 (PST) From: "Matthew Carlson" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao , Yuwei Chen , Sean Brogan , Michael Kinney Subject: [PATCH v1 0/1] Use Pip version of BaseTools Date: Mon, 2 Nov 2020 16:36:29 -0800 Message-Id: <20201103003630.1869-1-matthewfcarlson@gmail.com> X-Mailer: git-send-email 2.28.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. 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 | 20 +- 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 | 3 +- 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 | 548 ++++++++++---------- BaseTools/Scripts/PatchCheck.py | 1 + BaseTools/toolsetup.bat | 19 + pip-requirements.txt | 1 + 55 files changed, 1035 insertions(+), 272 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 (71%) 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%) -- 2.28.0.vfs.0.0