aboutsummaryrefslogtreecommitdiffstats
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:09:17 +0000
commita85a78dcf226d160e9b504bfa67b306a9175ac29 (patch)
treee6e188344b91f230a79f3745bc9dc82fe410205e /scripts
parent751d27600a3df18d96baaa48696acf33ee964bec (diff)
downloadopenembedded-core-a85a78dcf226d160e9b504bfa67b306a9175ac29.tar.gz
openembedded-core-a85a78dcf226d160e9b504bfa67b306a9175ac29.tar.bz2
openembedded-core-a85a78dcf226d160e9b504bfa67b306a9175ac29.zip
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. 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):
layerdir = layers.get('meta', None)
else:
layerdir = layers.get(layername, None)
- if layerdir:
- layerdir = os.path.abspath(layerdir)
- return layerdir or layername
+ return os.path.abspath(layerdir or layername)
def finish(args, config, basepath, workspace):
"""Entry point for the devtool 'finish' subcommand"""