From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7F192209589D1 for ; Wed, 9 Aug 2017 17:48:21 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Aug 2017 17:50:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,349,1498546800"; d="scan'208";a="135688879" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga005.jf.intel.com with ESMTP; 09 Aug 2017 17:50:39 -0700 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 9 Aug 2017 17:50:39 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 9 Aug 2017 17:50:39 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.236]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.128]) with mapi id 14.03.0319.002; Thu, 10 Aug 2017 08:50:37 +0800 From: "Zhu, Yonghong" To: "Ruffin, Chris" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [PATCH] BaseTools/edksetup.sh: fix invalid test for current working directory Thread-Index: AQHTDG5/ljGiLau18U+LAZ2h0P+CZKJ7w5Og Date: Thu, 10 Aug 2017 00:50:37 +0000 Message-ID: References: <20170803153742.75416-1-chris.ruffin@intel.com> In-Reply-To: <20170803153742.75416-1-chris.ruffin@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZGU4YWUwY2ItMmQ5My00NzYyLTkxMTEtZDk4NTMzMWVkNzgyIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6InFiYmxtZTZmaUNIT0N4b2NXUXFDWE5UYWFrQ3N0MGxMR2k5SkJQMGx5N2M9In0= x-ctpclassification: CTP_IC dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] BaseTools/edksetup.sh: fix invalid test for current working directory X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Aug 2017 00:48:21 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Yonghong Zhu Best Regards, Zhu Yonghong -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Chri= s Ruffin Sent: Thursday, August 03, 2017 11:38 PM To: edk2-devel@lists.01.org Subject: [edk2] [PATCH] BaseTools/edksetup.sh: fix invalid test for current= working directory edksetup.sh implements a test that requires the current working directory t= o contain the edksetup.sh script. This test has the side effect of requiri= ng the WORKSPACE to be set to the same directory as the edksetup.sh. In a = multiple workspace configuration, it is required to be able to have a WORKS= PACE that is different from the directory that contains edksetup.sh. This = changeset skips this test if PACKAGE_PATH is set. Change-Id: Ie6f16a08c012baf4e650c48cc8e91cdc466d05f2 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Chris Ruffin --- edksetup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edksetup.sh b/edksetup.sh index ec54f9ea40..93d6525758 100755 --- a/edksetup.sh +++ b/edksetup.sh @@ -54,7 +54,7 @@ function SetWorkspace() return 0 fi =20 - if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ] + if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ] && [ -z "$PACKAGES_PATH"=20 + ] then echo Run this script from the base of your tree. For example: echo " cd /Path/To/Edk/Root" -- 2.13.3.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel