summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2018-02-26 14:49:57 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-01 22:13:56 +0000
commit0465558e831df1197c13e476a879f9c5098198a5 (patch)
tree6e39b7799d136af84601d2905c4482e76760889e /scripts
parente295135ba1175a338b63d3c45b84da6af59747b1 (diff)
downloadpoky-0465558e831df1197c13e476a879f9c5098198a5.tar.gz
devtool: finish: fix erroneously creating bbappend for relative paths
After OE-Core rev 5e3fe00a0233d563781849a44f53885b4e924a9c we call os.path.abspath() on the original layer path, but we later compare that to the destination layer path. If that layer path isn't absolute but is effectively the same path, it should be writing to the original recipe but because we weren't making it absolute we were writing a bbappend instead. Call os.path.abspath() on the destination path as well to avoid that. (From OE-Core rev: a85a78dcf226d160e9b504bfa67b306a9175ac29) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/standard.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 2dbb197642..a962ebe09b 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1861,9 +1861,7 @@ def _get_layer(layername, d):
1861 layerdir = layers.get('meta', None) 1861 layerdir = layers.get('meta', None)
1862 else: 1862 else:
1863 layerdir = layers.get(layername, None) 1863 layerdir = layers.get(layername, None)
1864 if layerdir: 1864 return os.path.abspath(layerdir or layername)
1865 layerdir = os.path.abspath(layerdir)
1866 return layerdir or layername
1867 1865
1868def finish(args, config, basepath, workspace): 1866def finish(args, config, basepath, workspace):
1869 """Entry point for the devtool 'finish' subcommand""" 1867 """Entry point for the devtool 'finish' subcommand"""