1 files changed, 4 insertions, 2 deletions

diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index e103351e34..9930a24269 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: