Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH] utils.bbclass: skip empty paths when handling FILESEXTRAPATHS
@ 2011-08-19 12:16 martin.jansa
  2011-08-19 22:11 ` Chris Larson
  2011-08-24  3:41 ` Saul Wold
  0 siblings, 2 replies; 12+ messages in thread
From: martin.jansa @ 2011-08-19 12:16 UTC (permalink / raw)
  To: openembedded-core

From: Martin Jansa <Martin.Jansa@gmail.com>

* if there is multiple .bbappend files with FILESEXTRAPATHS_prepend := "/:"
  then the one parsed last is causing trailing ':' and that's causing empty element in
  path = extrapaths.split(:) + path
* it's hard to keep all .bbappends from foreign layers to follow this rule, so it's better
  to be able to handle trailing ':'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/utils.bbclass |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 56abdd8..3c2e342 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -338,8 +338,9 @@ def base_set_filespath(path, d):
 	# The ":" ensures we have an 'empty' override
 	overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":"
 	for p in path:
-		for o in overrides.split(":"):
-			filespath.append(os.path.join(p, o))
+		if p != "": 
+			for o in overrides.split(":"):
+				filespath.append(os.path.join(p, o))
 	return ":".join(filespath)
 
 def extend_variants(d, var, extend, delim=':'):
-- 
1.7.6




^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2011-08-25 13:54 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-19 12:16 [PATCH] utils.bbclass: skip empty paths when handling FILESEXTRAPATHS martin.jansa
2011-08-19 22:11 ` Chris Larson
2011-08-19 22:16   ` Martin Jansa
2011-08-22 13:01     ` Paul Eggleton
2011-08-24 23:16       ` Chris Larson
2011-08-25  0:16         ` Paul Eggleton
2011-08-25  0:20           ` Chris Larson
2011-08-25  1:24             ` Richard Purdie
2011-08-25  1:29               ` Chris Larson
2011-08-25  9:18   ` Phil Blundell
2011-08-25 13:49     ` Chris Larson
2011-08-24  3:41 ` Saul Wold

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox