aboutsummaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2016-09-05 15:29:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-08 00:33:47 +0100
commit36fe74895746f6249bd136786334cf24c53b7da9 (patch)
treec62bbb71221c7bd17112da06237b72985b4510f2 /bitbake
parent8ba4f540373bb486c80c290877856350a7f6d339 (diff)
downloadopenembedded-core-contrib-36fe74895746f6249bd136786334cf24c53b7da9.tar.gz
bitbake: toaster: keep layer name in variable history path
When converting variable history file names to relative paths, keep the layer directory's name so that the user can distinguish between conf files with the same name. [YOCTO #8188] (Bitbake rev: 59561d652af91c2099b735084f0e44275d68e637) Signed-off-by: David Reyna <david.reyna@windriver.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 0f09b5cb63..96166dc515 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -1127,7 +1127,8 @@ class BuildInfoHelper(object):
abs_file_name = vh['file']
for pp in path_prefixes:
if abs_file_name.startswith(pp + "/"):
- vh['file']=abs_file_name[len(pp + "/"):]
+ # preserve layer name in relative path
+ vh['file']=abs_file_name[pp.rfind("/")+1:]
break
# save the variables