[oe-commits] [openembedded-core] 83/122: lib/oe/recipeutils: fix find_layerdir() to return absolute paths

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch rocko
in repository openembedded-core.

commit 8d028508bfd68ad272739cab5495811927936ef2
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Wed Nov 8 09:45:06 2017 +1300

    lib/oe/recipeutils: fix find_layerdir() to return absolute paths
    
    find_layerdir() should really return absolute paths, so make it do so.
    This fixes devtool finish not deleting files it should do after devtool
    upgrade if the specified path is relative, since the devtool finish code
    was assuming that find_layerdir() was returning an absolute path.
    
    Fixes [YOCTO #12318].
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Armin Kuster <akuster at mvista.com>
---
 meta/lib/oe/recipeutils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index c8570ac..2f818bc 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -801,7 +801,7 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, wildcardver=False,
 
 def find_layerdir(fn):
     """ Figure out the path to the base of the layer containing a file (e.g. a recipe)"""
-    pth = fn
+    pth = os.path.abspath(fn)
     layerdir = ''
     while pth:
         if os.path.exists(os.path.join(pth, 'conf', 'layer.conf')):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.