[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8205/8267] lib/oe/recipeutils: fix find_layerdir() to return absolute paths



commit bd884dd998e0b6490237dc4c41db9e00d30bad34
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   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].
    
    (From OE-Core rev: 8d028508bfd68ad272739cab5495811927936ef2)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Armin Kuster <akuster mvista com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/recipeutils.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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')):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]