From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=y1DwEvZX; spf=pass (domain: bsdio.com, ip: 64.147.123.19, mailfrom: rebecca@bsdio.com) 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) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 09 May 2023 00:25:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1683606346; x= 1683692746; bh=FvBv5akDXuTsanhXP6r0lIFZLVV8/e5Br2dzIWMnL1A=; b=y 1DwEvZX1bm9+jcIchxLGH8pbHwqE6s99AsinRMQ5usbL40FR4femPkgYUUE/lqn3 jPKYh2cjqirkNJjQqatiPJxjdT1+ZXfLvbbCg6EI4/8i8Opqep4p3BoKgcAzIUS0 zibkqnJbliBgFHimWFCPCPuG6vEHDJFM6yiKsybC4pBYttf16G8Zz5wYyHIfFvU1 p73aZxeNRL2Qm+F1jsw6WEVD90EYC7TSkhJTlN1Qa4S8ryqtwd2VwEeniIwgv49t oef7HyedKPy1TUqwZ1AwXc6fpK1/naMKJCqMBbYXFR1ihg3FKBfg3NrhTYRhbs69 1GKA+pt+hOTx6iSKfSm8Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1683606346; x= 1683692746; bh=FvBv5akDXuTsanhXP6r0lIFZLVV8/e5Br2dzIWMnL1A=; b=C 63DijOlwJ3yAUuuSTjmBhb/Uoyyp4JWvAakXqeEIuZiHDgWf8iZY7/FfYkrxzkfI BIHW91umzI111tc5Y9FcIyjsQ8ei0AbQXxq65LF0fEVZ4tH8Z+5+eTlzdddV1zfv ZfmSGoFEN8lHAZWxbbNGmspyIB7xVNwr2TwGqnhJ6MhasipliOXg22/naHAy0CUP 9cWyL+SeF59ls6nR4xYWNZRiOB6R4EqRSu+P01ASrG9k087sekPCguwR2EoiALGx 1PAEZ5rXje0p03ZLr6J3NChTGujsNVB6h4IpIrAoeCvenWPjBfb6BbfjUq9B97Q8 iSXZ7bAaWO18CwPSKRMFg== 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 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-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> X-Mailer: git-send-email 2.40.0.windows.1 In-Reply-To: <20230509042524.612-1-rebecca@bsdio.com> References: <20230509042524.612-1-rebecca@bsdio.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%" - set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python - set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH% + set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH% goto print_python_info :use_pip_basetools @echo Using Pip Basetools set "PATH=%BASE_TOOLS_PATH%\BinPipWrappers\WindowsLike;%PATH%" - set BASETOOLS_PYTHON_SOURCE=edk2basetools + set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH% goto print_python_info :print_python_info -- 2.40.0.windows.1