From nobody Tue Feb 10 14:49:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104318+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104318+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683606349; cv=none; d=zohomail.com; s=zohoarc; b=ZZhdVEjAHtezpIPx4mECcjALysRuwtAHcgp9Uz3jbmAqTrENX6Wqo3uzTo8UjBGqrsAHXvDy4OVmlXvkD26eL6yIbBD2E08cgtIAL+CLRXuHWBa79FUPBRHHKwnfUWo3YZ8Pqz1cJYV3PM64J1C2J2HKZNDryDRVssA3Mq3kd/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683606349; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=JpSIKDoJVCBPrZY2IbBhQgw12EBNIrieFvZfebJK1h0=; b=PumKkdPmntNdthR4fSy1XONjWzCOtKHlnO498Qg4hEf9fJk0V9WkXc+c8zPvdfpWe9b8g4P2a/e6V1qkuiORJsR3439kU5NpI/Fb+xRECQ3R+w44090NWHX4j8djdZILHvXucVgZCBX9XAL2jNlQ1C0OCMMQcxNXg72CyGL+vjo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104318+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683606349096124.89767720438533; Mon, 8 May 2023 21:25:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id vyWCYY1788612x4gewty2fRJ; Mon, 08 May 2023 21:25:48 -0700 X-Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by mx.groups.io with SMTP id smtpd.web10.24137.1683606347994129402 for ; Mon, 08 May 2023 21:25:48 -0700 X-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id B82A0320098C; Tue, 9 May 2023 00:25:46 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 09 May 2023 00:25:47 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefledgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 9 May 2023 00:25:45 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Andrew Fish , Leif Lindholm , Michael D Kinney , Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-devel] [edk2-stable202305 PATCH 1/3] BaseTools: Update toolsetup.bat to not use BASETOOLS_PYTHON_SOURCE Date: Mon, 8 May 2023 22:25:23 -0600 Message-Id: <20230509042524.612-2-rebecca@bsdio.com> In-Reply-To: <20230509042524.612-1-rebecca@bsdio.com> References: <20230509042524.612-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: 9YQAEeyZ8hm3Vuq4hdg74GKcx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683606348; bh=L/REMYtig9NhJTIGyCuyKLbOS/eRKzSvNqQPGb8Hywg=; h=Cc:Date:From:Reply-To:Subject:To; b=INOd8XJEPTZ47C8HT/ys4tojdBIS4OyC+pXFSU5rdrYqy6MHO8FzLCOSvPkQMS7gtSV +wgjOzzVkDaomidPKaqu5xFdDUOqxJBvERcnURBKglboxr6SgYeM/lt5mI5rg+pzlxkdd PHRotoMp63iMAUvIM5AXALolzQr7Nt2+rDQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683606350623100005 Content-Type: text/plain; charset="utf-8" The BASETOOLS_PYTHON_SOURCE environment variable is only used temporarily to set PYTHONPATH. Since it doesn't help improve clarity, remove it. While here, make sure we set PYTHONPATH when we're using Pip BaseTools so that build etc. can be found. Signed-off-by: Rebecca Cran --- BaseTools/toolsetup.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index dc6288effd7d..85104aa224da 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -371,14 +371,13 @@ if %ERRORLEVEL% EQU 0 ( @echo Using EDK2 in-source Basetools if defined BASETOOLS_PYTHON_SOURCE goto print_python_info set "PATH=3D%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%" - set BASETOOLS_PYTHON_SOURCE=3D%BASE_TOOLS_PATH%\Source\Python - set PYTHONPATH=3D%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH% + set PYTHONPATH=3D%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH% goto print_python_info =20 :use_pip_basetools @echo Using Pip Basetools set "PATH=3D%BASE_TOOLS_PATH%\BinPipWrappers\WindowsLike;%PATH%" - set BASETOOLS_PYTHON_SOURCE=3Dedk2basetools + set PYTHONPATH=3D%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH% goto print_python_info =20 :print_python_info --=20 2.40.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104318): https://edk2.groups.io/g/devel/message/104318 Mute This Topic: https://groups.io/mt/98777505/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-