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 5F8872095D9E8 for ; Thu, 3 Aug 2017 08:35:33 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Aug 2017 08:37:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,316,1498546800"; d="scan'208";a="135705904" Received: from cruffin-desk1.amr.corp.intel.com ([10.242.64.69]) by fmsmga006.fm.intel.com with ESMTP; 03 Aug 2017 08:37:44 -0700 From: Chris Ruffin To: edk2-devel@lists.01.org Date: Thu, 3 Aug 2017 11:37:42 -0400 Message-Id: <20170803153742.75416-1-chris.ruffin@intel.com> X-Mailer: git-send-email 2.13.3.windows.1 Subject: [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, 03 Aug 2017 15:35:33 -0000 edksetup.sh implements a test that requires the current working directory to contain the edksetup.sh script. This test has the side effect of requiring 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 WORKSPACE 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 - if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ] + if [ ! ${BASH_SOURCE[0]} -ef ./edksetup.sh ] && [ -z "$PACKAGES_PATH" ] then echo Run this script from the base of your tree. For example: echo " cd /Path/To/Edk/Root" -- 2.13.3.windows.1