aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-11-20 15:00:59 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2018-02-26 14:45:07 +1300
commit690ab4d326341a98938a8c4424229c18e0f511c3 (patch)
tree3763d6af089eafba6b19754d94bea0514b30eb31
parent4a91edc11ddb133f060a2da373ee766c50575490 (diff)
downloadopenembedded-core-contrib-690ab4d326341a98938a8c4424229c18e0f511c3.tar.gz
openembedded-core-contrib-690ab4d326341a98938a8c4424229c18e0f511c3.tar.bz2
openembedded-core-contrib-690ab4d326341a98938a8c4424229c18e0f511c3.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>
-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 2dbb1976422..a962ebe09b4 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"""