diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-11-08 09:45:06 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-11 12:14:26 +0000 |
| commit | b575564ee38ba03d7df6d0e2ab00c23774c07e37 (patch) | |
| tree | 3bbea66c9dcf90bbfcc8b813cca1a9dcc4df5e3f /meta | |
| parent | e9bb56067af36eca5e31274596f5bb739e51f9e8 (diff) | |
| download | poky-b575564ee38ba03d7df6d0e2ab00c23774c07e37.tar.gz | |
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: 5e3fe00a0233d563781849a44f53885b4e924a9c)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | 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 c8570acf9e..2f818bcbaa 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, | |||
| 801 | 801 | ||
| 802 | def find_layerdir(fn): | 802 | def find_layerdir(fn): |
| 803 | """ Figure out the path to the base of the layer containing a file (e.g. a recipe)""" | 803 | """ Figure out the path to the base of the layer containing a file (e.g. a recipe)""" |
| 804 | pth = fn | 804 | pth = os.path.abspath(fn) |
| 805 | layerdir = '' | 805 | layerdir = '' |
| 806 | while pth: | 806 | while pth: |
| 807 | if os.path.exists(os.path.join(pth, 'conf', 'layer.conf')): | 807 | if os.path.exists(os.path.join(pth, 'conf', 'layer.conf')): |