From nobody Thu May 2 02:04:44 2024 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+71521+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+71521+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1612882701; cv=none; d=zohomail.com; s=zohoarc; b=hbE7MKm1zqaOYR3psH64MJcO9kr1dTCDCFr6f9CLENrqZjKiteHAiK1LvsYkEYiJSMrXZEAJFcWLxLzdUldUhaDrh7En71+y/lUUykAee01YLUpBQUw/GVN6swl4n47jaZhM01pp9mb7R8j9ZscYEWvGCQya5K1HJyy8tuSbKhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612882701; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=FCZdvFcTChg0qJViWY6mVWIu8XSbxF/tra8QmJ4GSqk=; b=mjI8mzme+1YxmSCxf9F17f9JfkYO6nr1u+x9QDRf3tPV83C3zfV9fllJ/j5lvRqqVetHP0rU1sX9IB1UWi+rdXU0VueR8Ji9Kunq2czou35UdobaT7tB6HbDpJLjsGchFP9Gz134ya5D4+2apCopxs9oWEKbii1H5iRp0nDfyFU= 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+71521+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1612882701251342.74365601999637; Tue, 9 Feb 2021 06:58:21 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id efsOYY1788612xJ7HvLI32tU; Tue, 09 Feb 2021 06:58:20 -0800 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web08.11338.1612882695108137712 for ; Tue, 09 Feb 2021 06:58:15 -0800 IronPort-SDR: v/iEhgwIgpCRlWJb0SEhnpxWvT70+qYwHlTisU+KJqgKwHsLGYGC5P0V/6uul6K1QxNwJDqQ0t e7brqwEidzlA== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="266725500" X-IronPort-AV: E=Sophos;i="5.81,165,1610438400"; d="scan'208";a="266725500" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2021 06:58:14 -0800 IronPort-SDR: iWyA98MlxX5FCBE/owpajD6QuHiAFvGqT5khU04eNW+NOqHJk+TGq7qSz/8FYgsWGuueovhbcu Fz1Gl5cI1lgw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,165,1610438400"; d="scan'208";a="396148195" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.32]) by orsmga008.jf.intel.com with ESMTP; 09 Feb 2021 06:58:11 -0800 From: "Bob Feng" To: devel@edk2.groups.io Cc: Liming Gao , Yuwei Chen , Matthew Carlson , Michael D Kinney , Leif Lindholm Subject: [edk2-devel] [Patch] BaseTools: Fix the ending character for Linux script BuildEnv Date: Tue, 9 Feb 2021 22:58:08 +0800 Message-Id: <20210209145808.451-1-bob.c.feng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,bob.c.feng@intel.com X-Gm-Message-State: YCJYwFtySPVnvzEDA7wDkkqMx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1612882700; bh=6bwHaCc89/aMu7ukaS1wDyYEGm26+/snmRMD5W7xhdo=; h=Cc:Date:From:Reply-To:Subject:To; b=J8ZerKVUzZ5/xU1F+hboHcV+eZlD5R6lrZFxLZjPJN29na2RYQUB5Czjn/GsjaloiPe rC0JEd9J2Gbe0KvPkGHZP5jc5ZiekG5BcyQ4DxaZSzOLfd0xvZG8mlRa0L8H7ucQ2zbu1 xcpHQi0tfgEWOkTJpxVhe2EbK8L0HrqiuIw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Signed-off-by: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Cc: Matthew Carlson Cc: Michael D Kinney Cc: Leif Lindholm Reviewed-by: Leif Lindholm Reviewed-by: Michael D Kinney --- BaseTools/BuildEnv | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv index 8d283e10c0..275f4c5901 100755 --- a/BaseTools/BuildEnv +++ b/BaseTools/BuildEnv @@ -44,11 +44,11 @@ RestorePreviousConfiguration() { break fi done fi fi - + PREVIOUS_CONF_FILE=3D$CONF_PATH/BuildEnv.sh if [ -e $PREVIOUS_CONF_FILE ] then echo Loading previous configuration from $PREVIOUS_CONF_FILE . $PREVIOUS_CONF_FILE @@ -196,21 +196,21 @@ AddEdkToolsToPath() { return 1 fi =20 EDK_TOOLS_PATH_BIN=3D`GetEdkToolsPathBinDirectory` =20 - # check if the edk2basetools pip package is available - if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then - # if it is, use the pip version of the wrappers - echo "Using Pip Basetools" - AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike - else - echo "Using EDK2 in-source Basetools" - AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike - fi - - + # check if the edk2basetools pip package is available + if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then + # if it is, use the pip version of the wrappers + echo "Using Pip Basetools" + AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike + else + echo "Using EDK2 in-source Basetools" + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike + fi + + AddDirToStartOfPath $EDK_TOOLS_PATH_BIN =20 } =20 CopySingleTemplateFile() { --=20 2.29.1.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 (#71521): https://edk2.groups.io/g/devel/message/71521 Mute This Topic: https://groups.io/mt/80506146/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-