From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com ([134.134.136.20]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QPjhd-0001hA-Hl for openembedded-core@lists.openembedded.org; Fri, 27 May 2011 01:10:53 +0200 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 26 May 2011 16:07:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,276,1304319600"; d="scan'208";a="5588260" Received: from unknown (HELO swold-MOBL.bigsur.com) ([10.255.12.104]) by orsmga001.jf.intel.com with ESMTP; 26 May 2011 16:07:42 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Thu, 26 May 2011 16:07:32 -0700 Message-Id: X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: Cc: Darren Hart Subject: [Consolidated Pull 1/9] utils.bbclass: make FILESEXTRAPATHS colon delimited X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2011 23:10:53 -0000 From: Darren Hart Fixes [YOCTO 1102] Path variables are typically : delimited. White space is allowed in paths, so is not a good choice for separating paths. Currently utils.bbclass performs the following: extrapaths = (bb.data.getVar("FILESEXTRAPATHS", d, True) or "").split() This splits FILESEXTRAPATHS on whitespace. It later splits overrides on : and reassembles them all together as : delimited. There is only one user of FILESEXTRAPATHS in oe-core (qt4-tools-native, which uses : anyway) and none in oe. Change the split() in utils.bbclass to split on : instead of whitespace. When splitting on a defined string (":") we must be careful to handle the empty string case which returns [''] instead of []. Tested building qt4-tools-native and core-image-minimal for surgarbay from meta-intel with a couple extra layers with FILESEXTRAPATHS modifications added. Signed-off-by: Darren Hart Cc: Phil Blundell --- meta/classes/utils.bbclass | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index e103351..9930a24 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -331,8 +331,10 @@ def explode_deps(s): def base_set_filespath(path, d): filespath = [] - extrapaths = (bb.data.getVar("FILESEXTRAPATHS", d, True) or "").split() - path = extrapaths + path + extrapaths = (bb.data.getVar("FILESEXTRAPATHS", d, True) or "") + # Don't prepend empty strings to the path list + if extrapaths != "": + path = extrapaths.split(":") + path # The ":" ensures we have an 'empty' override overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" for p in path: -- 1.7.3.4